zhangjie 10 月之前
父节点
当前提交
649a2e836a

+ 3 - 3
src/features/invigilation/RealtimeMonitoring/WarningDetail.vue

@@ -178,7 +178,7 @@
                 >语音通话</el-button
               >
             </div>
-            <div v-if="actionValid" class="action-item">
+            <div class="action-item">
               <el-button
                 :icon="
                   detailInfo.markStatus === 'MARK'
@@ -188,10 +188,10 @@
                 size="mideum"
                 @click="toMark"
               >
-                {{ detailInfo.markStatus === "MARK" ? "撤销标记" : "重点标记" }}
+                {{ detailInfo.markStatus === "MARK" ? "撤销重监" : "重点监控" }}
               </el-button>
             </div>
-            <div v-if="actionValid" class="action-item"></div>
+            <div class="action-item"></div>
             <div class="action-item">
               <el-button
                 icon="icon icon-info-danger"

+ 15 - 7
src/features/invigilation/RealtimeMonitoring/components/RealtimeMonitoringFullHeader.vue

@@ -54,12 +54,14 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item class="media-source-select">
-          <el-button
-            :type="filter.markStatus === 'MARK' ? 'warning' : ''"
-            @click="markChange"
-            >重点监控</el-button
-          >
+        <el-form-item class="mark-status-select">
+          <el-switch
+            v-model="markStatus"
+            active-color="#409EFF"
+            inactive-color="#a1a8b3"
+            active-text="重点监控"
+            @change="markChange"
+          ></el-switch>
         </el-form-item>
       </el-form>
     </div>
@@ -96,6 +98,7 @@ export default {
         monitorStatus: "",
         markStatus: "",
       },
+      markStatus: false,
       /** 场次列表 */
       examActivities: [],
       /** 考场列表 */
@@ -163,7 +166,7 @@ export default {
       return examActivitys;
     },
     markChange() {
-      this.filter.markStatus = this.filter.markStatus === "MARK" ? "" : "MARK";
+      this.filter.markStatus = !this.markStatus ? "" : "MARK";
     },
   },
 };
@@ -208,6 +211,11 @@ export default {
     .media-source-select {
       width: 160px;
     }
+
+    .el-switch__label:not(.is-active) {
+      color: #a1a8b3;
+    }
+
     .el-form-item {
       margin-bottom: 0;
     }

+ 9 - 8
src/features/invigilation/WarningManage/WarningManage.vue

@@ -154,16 +154,13 @@
           </el-form-item>
           <el-form-item>
             <el-select
-              v-model="filter.markStatus"
-              placeholder="标记状态"
+              v-model="markStatus"
+              placeholder="重点监控"
               clearable
+              @change="markStatusChange"
             >
-              <el-option
-                v-for="(val, key) in MARK_STATUS"
-                :key="key"
-                :value="key"
-                :label="val"
-              ></el-option>
+              <el-option value="1" label="是"></el-option>
+              <el-option value="0" label="否"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item>
@@ -276,6 +273,7 @@ export default {
         maxWarningCount: undefined,
         minWarningCount: undefined,
       },
+      markStatus: null,
       dataReady: false,
       curExamRoomName: "",
       APPROVE_STATUS,
@@ -367,6 +365,9 @@ export default {
       });
       this.$parent.$parent.timerUpdatePage();
     },
+    markStatusChange() {
+      this.filter.markStatus = this.markStatus === "1" ? "MARK" : "";
+    },
     async getExamBatchList() {
       const userId = this.IS_INVIGILATE ? this.user.id : null;
       const res = await examBatchList({ userId, warnCount: true });