bug 修改

src/App.vue

@@ -12,8 +12,8 @@ export default {
   mixins: [timeMixin],
   data() {
     return {
-      unactiveTime: 5 * 60 * 1000,
-      // unactiveTime: 5000 * 60 * 1000,
+      // unactiveTime: 0,
+      unactiveTime: 10 * 60 * 1000,
       timeIsOut: false
     };
   },
@@ -24,6 +24,7 @@ export default {
   },
   mounted() {
     if (process.env.NODE_ENV !== "production") return;
+    if (!this.unactiveTime) return;
     this.registPageAction();
     document.addEventListener("click", this.registPageAction);
   },

src/assets/styles/mark.less

@@ -613,6 +613,14 @@
 .grade-action {
   font-size: 14px;
   text-align: center;
+  .grade-info-deviation {
+    margin-left: 10px;
+    color: @dark-color-lighter;
+
+    &-error {
+      color: @error-color;
+    }
+  }
   .action-search {
     margin-top: 20px;
     padding-top: 20px;
@@ -655,10 +663,6 @@
       width: 100%;
       height: 20px;
       text-align: center;
-
-      span:not(:first-child) {
-        margin-left: 10px;
-      }
     }
   }
 

src/components/SimpleImagePreview.vue

@@ -13,7 +13,7 @@
       <Icon type="ios-close" />
     </div>
 
-    <div :class="[`${prefixCls}-body`]" ref="ReviewBody">
+    <div :class="[`${prefixCls}-body`]" ref="ReviewBody" @click="cancel">
       <div
         :class="[`${prefixCls}-guide`, `${prefixCls}-guide-prev`]"
         @click.stop="showPrev"

src/components/ViewFooter.vue

@@ -2,7 +2,7 @@
   <div class="view-footer home-footer">
     <p>
       Copyright ©
-      <a href="http:\\www.qmth.com.cn" target="_blank">www.qmth.com.cn</a>, All
+      <a href="https://www.qmth.com.cn/" target="_blank">启明泰和</a>, All
       Rights Reserved.
     </p>
   </div>

src/modules/grading/GradingDetail.vue

@@ -556,7 +556,7 @@ export default {
       this.$refs.ModifyLeaderGrading.open();
     },
     async leaderGradingSuccess(datas, paper) {
-      if (datas.action === "sampling") {
+      if (datas.action === "sampling" && this.$refs.GradeStandardPaper) {
         this.$refs.GradeStandardPaper.updateLevelPapers(datas.level);
       }
       this.getStepLevels();
@@ -610,6 +610,7 @@ export default {
       this.selectCarouselPaper(this.curCarouselPaperIndex);
     },
     toSampleCarousePaper(type) {
+      if (!this.$refs.GradeStandardPaper) return;
       if (type === "prev") {
         this.$refs.GradeStandardPaper.$refs.PaperCarousel.handleLeft();
       } else if (type === "next") {

src/modules/grading/components/GradeAction.vue

@@ -11,16 +11,6 @@
         <span v-if="curPaperOrTask.rejectedCount"
           >共打回{{ curPaperOrTask.rejectedCount }}次</span
         >
-        <span
-          v-if="
-            !curPaperOrTask.isRejectedByLeader &&
-              paramsSet.autoCallbackShowDeviation &&
-              curPaperOrTask.deviationDirection
-          "
-          >{{
-            curPaperOrTask.deviationDirection * 1 > 0 ? "偏高" : "偏低"
-          }}</span
-        >
       </p>
     </div>
     <div class="action-paper-state" v-else>
@@ -65,6 +55,26 @@
     </div>
     <!-- 档位信息 -->
     <!-- 已评（已评档位），打回（建议档位） -->
+    <h3
+      class="action-grade-info-title"
+      v-if="IS_MARKER && stepType === 'reject'"
+    >
+      <span>原分档档位：{{ curPaperOrTask.originLevel || "" }}</span>
+      <span
+        v-if="
+          paramsSet.autoCallbackShowDeviation &&
+            curPaperOrTask.deviationDirection
+        "
+        :class="[
+          'grade-info-deviation',
+          {
+            'grade-info-deviation-error':
+              curPaperOrTask.deviationDirection * 1 > 0
+          }
+        ]"
+        >{{ curPaperOrTask.deviationDirection * 1 > 0 ? "偏高" : "偏低" }}</span
+      >
+    </h3>
     <h3 class="action-grade-info-title">
       <span v-if="curPaperOrTask.rejected && curPaperOrTask.isRejectedByLeader"
         >建议档位：</span

src/modules/login/LoginHome.vue

@@ -44,7 +44,7 @@
     <div class="login-footer">
       <p>
         Copyright ©
-        <a href="http:\\www.qmth.com" target="_blank">www.qmth.com.cn</a>, All
+        <a href="https://www.qmth.com.cn/" target="_blank">启明泰和</a>, All
         Rights Reserved.
       </p>
     </div>

src/modules/main/StudentManage.vue

@@ -440,8 +440,8 @@ export default {
         this.columns.splice(this.columns.length - 1, 0, column);
       });
       this.subjects.unshift({
-        subject: "ALL",
-        name: "全部"
+        subject: "ONE",
+        name: "只缺一科"
       });
     },
     async toManual(row, subject) {

src/modules/mark/MarkOperation.vue

@@ -253,6 +253,7 @@ export default {
       const datas = {
         ...this.filter,
         ...this.typeFilter[this.curStep.type],
+        subject: this.subject,
         workId: this.workId,
         page: this.current - 1,
         size: this.size