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

src/components/RoleSelect.vue

@@ -48,7 +48,7 @@ export default {
   },
   methods: {
     select() {
-      if (this.selected.length > 1) {
+      if (this.multiple && this.selected.length > 1) {
         this.selected = this.selected.splice(1);
       }
       this.$emit("input", this.selected);

src/features/examwork/ActivityManagement/ActivityEdit.vue

@@ -32,6 +32,7 @@
               type="datetime"
               placeholder="选择日期时间"
               style="width: 188px;"
+              value-format="timestamp"
             >
             </el-date-picker>
           </el-form-item>
@@ -41,6 +42,7 @@
               type="datetime"
               placeholder="选择日期时间"
               style="width: 188px;"
+              value-format="timestamp"
             >
             </el-date-picker>
           </el-form-item>

src/features/examwork/ActivityManagement/ActivityManagementDialog.vue

@@ -19,6 +19,7 @@
             v-model="form.startTime"
             type="datetime"
             placeholder="选择日期时间"
+            value-format="timestamp"
           >
           </el-date-picker>
         </el-form-item>
@@ -29,6 +30,7 @@
             v-model="form.finishTime"
             type="datetime"
             placeholder="选择日期时间"
+            value-format="timestamp"
           >
           </el-date-picker>
         </el-form-item>

src/features/examwork/ExamManagement/ExamEdit.vue

@@ -35,6 +35,7 @@
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
+                value-format="timestamp"
               >
               </el-date-picker>
             </el-form-item>
@@ -201,7 +202,7 @@
                   v-model="form.entryAuthenticationPolicy"
                   label="FACE_VERIFY_OPTIONAL"
                 >
-                  安全级别：<span style="color: #fe5863; font-size: 20px;">
+                  安全级别：<span style="color: #1cd1a1; font-size: 20px;">
                     低
                   </span>
                   <span class="desc-txt"> 开考人脸比对，不强制比对 </span>
@@ -219,7 +220,7 @@
                   v-model="form.entryAuthenticationPolicy"
                   label="LIVENESS_VERIFY"
                 >
-                  安全级别：<span style="color: #1cd1a1; font-size: 20px;">
+                  安全级别：<span style="color: red; font-size: 20px;">
                     高
                   </span>
                   <span class="desc-txt"> 开考人脸比对及活体验证 </span>
@@ -426,11 +427,21 @@ export default {
     },
   },
   watch: {
+    "form.mode": {
+      immediate: true,
+      handler(v) {
+        if (v === "ANYTIME") {
+          this.form.forceFinish = 0;
+          this.form.prepareSeconds = 0;
+          this.form.openingSeconds = 0;
+        }
+      },
+    },
     "form.startEndTimeProxy": {
       immediate: true,
       handler(v) {
-        this.form.startTime = v[0];
-        this.form.endTime = v[1];
+        this.form.startTime = new Date(v[0]).valueOf();
+        this.form.endTime = new Date(v[1]).valueOf();
       },
     },
     "form.monitorProxy": {

src/router/index.js

@@ -105,6 +105,9 @@ const routes = [
           import(
             /* webpackChunkName: "exam" */ "../features/examwork/ActivityManagement/ActivityManagement.vue"
           ),
+        meta: {
+          relate: "ExamManagement",
+        },
       },
       {
         path: ":examId/activity/new",
@@ -114,7 +117,7 @@ const routes = [
             /* webpackChunkName: "exam" */ "../features/examwork/ActivityManagement/ActivityEdit.vue"
           ),
         meta: {
-          relate: "ActivityManagement",
+          relate: "ExamManagement",
         },
       },
       {