zhangjie 2 tahun lalu
induk
melakukan
b2e4e68d62

+ 1 - 1
src/modules/grading/GradingGroupManage.vue

@@ -126,7 +126,7 @@ export default {
       },
       uploadStudentUrl:
         this.GLOBAL.domain + "/api/import/students/import_group_student",
-      downloadStudentTemplateUrl: "/templates/考生名单表-模板.xlsx",
+      downloadStudentTemplateUrl: "/templates/考生信息表-模板.xlsx",
       downloadStudentTemplateFilename: "考生名单表-模板.xlsx"
     };
   },

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

@@ -567,8 +567,7 @@ export default {
   },
   beforeDestroy() {
     if (this.setT) clearTimeout(this.setT);
-    if (this.ribbonSet.keyboardMark)
-      document.removeEventListener("click", this.keyEvent);
+    document.removeEventListener("keydown", this.keyEvent);
   }
 };
 </script>

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

@@ -739,8 +739,7 @@ export default {
   },
   beforeDestroy() {
     if (this.setT) clearTimeout(this.setT);
-    if (this.ribbonSet.keyboardMark)
-      document.removeEventListener("click", this.keyEvent);
+    document.removeEventListener("keydown", this.keyEvent);
   }
 };
 </script>

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

@@ -10,7 +10,7 @@
       ref="modalFormComp"
       class="ribbon-set-form"
       :model="ribbonSetModal"
-      :label-width="120"
+      :label-width="140"
     >
       <FormItem label="启用键盘">
         <i-switch v-model="ribbonSetModal.keyboardMark"></i-switch>

+ 6 - 4
src/modules/grading/marker/MarkerGrading.vue

@@ -424,10 +424,12 @@ export default {
         );
         this.steps.levelStep[lpos].count -= count;
       } else {
-        const opos = this.steps.otherStep.findIndex(
-          item => item.type === curStep.type
-        );
-        this.steps.otherStep[opos].count -= count;
+        if (curStep.type !== "markPaper") {
+          const opos = this.steps.otherStep.findIndex(
+            item => item.type === curStep.type
+          );
+          this.steps.otherStep[opos].count -= count;
+        }
       }
 
       if (curStep.type === "shift") {

+ 1 - 1
src/modules/main/StudentManage.vue

@@ -357,7 +357,7 @@ export default {
           const [subjectCode, subjectUploadStatus] = status.split(":");
           student[subjectCode] = subjectUploadStatus * 1;
         });
-        student.canEdit = student.uploadStatus.includes("0");
+        student.canEdit = !student.uploadStatus.includes("1");
         student.canDelete = !student.uploadStatus.includes("1");
         student.uploadStatus.split(",").map(status => {
           const [subject, hasScan] = status.split(":");

+ 1 - 2
src/modules/mark/components/MarkAction.vue

@@ -580,8 +580,7 @@ export default {
   },
   beforeDestroy() {
     if (this.setT) clearTimeout(this.setT);
-    if (this.ribbonSet.keyboardMark)
-      document.removeEventListener("click", this.keyEvent);
+    document.removeEventListener("keydown", this.keyEvent);
   }
 };
 </script>

+ 6 - 4
src/modules/mark/marker/MarkerMarking.vue

@@ -365,10 +365,12 @@ export default {
     updateStepLevel(curStep, curLevel, count = 1) {
       if (curStep.type === "done") return;
 
-      const opos = this.steps.otherStep.findIndex(
-        item => item.type === curStep.type
-      );
-      this.steps.otherStep[opos].count -= count;
+      if (curStep.type !== "markPaper") {
+        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(