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/marking/views/MarkPaperCheck.vue

@@ -190,8 +190,8 @@
               <template slot-scope="scope">
                 <el-popover trigger="hover" name="text" placement="top">
                   <div style="width:200px;">{{ scope.row.markRemark }}</div>
-                  <div slot="reference">
-                    <span>{{ interceptStr(scope.row.markRemark) }}</span>
+                  <div slot="reference" class="interceptStr">
+                    <span>{{ scope.row.markRemark }}</span>
                   </div>
                 </el-popover>
               </template>
@@ -495,17 +495,6 @@ export default {
         this.searchMarkPaperCheck();
       });
     },
-    //字符串截取
-    interceptStr(str) {
-      if (str) {
-        let l = str.length;
-        if (l > 3) {
-          return str.substring(0, 3) + "...";
-        } else {
-          return str;
-        }
-      }
-    },
     operaQuery() {
       let formData = this.$route.query;
       if (formData && formData.workId) {
@@ -534,3 +523,9 @@ export default {
   }
 };
 </script>
+<style lang="css" scoped>
+.interceptStr {
+  text-overflow: ellipsis;
+  overflow:hidden;white-space:nowrap;
+}
+</style>