历史记录操作不再自动下一个

src/assets/styles/mark.less

@@ -94,6 +94,8 @@
     position: absolute;
     bottom: 15px;
     right: 15px;
+    left: 15px;
+    text-align: right;
     z-index: 8;
   }
 }

src/modules/grading/GradingGroupManage.vue

@@ -44,7 +44,7 @@
               ghost
               icon="upload icon"
               @click="toImportGroupStudent(group)"
-              >导入考生名单</Button
+              >导入考生</Button
             >
             <Button
               shape="circle"
@@ -53,7 +53,7 @@
               ghost
               :disabled="!group.hasStudent"
               @click="toDeleteGroupStudent(group)"
-              >删除导入考生</Button
+              >删除考生</Button
             >
           </div>
         </div>

src/modules/grading/leader/LeaderGrading.vue

@@ -570,6 +570,12 @@ export default {
     async leaderGradingSuccess(datas, paper) {
       this.getStepLevels();
 
+      if (this.carouselType) {
+        this.$refs.CarouselPapersPreview.cancel();
+        this.$refs.MarkerHistory.updatePapers();
+        return;
+      }
+
       if (this.multipleGradingList && this.multipleGradingList.length) {
         // 批量处理逻辑
         if (

src/modules/grading/marker/MarkerGrading.vue

@@ -63,6 +63,7 @@
           toViewCarouselPaper(index, papers, 'history');
         }
       "
+      @on-close="getList"
       ref="MarkerHistory"
     ></marker-history>
     <!-- MarkerStandard -->
@@ -476,8 +477,20 @@ export default {
         "LEVEL"
       );
       if (!paper) return;
-      this.updateStepLevel(this.curStep, level.name, 1);
-      this.toActionNextPaper();
+
+      if (this.carouselType) {
+        this.updateStepLevel(
+          { type: "done", name: this.curPaper.level },
+          level.name,
+          1
+        );
+
+        this.$refs.CarouselPapersPreview.cancel();
+        this.$refs.MarkerHistory.updatePapers();
+      } else {
+        this.updateStepLevel(this.curStep, level.name, 1);
+        this.toActionNextPaper();
+      }
     },
     async passCurPaper() {
       await paperTaskPass(this.curPaper.id);

src/modules/grading/marker/MarkerHistory.vue

@@ -74,6 +74,8 @@ export default {
     visibleChange(visible) {
       if (visible) {
         this.updatePapers();
+      } else {
+        this.$emit("on-close");
       }
     },
     async updatePapers() {

src/modules/mark/leader/LeaderMarking.vue

@@ -64,7 +64,7 @@
       :stage="stage"
       @on-paper-click="
         (index, papers) => {
-          toViewCarouselPaper(index, papers);
+          toViewCarouselPaper(index, papers, 'history');
         }
       "
       ref="MarkerHistory"
@@ -142,6 +142,7 @@ export default {
       curPaper: {},
       curPaperIndex: 0,
       // carousel paper review,
+      carouselType: "",
       carouselPapers: [],
       curCarouselPaperIndex: 0,
       isFullscreenMarking: false
@@ -455,12 +456,18 @@ export default {
           });
           this.$Message.success("申请改档成功！");
           this.getStepLevels();
-          this.toActionNextPaper();
+          if (this.carouselType) {
+            this.$refs.CarouselPapersPreview.cancel();
+            this.$refs.MarkerHistory.updatePapers();
+          } else {
+            this.toActionNextPaper();
+          }
         }
       });
     },
     // paper carousel
-    toViewCarouselPaper(paperIndex, papers) {
+    toViewCarouselPaper(paperIndex, papers, type) {
+      this.carouselType = type;
       this.isFullscreenMarking = true;
       this.carouselPapers = papers;
       this.selectCarouselPaper(paperIndex);
@@ -484,6 +491,7 @@ export default {
       this.selectCarouselPaper(this.curCarouselPaperIndex);
     },
     carouseImagePreviewClose() {
+      this.carouselType = "";
       this.isFullscreenMarking = false;
       this.selectPaper(this.curPaperIndex);
     },

src/modules/mark/marker/MarkerMarking.vue

@@ -177,6 +177,7 @@ export default {
       curPaperIndex: 0,
       paramsSetReady: false,
       // carousel paper review,
+      carouselType: "",
       carouselPapers: [],
       curCarouselPaperIndex: 0,
       isFullscreenMarking: false,
@@ -469,15 +470,21 @@ export default {
         "SCORE"
       );
       if (!paper) return;
-      this.updateStepLevel(this.curStep, this.curPaper.level);
-      this.toActionNextPaper();
+      if (this.carouselType) {
+        this.$refs.CarouselPapersPreview.cancel();
+        this.$refs.MarkerHistory.updatePapers();
+      } else {
+        this.updateStepLevel(this.curStep, this.curPaper.level);
+        this.toActionNextPaper();
+      }
     },
-    async passCurPaper(level) {
+    async passCurPaper() {
       await paperTaskPass(this.curPaper.id);
       this.toActionNextPaper();
     },
     // paper carousel
-    toViewCarouselPaper(paperIndex, papers) {
+    toViewCarouselPaper(paperIndex, papers, type) {
+      this.carouselType = type;
       this.isFullscreenMarking = true;
       this.carouselPapers = papers;
       this.selectCarouselPaper(paperIndex);
@@ -501,6 +508,7 @@ export default {
       this.selectCarouselPaper(this.curCarouselPaperIndex);
     },
     carouseImagePreviewClose() {
+      this.carouselType = "";
       this.isFullscreenMarking = false;
       this.selectPaper(this.curPaperIndex);
     },