zhangjie 2 anos atrás
pai
commit
f79fdea535

+ 1 - 0
src/modules/grading/components/NoticeDialog.vue

@@ -6,6 +6,7 @@
     :mask-closable="false"
     footer-hide
     fullscreen
+    :z-index="2999"
     @on-visible-change="visibleChange"
   >
     <div class="notice-container">

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

@@ -139,7 +139,8 @@ export default {
       } else {
         res = await markTask({
           markTaskId: this.image.id,
-          isMark: !this.image.mark
+          isMark: !this.image.mark,
+          stage: this.stage
         }).catch(() => {});
       }
       this.loading = false;

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

@@ -16,11 +16,18 @@
         </li>
       </ul>
       <div class="overview-actions">
+        <Button
+          v-if="roughLevelEnable"
+          icon="md-download"
+          shape="circle"
+          @click="download(exportRoughGradeScoreUrl)"
+          >导出粗档位成绩</Button
+        >
         <Button
           icon="md-download"
           shape="circle"
           @click="download(exportGradeScoreUrl)"
-          >导出档位成绩</Button
+          >导出 {{ roughLevelEnable ? "细档位" : "档位" }} 成绩</Button
         >
         <Button
           icon="md-download"
@@ -87,6 +94,7 @@ export default {
     return {
       workId: this.$route.params.workId,
       SUBJECT_STAGE,
+      exportRoughGradeScoreUrl: "",
       exportGradeScoreUrl: "",
       exportScoreUrl: "",
       roughLevelEnable: false,
@@ -97,6 +105,7 @@ export default {
   },
   mounted() {
     this.getDetail();
+    this.exportRoughGradeScoreUrl = `${this.GLOBAL.domain}/api/export/score/exportRoughLevelResult?workId=${this.workId}`;
     this.exportGradeScoreUrl = `${this.GLOBAL.domain}/api/export/score/exportLevelResult?workId=${this.workId}`;
     this.exportScoreUrl = `${this.GLOBAL.domain}/api/export/score/exportScoreResult?workId=${this.workId}`;
   },

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

@@ -103,6 +103,12 @@
         </div>
       </div>
     </div>
+    <div v-if="ribbonSet.keyboardMark" class="action-grade-keyboard">
+      <div class="keyboard-input">{{ keyInput }}</div>
+      <div class="keyboard-clear" @click="clearKeyInput">
+        <Icon type="md-trash" />
+      </div>
+    </div>
     <div class="action-grade-pass" v-if="rights.levelPass" @click="toPass">
       跳过
     </div>
@@ -500,7 +506,7 @@ export default {
 
           if (this.checkKeyCodeValid(e.keyCode)) {
             e.preventDefault();
-            this.keyInput += e.key;
+            this.keyInput = (this.keyInput || "") + e.key;
             this.keyInput = this.keyInput.slice(-3);
 
             if (!this.ribbonSet.needEnterSubmit) {