Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-web-admin

src/modules/examwork/view/examStudent.vue

@@ -410,6 +410,7 @@
                 v-model="examStudentForm.orgId"
                 placeholder="请选择"
                 :disabled="pureLC"
+                @clear="clearOrg4UpdateExamStudent"
               >
                 <el-option
                   v-for="item in orgList4InsertOrUpdate"
@@ -523,7 +524,7 @@
             ref="studentCopyForm"
             class="editForm"
             :inline="true"
-            label-width="200px"
+            label-width="120px"
           >
             <el-form-item label="源考试批次" prop="sourceExamId">
               <el-select
@@ -566,7 +567,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <div class="dialog-footer">
+            <div style="text-align: center;">
               <el-button type="primary" @click="copyStudent">确 定</el-button>
               <el-button @click="studentCopyDialog = false">取 消</el-button>
             </div>
@@ -1064,6 +1065,9 @@ export default {
   },
 
   methods: {
+    clearOrg4UpdateExamStudent() {
+      this.getOrgList4InsertOrUpdate("");
+    },
     queryExams4Search(name) {
       this.queryExams(name, "search");
     },
@@ -1523,6 +1527,8 @@ export default {
       this.studentCopyForm.targetExamId = null;
       this.examList4CopyFrom = [];
       this.examList4CopyTo = [];
+      this.queryExams4CopyFrom("");
+      this.queryExams4CopyTo("");
     },
     //复制学生
     copyStudent() {
@@ -1538,7 +1544,7 @@ export default {
             });
             return;
           }
-          var url =
+          let url =
             TASK_API +
             "/copyExamStudent/addCopyTask?" +
             new URLSearchParams({

src/modules/examwork/view/examStudentImport.vue

@@ -223,6 +223,7 @@ export default {
       this.fileList = [];
       this.studentImportForm.examId = null;
       this.examList = [];
+      this.queryExams("");
     },
     beforeUpload(file) {
       console.log(file);

src/modules/examwork/view/onlineExam.vue

@@ -839,10 +839,10 @@ export default {
           MARKING_TYPE: "ALL",
           IP_LIMIT: "false",
           IP_ADDRESSES: null,
-          LIVING_WARN_THRESHOLD: null,
+          LIVING_WARN_THRESHOLD: 50,
           IS_FACE_VERIFY: "false",
-          FACE_VERIFY_START_MINUTE: null,
-          FACE_VERIFY_END_MINUTE: null,
+          FACE_VERIFY_START_MINUTE: 5,
+          FACE_VERIFY_END_MINUTE: 10,
           PUSH_SCORE: "true"
         }
       },

src/modules/examwork/view/student.vue

@@ -545,8 +545,7 @@ export default {
         courseName: "",
         infoCollector: "",
         identityNumber: "",
-        identityNumberLike: false,
-        withStarted: true
+        identityNumberLike: false
       }
     };
   },

src/modules/oe/component/commonExport.vue

@@ -45,7 +45,8 @@ export default {
             params: {
               query: this.form
             },
-            responseType: "arraybuffer"
+            responseType: "arraybuffer",
+            timeout: 20 * 60 * 1000 //限时20分钟
           })
           .then(response => {
             if (response.data) {

src/modules/oe/style/common.css

@@ -6,7 +6,7 @@
 }
 
 .form_search_width_50 {
-  width: 60px;
+  width: 74px;
 }
 
 .margin-bottom-10 {

src/modules/oe/views/awaitingAudit.vue

@@ -42,7 +42,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="人脸识别">
+            <el-form-item label="人脸比对">
               <el-input
                 class="form_search_width_50"
                 size="small"
@@ -56,11 +56,10 @@
                 v-model="form.faceSuccessPercentUpper"
                 placeholder="上限"
               ></el-input>
-              (成功率)
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="人脸比率">
+            <el-form-item label="真实性">
               <el-row>
                 <el-input
                   class="form_search_width_50"
@@ -75,7 +74,6 @@
                   v-model="form.livenessSuccessPercentUpper"
                   placeholder="上限"
                 ></el-input>
-                (真实性)
               </el-row>
             </el-form-item>
           </el-col>
@@ -291,7 +289,11 @@
           </div>
         </el-col>
       </el-row>
-      <el-dialog title="审核" :visible.sync="dialogFormVisible">
+      <el-dialog
+        title="审核"
+        :visible.sync="dialogFormVisible"
+        @closed="auditDialogClosed"
+      >
         <el-form :model="auditForm" ref="auditForm">
           <el-form-item
             label="违纪类型"
@@ -534,6 +536,9 @@ export default {
         }
       });
     },
