标记修改

src/api.js

@@ -66,8 +66,8 @@ export const rotatePaper = (imageId, degree) => {
 export const absentPaper = imageId => {
   return $post(`/api/score/missing/${imageId}`, {});
 };
-export const markPaper = ({ paperId, isMark }) => {
-  return $post(`/api/papers/mark_paper`, { paperId, isMark });
+export const markPaper = ({ paperId, isMark, role }) => {
+  return $post(`/api/papers/mark_paper`, { paperId, isMark, role });
 };
 
 // client-monitor

src/modules/grading/marker/MarkerGrading.vue

@@ -242,7 +242,9 @@ export default {
         datas.level = this.curStep.name;
         datas.sort = "updatedOn,desc";
       }
-
+      if (this.curStep.type === "markPaper") {
+        datas.isMark = true;
+      }
       const data = await markerTaskList(datas);
       this.papers = data.data.map(paper => {
         paper.key = this.$randomCode();
@@ -288,15 +290,26 @@ export default {
         count: undo.rejected,
         type: "reject"
       });
-      let levelStep = data.map(item => {
-        // 评卷员不展示kdpt
-        item.kdpt = null;
-        return {
-          ...item,
-          name: item.id,
-          type: "done"
-        };
-      });
+      const mpInfo = data.find(item => item.id === "markPaper");
+      if (mpInfo) {
+        otherStep.push({
+          count: mpInfo.count,
+          name: "标记",
+          type: "markPaper"
+        });
+      }
+
+      let levelStep = data
+        .filter(item => item.id !== "markPaper")
+        .map(item => {
+          // 评卷员不展示kdpt
+          item.kdpt = null;
+          return {
+            ...item,
+            name: item.id,
+            type: "done"
+          };
+        });
       this.setSteps({ levelStep, otherStep });
 
       if (!this.curStep.name) {

src/modules/grading/marker/MarkerImageView.vue

@@ -50,7 +50,7 @@
 
 <script>
 import ImageViewContain from "@/components/ImageViewContain";
-import { markTask } from "@/api";
+import { markTask, markPaper } from "@/api";
 
 export default {
   name: "marker-image-view",
@@ -88,6 +88,7 @@ export default {
   },
   data() {
     return {
+      curUserRoleType: this.$ls.get("user", { role: "" }).role,
       initImage: {
         id: "",
         thumbSrc: "",
@@ -120,10 +121,19 @@ export default {
     async toMark() {
       if (this.loading) return;
       this.loading = true;
-      const res = await markTask({
-        markTaskId: this.image.id,
-        isMark: !this.image.mark
-      }).catch(() => {});
+      let res = null;
+      if (this.curUserRoleType === "MARK_LEADER") {
+        res = await markPaper({
+          paperId: this.image.id,
+          isMark: !this.image.mark,
+          role: this.curUserRoleType
+        }).catch(() => {});
+      } else {
+        res = await markTask({
+          markTaskId: this.image.id,
+          isMark: !this.image.mark
+        }).catch(() => {});
+      }
       this.loading = false;
       if (!res) return;
       this.image.mark = !this.image.mark;

src/modules/main/PaperManage.vue

@@ -253,7 +253,7 @@ export default {
           imgSrc: paper.imgSrc,
           thumbSrc: paper.thumbSrc,
           missing: paper.missing,
-          mark: paper.mark,
+          mark: paper.adminMark,
           stage: paper.stage,
           styles: {},
           deg: 0

src/modules/main/components/ImageActionList.vue

@@ -95,7 +95,8 @@ export default {
     return {
       curImageIndex: 0,
       stepDeg: 0,
-      saving: false
+      saving: false,
+      curUserRoleType: this.$ls.get("user", { role: "" }).role
     };
   },
   computed: {
@@ -150,7 +151,8 @@ export default {
     async toMark(image) {
       await markPaper({
         paperId: image.id,
-        isMark: !image.mark
+        isMark: !image.mark,
+        role: this.curUserRoleType
       });
       image.mark = !image.mark;
     },

src/modules/mark/marker/MarkerMarking.vue

@@ -235,6 +235,9 @@ export default {
       if (this.curStep.type === "done") {
         datas.level = this.curStep.name;
       }
+      if (this.curStep.type === "markPaper") {
+        datas.isMark = true;
+      }
 
       let requestAction = null;
       if (this.curStep.type.includes("shift")) {
@@ -300,7 +303,7 @@ export default {
       }
 
       let levelStep = data
-        .filter(item => item.id !== "manualScore")
+        .filter(item => item.id !== "manualScore" && item.id !== "markPaper")
         .map(item => {
           return {
             ...item,
@@ -316,6 +319,14 @@ export default {
           type: "manualScore"
         });
       }
+      const mpInfo = data.find(item => item.id === "markPaper");
+      if (mpInfo) {
+        otherStep.push({
+          count: mpInfo.count,
+          name: "标记",
+          type: "markPaper"
+        });
+      }
 
       this.setSteps({ levelStep, otherStep });