zhangjie 1 year ago
parent
commit
d0b457bfaf

+ 2 - 0
src/modules/grading/leader/LeaderGrading.vue

@@ -703,6 +703,8 @@ export default {
         this.curCarouselPaperIndex < this.carouselPapers.length - 1
       ) {
         this.curCarouselPaperIndex++;
+      } else {
+        return;
       }
       this.selectCarouselPaper(this.curCarouselPaperIndex);
     },

+ 5 - 2
src/modules/grading/marker/MarkerGrading.vue

@@ -609,9 +609,10 @@ export default {
         if (this.curStep.type === "markPaper") this.getList();
       }
     },
-    historyMarkChange(mark) {
+    async historyMarkChange(mark) {
       this.markChange(mark);
-      this.$refs.MarkerHistory.updatePapers();
+      const data = await this.$refs.MarkerHistory.updatePapers();
+      this.carouselPapers = data || [];
     },
     toReview(data) {
       this.setShortcut(["action"]);
@@ -772,6 +773,8 @@ export default {
         this.curCarouselPaperIndex < this.carouselPapers.length - 1
       ) {
         this.curCarouselPaperIndex++;
+      } else {
+        return;
       }
       this.selectCarouselPaper(this.curCarouselPaperIndex);
     },

+ 1 - 0
src/modules/grading/marker/MarkerHistory.vue

@@ -125,6 +125,7 @@ export default {
           : "已评";
         paper.fontFrom = "history";
       });
+      return this.papers;
     },
     getLevelResult(paper) {
       return this.stage === "LEVEL" ? paper.level : paper.roughLevel;

+ 2 - 0
src/modules/mark/leader/LeaderMarking.vue

@@ -503,6 +503,8 @@ export default {
         this.curCarouselPaperIndex < this.carouselPapers.length - 1
       ) {
         this.curCarouselPaperIndex++;
+      } else {
+        return;
       }
       this.selectCarouselPaper(this.curCarouselPaperIndex);
     },

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

@@ -425,9 +425,10 @@ export default {
         if (this.curStep.type === "markPaper") this.getList();
       }
     },
-    historyMarkChange(mark) {
+    async historyMarkChange(mark) {
       this.markChange(mark);
-      this.$refs.MarkerHistory.updatePapers();
+      const data = await this.$refs.MarkerHistory.updatePapers();
+      this.carouselPapers = data || [];
     },
     toReview(data) {
       this.setShortcut(["action"]);
@@ -558,6 +559,8 @@ export default {
         this.curCarouselPaperIndex < this.carouselPapers.length - 1
       ) {
         this.curCarouselPaperIndex++;
+      } else {
+        return;
       }
       this.selectCarouselPaper(this.curCarouselPaperIndex);
     },