zhangjie 1 年之前
父节点
当前提交
b5e45a0ed9

+ 6 - 2
src/modules/mark/components/markParam/MarkParamGroup.vue

@@ -148,6 +148,7 @@ export default {
       questionCount: 0,
       groupQuestionCount: 0,
       groupList: [],
+      fullDisabledQuestionNos: [],
       disabledQuestionNos: [],
       unsetQuestionNos: [],
       curGroupInfo: {},
@@ -243,12 +244,15 @@ export default {
         ];
       });
       this.disabledQuestionNos = disabledQuestionNos;
-      if (!filterId) this.groupQuestionCount = disabledQuestionNos.length;
+      if (!filterId) {
+        this.groupQuestionCount = disabledQuestionNos.length;
+        this.fullDisabledQuestionNos = [...disabledQuestionNos];
+      }
       this.updateUnsetQuestionNos();
     },
     updateUnsetQuestionNos() {
       this.unsetQuestionNos = this.subjectiveQuestionList
-        .filter((q) => !this.disabledQuestionNos.includes(q.qno))
+        .filter((q) => !this.fullDisabledQuestionNos.includes(q.qno))
         .map((q) => q.qno);
     },
     toAdd() {

+ 2 - 2
src/modules/mark/components/markParam/MarkParamStructure.vue

@@ -499,7 +499,7 @@ export default {
       const questionCount = this.tableData.length;
 
       const subjectiveQuestionCount = this.tableData.filter(
-        (item) => !item.isObjective
+        (item) => !item.objective
       ).length;
 
       return {
@@ -515,7 +515,6 @@ export default {
       if (this.loading) return;
       if (!this.checkData()) return;
 
-      this.loading = true;
       const questions = this.getData();
       const paperStat = this.statPaperStructure();
       let tipsContent = `本试卷共${paperStat.questionCount}道小题,客观题${paperStat.objectiveQuestionCount}道,主观题${paperStat.subjectiveQuestionCount}道,总分为${paperStat.paperTotalScore}分。`;
@@ -528,6 +527,7 @@ export default {
       ).catch(() => {});
       if (confirm !== "confirm") return;
 
+      this.loading = true;
       const res = await markStructureSave({
         examId: this.basicInfo.examId,
         paperNumber: this.basicInfo.paperNumber,

+ 8 - 5
src/modules/mark/components/markParam/ModifyMarkGroup.vue

@@ -294,21 +294,21 @@ export default {
         doubleRate: [
           {
             required: true,
-            message: "请输入双评比例",
+            message: "双评比例必填",
             trigger: "change",
           },
         ],
         arbitrateThreshold: [
           {
             required: true,
-            message: "请输入仲裁阀值",
+            message: "仲裁阀值必填",
             trigger: "change",
           },
         ],
         scorePolicy: [
           {
             required: true,
-            message: "请选择合分策略",
+            message: "合分策略必选",
             trigger: "change",
           },
         ],
@@ -333,12 +333,15 @@ export default {
       this.rowInfo = this.$objAssign(
         {
           doubleEnable: false,
-          doubleRate: 100,
-          arbitrateThreshold: 1,
+          doubleRate: null,
+          arbitrateThreshold: null,
           scorePolicy: "AVG",
         },
         this.instance
       );
+      this.rowInfo.doubleRate = this.rowInfo.doubleRate || undefined;
+      this.rowInfo.arbitrateThreshold =
+        this.rowInfo.arbitrateThreshold || undefined;
     },
     cancel() {
       this.modalIsShow = false;