zhangjie 2 vuotta sitten
vanhempi
commit
c117ecc121

+ 1 - 0
src/modules/grading-set/GradingLevelSet.vue

@@ -284,6 +284,7 @@ export default {
       this.levels = data.levels.map(item => {
         let nitem = { ...item };
         nitem.canEdit = false;
+        nitem.roughCode = nitem.roughCode * 1;
         return nitem;
       });
     },

+ 0 - 1
src/modules/grading-set/GradingRuleSet.vue

@@ -427,7 +427,6 @@ export default {
     },
     roughLevelChange(val) {
       if (val) {
-        this.modalFormRough = { ...initModalForm };
         this.modalFormRoughCanEdit = true;
       }
     },

+ 1 - 1
src/modules/grading/marker/MarkerGrading.vue

@@ -274,7 +274,7 @@ export default {
       const datas = {
         ...this.filter,
         ...this.typeFilter[this.curStep.type],
-        workId: this.workId,
+        ...this.workSubject,
         page: this.page.current - 1,
         size: this.page.size
       };

+ 1 - 1
src/modules/grading/marker/MarkerImageView.vue

@@ -12,7 +12,7 @@
             {{ image.roughLevel | levelNameFilter }}
           </div>
           <div v-if="image.level" class="image-level">
-            {{ image.level }}
+            {{ image.level | levelNameFilter }}
           </div>
           <div v-if="image.sample" class="image-sample">标</div>
           <div

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

@@ -27,7 +27,7 @@
           icon="md-download"
           shape="circle"
           @click="download(exportGradeScoreUrl)"
-          >导出 {{ roughLevelEnable ? "细档位" : "档位" }} 成绩</Button
+          >导出{{ roughLevelEnable ? "细档位" : "档位" }}成绩</Button
         >
         <Button
           icon="md-download"

+ 1 - 2
src/modules/mark/marker/MarkerMarking.vue

@@ -246,8 +246,7 @@ export default {
       const datas = {
         ...this.filter,
         ...this.typeFilter[this.curStep.type],
-        subject: this.subject,
-        workId: this.workId,
+        ...this.workSubject,
         page: this.page.current - 1,
         size: this.page.size
       };