违纪标记

card/assets/styles/card-preview.scss

@@ -559,6 +559,7 @@
 
           &:first-child {
             width: 20px;
+            white-space: nowrap;
             float: left;
           }
           &:last-child {
@@ -604,37 +605,42 @@
         width: 100%;
       }
       &-miss {
-        padding: 8px 10px;
+        padding: 10px;
         display: table-cell;
         vertical-align: middle;
-        width: 133px;
-        border-right: 1px solid #000;
-        .head-dynamic-content {
-          height: 32px;
-        }
 
+        &:nth-of-type(2) {
+          border-left: 1px solid #000;
+        }
         span {
           display: block;
         }
         .dynamic-miss-title {
-          width: 32px;
+          width: 54px;
           float: left;
         }
         .dynamic-miss-body {
-          margin-left: 32px;
-          padding-top: 8px;
+          margin-left: 54px;
           text-align: center;
         }
+        .head-dynamic-rect {
+          margin: auto;
+          vertical-align: middle;
+        }
       }
       &-fill {
-        display: table-cell;
-        vertical-align: middle;
-        padding: 8px 10px;
+        padding: 10px;
 
         p {
+          display: inline-block;
+          vertical-align: middle;
           line-height: 18px;
           word-wrap: normal;
 
+          &:first-child {
+            margin-right: 20px;
+          }
+
           > span,
           > i {
             display: inline-block;

card/assets/styles/card-temp.css

@@ -310,6 +310,7 @@
 }
 .card-head-title > h1 {
   line-height: 33px;
+  letter-spacing: -1px;
   white-space: nowrap;
 }
 .card-head-subtitle {
@@ -480,6 +481,7 @@
 }
 .card-head-body .head-notice-cont > span:first-child {
   width: 20px;
+  white-space: nowrap;
   float: left;
 }
 .card-head-body .head-notice-cont > span:last-child {
@@ -517,36 +519,40 @@
   width: 100%;
 }
 .card-head-body .head-dynamic-miss {
-  padding: 8px 10px;
+  padding: 10px;
   display: table-cell;
   vertical-align: middle;
-  width: 133px;
-  border-right: 1px solid #000;
 }
-.card-head-body .head-dynamic-miss .head-dynamic-content {
-  height: 32px;
+.card-head-body .head-dynamic-miss:nth-of-type(2) {
+  border-left: 1px solid #000;
 }
 .card-head-body .head-dynamic-miss span {
   display: block;
 }
 .card-head-body .head-dynamic-miss .dynamic-miss-title {
-  width: 32px;
+  width: 54px;
   float: left;
 }
 .card-head-body .head-dynamic-miss .dynamic-miss-body {
-  margin-left: 32px;
-  padding-top: 8px;
+  margin-left: 54px;
   text-align: center;
 }
-.card-head-body .head-dynamic-fill {
-  display: table-cell;
+.card-head-body .head-dynamic-miss .head-dynamic-rect {
+  margin: auto;
   vertical-align: middle;
-  padding: 8px 10px;
+}
+.card-head-body .head-dynamic-fill {
+  padding: 10px;
 }
 .card-head-body .head-dynamic-fill p {
+  display: inline-block;
+  vertical-align: middle;
   line-height: 18px;
   word-wrap: normal;
 }
+.card-head-body .head-dynamic-fill p:first-child {
+  margin-right: 20px;
+}
 .card-head-body .head-dynamic-fill p > span,
 .card-head-body .head-dynamic-fill p > i {
   display: inline-block;

card/elements/card-head/CardHead.vue

@@ -154,8 +154,11 @@ export default {
     hasDynamicArea() {
       const noDynamic =
         this.data.examNumberStyle === "FILL"
-          ? !this.data.examAbsent && !this.data.aOrB
-          : !this.data.examAbsent && !this.data.writeSign && !this.data.aOrB;
+          ? !this.data.examAbsent && !this.data.aOrB && !this.data.discipline
+          : !this.data.examAbsent &&
+            !this.data.writeSign &&
+            !this.data.aOrB &&
+            !this.data.discipline;
 
       return !noDynamic;
     },

card/elements/card-head/cardHeadSpin/HeadDynamic.vue

@@ -14,8 +14,24 @@
         注意：签名则表示您认可答题卡提供的信息与您本人信息相符；如签名与信息不符或者未签名，试卷作废。
       </p>
     </div>
-    <!-- miss-fill -->
-    <div class="head-dynamic-part head-dynamic-missfill">
+    <!-- file -->
+    <div class="head-dynamic-part head-dynamic-fill">
+      <div class="head-dynamic-content">
+        <p><span>正确填涂：</span><i></i></p>
+        <p>
+          <span>错误填涂：</span>
+          <i>√</i>
+          <i>×</i>
+          <i></i>
+          <i></i>
+        </p>
+      </div>
+    </div>
+    <!-- miss discipline -->
+    <div
+      v-if="data.examAbsent || data.discipline"
+      class="head-dynamic-part head-dynamic-missfill"
+    >
       <div class="head-dynamic-miss" v-if="data.examAbsent">
         <div class="head-dynamic-content">
           <span class="dynamic-miss-title">缺考标记</span>
@@ -24,16 +40,12 @@
           ></span>
         </div>
       </div>
-      <div class="head-dynamic-fill">
+      <div class="head-dynamic-miss" v-if="data.discipline">
         <div class="head-dynamic-content">
-          <p><span>正确填涂：</span><i></i></p>
-          <p>
-            <span>错误填涂：</span>
-            <i>√</i>
-            <i>×</i>
-            <i></i>
-            <i></i>
-          </p>
+          <span class="dynamic-miss-title">违纪标记</span>
+          <span class="dynamic-miss-body"
+            ><i class="head-dynamic-rect" id="dynamic-miss-area"></i
+          ></span>
         </div>
       </div>
     </div>
@@ -106,6 +118,7 @@ export default {
       if (this.data.examNumberStyle !== "FILL" && this.data.writeSign)
         partNum++;
       if (this.data.aOrB) partNum++;
+      if (this.data.examAbsent || this.data.discipline) partNum++;
 
       return ["head-dynamic", "card-head-body-spin", `head-dynamic-${partNum}`];
     }

src/modules/base/components/ModifyCardRule.vue

@@ -73,12 +73,13 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item class="inline-block" label-width="30px">
+      <el-form-item>
         <el-checkbox v-model="modalForm.examAbsent" :disabled="!editable"
           >启用“缺考填涂”</el-checkbox
         >
-      </el-form-item>
-      <el-form-item class="inline-block" label-width="30px">
+        <el-checkbox v-model="modalForm.discipline" :disabled="!editable"
+          >启用“违纪填涂”</el-checkbox
+        >
         <el-checkbox
           v-model="modalForm.writeSign"
           :disabled="modalForm.examNumberStyle === 'FILL' || !editable"
@@ -177,6 +178,7 @@ const initModalForm = {
   examNumberStyle: "",
   paperType: "PRINT",
   examAbsent: true,
+  discipline: true,
   writeSign: true,
   requiredFields: [],
   extendFields: [],