违纪可多次标记

src/components/VEditor/components/VMenu.vue

@@ -1,5 +1,8 @@
 <template>
-  <div class="edit-menus" style="display: flex; gap: 10px;">
+  <div
+    class="edit-menus"
+    style="display: flex; gap: 10px; height: 24px; line-height: 24px;"
+  >
     <!-- 由于v-model会re-render，这里无法redo了 -->
     <img
       class="intLink"

src/features/examwork/ExamManagement/ExamEdit.vue

@@ -196,6 +196,16 @@
               </el-radio>
             </el-form-item>
           </el-row>
+          <el-row>
+            <el-form-item label="违纪考生是否推送阅卷">
+              <el-radio v-model="form.pushBreachStudent" :label="1">
+                是
+              </el-radio>
+              <el-radio v-model="form.pushBreachStudent" :label="0">
+                否
+              </el-radio>
+            </el-form-item>
+          </el-row>
         </el-form>
       </el-tab-pane>
 
@@ -754,6 +764,7 @@ export default {
         showObjectiveScore: 0,
         cameraPhotoUpload: 0,
         mobilePhotoUpload: 0,
+        pushBreachStudent: 0,
         entryAuthenticationPolicy: "OFF",
         inProcessFaceVerify: 0,
         inProcessFaceStrangerIgnore: 0,

src/features/examwork/StudentManagement/StudentTrackRecord.vue

@@ -57,7 +57,13 @@
               </div>
               <div class="warning-track-body">
                 <div class="warning-track-info">
-                  <h3>{{ log.title }}</h3>
+                  <div class="warning-track-info-title">
+                    <template v-if="log.type === 'BREACH_HANDLE'">
+                      <!-- todo: 日志撤销状态 -->
+                      <span>已撤销</span>
+                    </template>
+                    <h3>{{ log.title }}</h3>
+                  </div>
                   <p v-if="log.desc">{{ log.desc }}</p>
                   <p>
                     时间段：

src/features/invigilation/OnlinePatrol/PatrolWarningDetail.vue

@@ -134,7 +134,13 @@
               </div>
               <div class="warning-track-body">
                 <div class="warning-track-info">
-                  <h3>{{ log.title }}</h3>
+                  <div class="warning-track-info-title">
+                    <template v-if="log.type === 'BREACH_HANDLE'">
+                      <!-- todo: 日志撤销状态 -->
+                      <span>已撤销</span>
+                    </template>
+                    <h3>{{ log.title }}</h3>
+                  </div>
                   <p v-if="log.desc">{{ log.desc }}</p>
                   <p>
                     时间段：

src/features/invigilation/RealtimeMonitoring/WarningDetail.vue

@@ -159,8 +159,8 @@
               <el-button
                 icon="icon icon-info-danger"
                 size="mideum"
-                @click="toBreach"
-                >{{ isBreach ? "撤销违纪" : "违纪处理" }}</el-button
+                @click="toBreach(0)"
+                >违纪处理</el-button
               >
             </div>
             <div
@@ -213,7 +213,16 @@
               </div>
               <div class="warning-track-body">
                 <div class="warning-track-info">
-                  <h3>{{ log.title }}</h3>
+                  <div class="warning-track-info-title">
+                    <template v-if="log.type === 'BREACH_HANDLE'">
+                      <el-button type="text" @click="toBreach(1, log.id)"
+                        >撤销违纪</el-button
+                      >
+                      <!-- todo: 日志撤销状态 -->
+                      <span>已撤销</span>
+                    </template>
+                    <h3>{{ log.title }}</h3>
+                  </div>
                   <p v-if="log.desc">{{ log.desc }}</p>
                   <p>
                     时间段：
@@ -617,7 +626,7 @@ export default {
         },
       });
     },
-    toBreach() {
+    toBreach(status = 0, logId = null) {
       this.curDetail = {
         examStudentName: this.detailInfo.examStudentName,
         identity: this.detailInfo.identity,
@@ -625,7 +634,8 @@ export default {
         description: "",
         examRecordId: [this.detailInfo.examRecordId],
         breachStatus: this.detailInfo.breachStatus,
-        status: this.detailInfo.breachStatus ? 0 : 1,
+        status,
+        logId,
         // 状态,0:新建,1:撤销
         // 违纪状态：正常(1)=>新建，违纪(0)=>撤销
         type: "",

src/styles/base.scss

@@ -669,12 +669,23 @@ body {
     padding-bottom: 30px;
   }
   &-info {
-    > h3 {
-      font-size: 16px;
-      font-weight: 600;
-      color: #202b4b;
-      line-height: 1;
-      margin-bottom: 6px;
+    &-title {
+      > span {
+        display: inline-block;
+        vertical-align: middle;
+        color: #626a82;
+        margin-right: 10px;
+      }
+
+      > h3 {
+        font-size: 16px;
+        font-weight: 600;
+        color: #202b4b;
+        line-height: 1;
+        margin-bottom: 6px;
+        display: inline-block;
+        vertical-align: middle;
+      }
     }
 
     > h5 {

src/styles/element-ui-custom.scss

@@ -260,7 +260,7 @@
     margin-right: 12px;
 
     &.is-active {
-      color: #1886fe;
+      color: #202b4b;
       font-weight: 600;
     }
   }