bug fix

src/components/SimpleImagePreview.vue

@@ -5,22 +5,25 @@
     title="图片预览"
     fullscreen
     footer-hide
+    :closable="canClose"
+    :mask-closable="canClose"
     @on-visible-change="visibleChange"
   >
     <div slot="header"></div>
-    <div :class="[`${prefixCls}-close`]" @click="cancel">
-      <i class="el-icon-circle-close"></i>
+    <div v-if="canClose" :class="[`${prefixCls}-close`]" @click="cancel">
       <Icon type="ios-close" />
     </div>
 
     <div :class="[`${prefixCls}-body`]" ref="ReviewBody">
       <div
+        v-if="canClose"
         :class="[`${prefixCls}-guide`, `${prefixCls}-guide-prev`]"
         @click.stop="showPrev"
       >
         <Icon type="ios-arrow-back" />
       </div>
       <div
+        v-if="canClose"
         :class="[`${prefixCls}-guide`, `${prefixCls}-guide-next`]"
         @click.stop="showNext"
       >
@@ -96,6 +99,10 @@ export default {
       default() {
         return {};
       }
+    },
+    canClose: {
+      type: Boolean,
+      default: true
     }
   },
   directives: { MoveEle },

src/modules/grading/components/GradeAction.vue

@@ -121,10 +121,10 @@
       </div>
     </div>
 
-    <!-- 跳过 -->
+    <!-- 跳过:自测卷不允许跳过 -->
     <div
       class="action-grade-pass"
-      v-if="rights.gradePass && IS_MARKER"
+      v-if="rights.gradePass && IS_MARKER && !curPaperOrTask.selfCheck"
       @click="toPass"
     >
       跳过

src/modules/grading/components/GradeActionRough.vue

@@ -188,10 +188,10 @@
         <Icon type="md-trash" />
       </div>
     </div>
-    <!-- 跳过 -->
+    <!-- 跳过：自测卷不允许跳过 -->
     <div
       class="action-grade-pass"
-      v-if="rights.gradePass && IS_MARKER"
+      v-if="rights.gradePass && IS_MARKER && !curPaperOrTask.selfCheck"
       @click="toPass"
     >
       跳过

src/modules/grading/marker/MarkerGrading.vue

@@ -119,6 +119,7 @@
     <simple-image-preview
       class="grading-operation-image-preview"
       :cur-image="curPaper"
+      :can-close="!curPaper.selfCheck"
       @on-prev="toPrevPaper"
       @on-next="toNextPaper"
       @on-close="imagePreviewClose"
@@ -368,8 +369,7 @@ export default {
       if (!task) return;
 
       this.paperKey = this.$randomCode();
-      this.curPaper = { ...task, isSelfCheck: true };
-      console.log(this.curPaper);
+      this.curPaper = task;
       if (this.isFullscreenMarking) return;
 
       this.setShortcut(["action"]);
@@ -518,7 +518,7 @@ export default {
       this.setCurArea(curArea);
       this.filter.questionId = curArea.id;
       await this.getStepLevels();
-      this.toPage(1);
+      await this.toPage(1);
       // 刷新页面时只触发areaChange
       if (this.IS_UNDO_STEP) {
         await this.gotoSelfCheckTask();
@@ -701,7 +701,7 @@ export default {
     },
     async gradeCurPaper(level) {
       let gradeRes = null;
-      if (this.curPaper.isSelfCheck) {
+      if (this.curPaper.selfCheck) {
         gradeRes = await markerSelfCheckLevel(
           this.curPaper.id, // is taskId
           level.name
@@ -725,7 +725,7 @@ export default {
         this.$refs.CarouselPapersPreview.cancel();
         this.$refs.MarkerHistory.updatePapers();
       } else {
-        if (!this.curPaper.isSelfCheck)
+        if (!this.curPaper.selfCheck)
           this.updateStepLevel(this.curStep, level.name, 1);
 
         // 待评阶段：自查卷获取逻辑