标记修改

src/api.js

@@ -444,6 +444,10 @@ export const markerManualScorePaperList = datas => {
   // ?markerId=49&workId=22&questionId=10&size=6&page=0
   return $get(`/api/marktasks/manualScore`, datas);
 };
+export const markerMarkPaperList = datas => {
+  // ?markerId=15&questionId=2&subject=SC&workId=25&stage=&page=0&size=12
+  return $get(`/api/marktasks/markedPapers`, datas);
+};
 
 // inspection -------------------------->
 // inspection-log

src/modules/grading/marker/MarkerGrading.vue

@@ -140,6 +140,7 @@ import SimpleImagePreview from "@/components/SimpleImagePreview";
 
 import {
   markerTaskList,
+  markerMarkPaperList,
   markerLevelTotalStatData,
   workLevelList,
   paperSelectLevelOrScore,
@@ -174,7 +175,8 @@ export default {
         undo: {},
         reject: {
           reject: true
-        }
+        },
+        markPaper: {}
       },
       workId: this.$route.params.workId,
       subjectId: this.$route.params.subjectId,
@@ -242,10 +244,15 @@ export default {
         datas.level = this.curStep.name;
         datas.sort = "updatedOn,desc";
       }
+
+      let requestAction = null;
       if (this.curStep.type === "markPaper") {
-        datas.isMark = true;
+        requestAction = markerMarkPaperList;
+      } else {
+        requestAction = markerTaskList;
       }
-      const data = await markerTaskList(datas);
+
+      const data = await requestAction(datas);
       this.papers = data.data.map(paper => {
         paper.key = this.$randomCode();
         paper.title = `NO.${paper.sn}`;

src/modules/mark/marker/MarkerMarking.vue

@@ -123,6 +123,7 @@ import {
   workLevelList,
   paperSelectLevelOrScore,
   markerManualScorePaperList,
+  markerMarkPaperList,
   paperTaskPass
 } from "@/api";
 
@@ -159,7 +160,10 @@ export default {
           isShift: false,
           isShiftScore: true
         },
-        manualScore: {}
+        manualScore: {},
+        markPaper: {
+          stage: "SCORE"
+        }
       },
       stage: "SCORE",
       workId: this.$route.params.workId,
@@ -235,15 +239,14 @@ 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")) {
         requestAction = markerChangeLevelPaperList;
       } else if (this.curStep.type === "manualScore") {
         requestAction = markerManualScorePaperList;
+      } else if (this.curStep.type === "markPaper") {
+        requestAction = markerMarkPaperList;
       } else {
         requestAction = markerTaskList;
       }