Merge branch 'master' of http://git.qmth.com.cn/themis/frontend-admin

src/features/examwork/ExamManagement/ExamEdit.vue

@@ -8,6 +8,7 @@
           :rules="rules"
           label-width="170px"
           inline
+          :disabled="disableEdit"
         >
           <el-row>
             <el-form-item label="考试模式" prop="mode">
@@ -191,6 +192,7 @@
           :rules="rules"
           label-width="180px"
           inline
+          :disabled="disableEdit"
         >
           <el-row class="tab-invililation">
             <h2>开考检测</h2>
@@ -465,7 +467,12 @@
       </el-tab-pane>
 
       <el-tab-pane label="其他设置" name="third">
-        <el-form :model="form" label-width="170px" inline>
+        <el-form
+          :model="form"
+          label-width="170px"
+          inline
+          :disabled="disableEdit"
+        >
           <el-row>
             <el-form-item label="考试须知">
               <VEditor
@@ -507,7 +514,11 @@
     </el-tabs>
 
     <div class="tab-footer">
-      <el-button type="primary" @click="save" :loading="loading"
+      <el-button
+        type="primary"
+        @click="save"
+        :loading="loading"
+        :disabled="disableEdit"
         >保存</el-button
       >
       <el-button @click="cancel">取消</el-button>
@@ -564,6 +575,9 @@ export default {
     orgSettingDisableLiveness() {
       return !this.orgSetting?.enableLiveness;
     },
+    disableEdit() {
+      return this.form.monitorStatus === "FINISHED";
+    },
   },
   watch: {
     "form.mode": {

src/features/examwork/ExamManagement/ExamManagement.vue

@@ -62,6 +62,11 @@
       <el-table-column width="100" label="结束时间">
         <span slot-scope="scope">{{ scope.row.endTime | datetimeFilter }}</span>
       </el-table-column>
+      <el-table-column width="100" label="监考状态">
+        <span slot-scope="scope">{{
+          scope.row.monitorStatus | monitorStatusFilter
+        }}</span>
+      </el-table-column>
       <el-table-column width="100" label="算分进度">
         <span slot-scope="scope">{{
           scope.row.scoreStatus | scoreStatusFilter

src/filters/index.js

@@ -51,6 +51,11 @@ Vue.filter("modeFilter", function (val) {
   return { TOGETHER: "集中统一", ANYTIME: "随到随考" }[val];
 });
 
+Vue.filter("monitorStatusFilter", function (val) {
+  if (val === null) return "无";
+  return { NOT_START: "未开始", START: "监考中", FINISHED: "已结束" }[val];
+});
+
 Vue.filter("zeroOneApproveStatusFilter", function (val) {
   if (val === null) return "";
   return APPROVE_STATUS[val];