zhangjie 2 éve
szülő
commit
d055784400

+ 6 - 0
src/modules/grading/GradingProgress.vue

@@ -226,6 +226,12 @@ export default {
     },
     async getParamsSetInfo() {
       this.paramsSet = await getParamsSet(this.workId);
+      if (
+        this.curSubject.roughLevelEnable &&
+        this.curSubject.stage === "ROUGH_LEVEL"
+      ) {
+        this.paramsSet.levelConfig = this.paramsSet.roughLevelConfig;
+      }
     },
     async getProgressDetail() {
       const data = await gradingProgressDetail({

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

@@ -403,7 +403,11 @@ export default {
     ...mapMutations("marker", ["setShortcutStatus"]),
     getStepType() {
       const info = this.curPaperOrTask;
-      if (info.sample) return "sample";
+      if (
+        (this.curSubject.stage === "LEVEL" && info.sample) ||
+        (this.curSubject.stage === "ROUGH_LEVEL" && info.roughSample)
+      )
+        return "sample";
       if (this.curPaperOrTaskLevel) return "done";
       if (info.arbitrated) return "arbitrate";
       if (info.rejected) return "reject";

+ 10 - 3
src/modules/grading/marker/MarkerImageView.vue

@@ -14,7 +14,7 @@
           <div v-if="image.level" class="image-level">
             {{ image.level | levelNameFilter }}
           </div>
-          <div v-if="image.sample" class="image-sample">标</div>
+          <div v-if="IS_SAMPLE" class="image-sample">标</div>
           <div
             v-else
             :class="[
@@ -79,6 +79,12 @@ export default {
   computed: {
     IS_LEVEL() {
       return this.stage === "LEVEL" || this.stage === "ROUGH_LEVEL";
+    },
+    IS_SAMPLE() {
+      return (
+        (this.stage === "LEVEL" && this.image.sample) ||
+        (this.stage === "ROUGH_LEVEL" && this.image.roughSample)
+      );
     }
   },
   created() {
@@ -105,6 +111,7 @@ export default {
         mark: false,
         markDisabled: false,
         sample: false,
+        roughSample: false,
         selected: false
       },
       loading: false,
@@ -149,12 +156,12 @@ export default {
       this.$emit("on-mark", this.image.mark);
     },
     toSelect() {
-      if (this.image.sample || !this.IS_LEVEL) return;
+      if (this.IS_SAMPLE || !this.IS_LEVEL) return;
       this.image.selected = !this.image.selected;
       this.$emit("to-select", this.image);
     },
     changeSelect(selected) {
-      if (this.image.sample) return;
+      if (this.IS_SAMPLE) return;
       this.image.selected = selected;
       this.$emit("to-select", this.image);
     }