zhangjie 2 years ago
parent
commit
e19196ba41

+ 1 - 1
src/modules/grading/components/GradeActionRough.vue

@@ -733,7 +733,7 @@ export default {
         return;
         return;
       }
       }
       const level = this.getKeyInputLevel(this.keyInput);
       const level = this.getKeyInputLevel(this.keyInput);
-      if (/^[a-z]$/.test(level.name)) {
+      if (/^[a-zA-Z]$/.test(level.name)) {
         this.selectLevel(level);
         this.selectLevel(level);
       } else {
       } else {
         this.selectRoughLevel(level);
         this.selectRoughLevel(level);

+ 2 - 1
src/modules/grading/components/ModifyFormalGradingTask.vue

@@ -53,6 +53,7 @@
           :min="minTaskCount"
           :min="minTaskCount"
           :max="maxTaskCount"
           :max="maxTaskCount"
           :precision="0"
           :precision="0"
+          :active-change="false"
           v-model.trim="modalForm.taskCount"
           v-model.trim="modalForm.taskCount"
           :disabled="!modalForm.waitCount || !canPublish"
           :disabled="!modalForm.waitCount || !canPublish"
           style="width: 120px"
           style="width: 120px"
@@ -188,7 +189,7 @@ export default {
           ).toFixed(2) + "%";
           ).toFixed(2) + "%";
 
 
       this.modalForm.taskCount = calcSum(curAreas.map(item => item.initCount));
       this.modalForm.taskCount = calcSum(curAreas.map(item => item.initCount));
-      this.minTaskCount = this.modalForm.taskCount || 1;
+      this.minTaskCount = this.modalForm.taskCount || 10;
       this.maxTaskCount = this.modalForm.waitCount;
       this.maxTaskCount = this.modalForm.waitCount;
 
 
       console.log(curAreas);
       console.log(curAreas);

+ 2 - 7
src/modules/grading/marker/MarkerGrading.vue

@@ -430,7 +430,7 @@ export default {
       }
       }
     },
     },
     updateStepLevel(curStep, curLevel, count) {
     updateStepLevel(curStep, curLevel, count) {
-      if (curStep.type === "markPaper") {
+      if (curStep.type === "markPaper" || this.curStep.type === "reject") {
         this.getStepLevels();
         this.getStepLevels();
         return;
         return;
       }
       }
@@ -448,12 +448,7 @@ export default {
         }
         }
       }
       }
 
 
-      if (curStep.type === "shift") {
-        const spos = this.steps.otherStep.findIndex(
-          item => item.type === "shiftScore"
-        );
-        this.steps.otherStep[spos].count += count;
-      } else {
+      if (curStep.type !== "shift") {
         const pos = this.steps.levelStep.findIndex(
         const pos = this.steps.levelStep.findIndex(
           item => item.name === curLevel
           item => item.name === curLevel
         );
         );

+ 5 - 12
src/modules/mark/marker/MarkerMarking.vue

@@ -372,19 +372,12 @@ export default {
         return;
         return;
       }
       }
 
 
-      if (curStep.type !== "markPaper") {
-        const opos = this.steps.otherStep.findIndex(
-          item => item.type === curStep.type
-        );
-        this.steps.otherStep[opos].count -= count;
-      }
+      const opos = this.steps.otherStep.findIndex(
+        item => item.type === curStep.type
+      );
+      this.steps.otherStep[opos].count -= count;
 
 
-      if (curStep.type === "shift") {
-        const spos = this.steps.otherStep.findIndex(
-          item => item.type === "shiftScore"
-        );
-        this.steps.otherStep[spos].count += count;
-      } else {
+      if (curStep.type !== "shift") {
         const pos = this.steps.levelStep.findIndex(
         const pos = this.steps.levelStep.findIndex(
           item => item.name === curLevel
           item => item.name === curLevel
         );
         );