+    auditDialogClosed() {
+      this.$refs["auditForm"].resetFields();
+    },
     /**
      * 审核通过
      */

src/modules/oe/views/examDetail.vue

@@ -91,12 +91,20 @@
             <el-table-column label="考试ID" width="120">
               <template slot-scope="scope">
                 <el-button
-                  v-show="currentPagePrivileges.SNAPSHOT_DETAILS"
+                  v-show="
+                    scope.row.examType == 'ONLINE' &&
+                      currentPagePrivileges.SNAPSHOT_DETAILS
+                  "
                   @click="gotoCaptureDetail(scope.row.dataId)"
                   type="text"
                   >{{ scope.row.dataId }}
                 </el-button>
-                <span v-show="!currentPagePrivileges.SNAPSHOT_DETAILS">
+                <span
+                  v-show="
+                    scope.row.examType != 'ONLINE' ||
+                      !currentPagePrivileges.SNAPSHOT_DETAILS
+                  "
+                >
                   {{ scope.row.dataId }}
                 </span>
               </template>
@@ -315,7 +323,11 @@
             >
             </el-pagination></div></el-col
       ></el-row>
-      <el-dialog title="审核" :visible.sync="dialogAuditFormVisible">
+      <el-dialog
+        title="审核"
+        :visible.sync="dialogAuditFormVisible"
+        @closed="auditDialogClosed"
+      >
         <el-form :model="auditForm" ref="redoAuditForm">
           <el-form-item
             label="违纪类型"
@@ -579,13 +591,7 @@ export default {
                 message: "操作成功",
                 type: "success"
               });
-              this.auditForm = {
-                examRecordDataId: null,
-                disciplineType: "",
-                disciplineDetail: "",
-                isPass: null
-              };
-              this.dialogAuditFormVisible = false;
+              this.doRedoAuditNoPassPostProcess();
               this.search();
             })
             .catch(res => {
@@ -593,6 +599,7 @@ export default {
               if (res.response && res.response.data) {
                 errorMsg = res.response.data.desc;
               }
+              this.doRedoAuditNoPassPostProcess();
               this.$notify({
                 title: "提示",
                 message: errorMsg,
@@ -604,6 +611,19 @@ export default {
         }
       });
     },
+    doRedoAuditNoPassPostProcess() {
+      this.auditForm = {
+        examRecordDataId: null,
+        disciplineType: "",
+        disciplineDetail: "",
+        isPass: null
+      };
+      this.$refs["redoAuditForm"].resetFields();
+      this.dialogAuditFormVisible = false;
+    },
+    auditDialogClosed() {
+      this.$refs["redoAuditForm"].resetFields();
+    },
     backFill() {
       var formData = this.$route.query;
       if (formData && formData.examId) {

src/modules/oe/views/reexamine.vue

@@ -61,7 +61,11 @@
             >
             </el-pagination></div></el-col
       ></el-row>
-      <el-dialog title="设置重考" :visible.sync="dialogFormVisible">
+      <el-dialog
+        title="设置重考"
+        :visible.sync="dialogFormVisible"
+        @closed="reexamineDialogClosed"
+      >
         <el-form :model="reexamineForm" ref="reexamineForm">
           <el-form-item
             prop="reexamineType"
@@ -249,6 +253,9 @@ export default {
           return false;
         }
       });
+    },
+    reexamineDialogClosed() {
+      this.$refs["reexamineForm"].resetFields();
     }
   },
   created() {}

src/modules/oe/views/scoreStatistics.vue

@@ -374,7 +374,8 @@ export default {
           params: {
             query: this.form
           },
-          responseType: "arraybuffer"
+          responseType: "arraybuffer",
+          timeout: 20 * 60 * 1000 //限时20分钟
         })
         .then(response => {
           if (response.data) {