Browse Source

场次时间校验

Michael Wang 4 years ago
parent
commit
bada47a5c4

+ 10 - 7
src/features/examwork/ActivityManagement/ActivityEdit.vue

@@ -168,6 +168,14 @@ export default {
           {
             validator: (rule, value) => {
               return new Promise((resolve, reject) => {
+                if (
+                  moment(this.form[index].finishTime) -
+                    moment(this.form[index].startTime) <=
+                  0
+                ) {
+                  reject("考试结束时间要大于考试开始时间");
+                  return;
+                }
                 if (
                   moment(value).isBetween(
                     moment(this.exam.startTime),
@@ -178,11 +186,10 @@ export default {
                 ) {
                   resolve(); // reject with error message
                 } else {
-                  reject("reject");
+                  reject("场次的交卷时间不在考试的时间范围");
                 }
               });
             },
-            message: "场次的交卷时间不在考试的时间范围",
           },
         ],
         maxDurationSeconds: [
@@ -190,10 +197,6 @@ export default {
           {
             validator: (rule, value) => {
               return new Promise((resolve, reject) => {
-                console.log(
-                  moment(this.form[index].finishTime) -
-                    moment(this.form[index].startTime)
-                );
                 if (
                   moment(this.form[index].finishTime) -
                     moment(this.form[index].startTime) >=
@@ -205,7 +208,7 @@ export default {
                 }
               });
             },
-            message: "考试时长超出考试时间范围",
+            message: "考试时长超出范围",
           },
         ],
         prepareSeconds: [{ required: true, message: "候考时间必填" }],

+ 10 - 3
src/features/examwork/ActivityManagement/ActivityManagementDialog.vue

@@ -125,6 +125,14 @@ export default {
           {
             validator: (rule, value) => {
               return new Promise((resolve, reject) => {
+                if (
+                  moment(this.form.finishTime) - moment(this.form.startTime) <=
+                  0
+                ) {
+                  reject("考试结束时间要大于考试开始时间");
+                  return;
+                }
+
                 if (
                   moment(value).isBetween(
                     moment(this.exam.startTime),
@@ -135,11 +143,10 @@ export default {
                 ) {
                   resolve(); // reject with error message
                 } else {
-                  reject("reject");
+                  reject("场次的交卷时间不在考试的时间范围");
                 }
               });
             },
-            message: "场次的交卷时间不在考试的时间范围",
           },
         ],
         maxDurationSeconds: [
@@ -157,7 +164,7 @@ export default {
                 }
               });
             },
-            message: "考试时长超出考试时间范围",
+            message: "考试时长超出范围",
           },
         ],
         prepareSeconds: [{ required: true, message: "候考时间必填" }],