zhangjie 4 年 前
コミット
d6d5aa6e6a

+ 1 - 1
src/components/common/ImagePreview/ImagePreview.vue

@@ -179,7 +179,7 @@ export default {
         };
         this.preLoadFiles = [];
         this.loading = false;
-        clearTimeout(this.loadingSetT);
+        if (this.loadingSetT) clearTimeout(this.loadingSetT);
         this.nosition = false;
       }
     },

+ 3 - 1
src/modules/grading/GradingDetail.vue

@@ -392,7 +392,9 @@ export default {
     },
     areaChange() {
       if (this.curStep.type === "analysis") {
-        this.$refs.GradeAnalysis.initData();
+        this.$nextTick(() => {
+          this.$refs.GradeAnalysis.initData();
+        });
       } else {
         this.getStepLevels();
         this.toPage(1);

+ 2 - 2
src/modules/grading/components/GradeStandardPaper.vue

@@ -108,13 +108,13 @@ export default {
       this.paperMap[this.curLevel] = data.data;
     },
     prevLevel() {
-      if (this.isFirst) return;
+      if (this.isFirstLevel) return;
       this.curLevelIndex--;
       this.setCurLevel(this.curLevelIndex);
       this.updatePapers();
     },
     nextLevel() {
-      if (this.isLast) return;
+      if (this.isLastLevel) return;
       this.curLevelIndex++;
       this.setCurLevel(this.curLevelIndex);
       this.updatePapers();

+ 4 - 5
src/modules/main/PaperManage.vue

@@ -7,7 +7,6 @@
             v-model="filter.subject"
             @on-change="subjectChange"
             placeholder="科目"
-            clearable
           >
             <Option
               v-for="(item, index) in subjects"
@@ -62,7 +61,7 @@
         </FormItem>
         <FormItem>
           <Input
-            v-model.trim="filter.name"
+            v-model.trim="filter.studentName"
             placeholder="输入姓名"
             clearable
           ></Input>
@@ -119,7 +118,7 @@ export default {
     return {
       filter: {
         workId: this.$route.params.workId,
-        name: "",
+        studentName: "",
         areaCode: "",
         startNumber: null,
         endNumber: null,
@@ -194,9 +193,9 @@ export default {
     typeChange() {
       if (this.paperType === "1") {
         this.filter.isManual = true;
-        this.filter.missing = false;
+        this.filter.missing = null;
       } else if (this.paperType === "0") {
-        this.filter.isManual = false;
+        this.filter.isManual = null;
         this.filter.missing = true;
       } else {
         this.filter.isManual = null;

+ 2 - 1
src/modules/main/QualityAnalysis.vue

@@ -162,7 +162,8 @@ export default {
   },
   methods: {
     async getSubjects() {
-      this.subjects = await subjectList(this.filter.workId);
+      const data = await subjectList(this.filter.workId);
+      this.subjects = data.filter(item => item.enable);
     },
     async getAreaList() {
       const data = await areaList({