zhangjie 4 жил өмнө
parent
commit
979c95467c

+ 3 - 2
src/App.vue

@@ -12,8 +12,8 @@ export default {
   mixins: [timeMixin],
   data() {
     return {
-      // unactiveTime: 5 * 1000,
-      unactiveTime: 5 * 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);
   },

+ 3 - 3
src/assets/styles/common-component.less

@@ -93,9 +93,9 @@
   }
   &-footer {
     position: absolute;
-    height: 60px;
+    width: 60px;
     bottom: 0;
-    right: 20px;
+    right: 0;
     padding: 10px;
     font-size: 30px;
     color: #333;
@@ -113,7 +113,7 @@
     }
     li:hover {
       // color: #000;
-      transform: scale(1.1, 1.1);
+      transform: scale(1.2, 1.2);
     }
     li.li-disabled {
       cursor: not-allowed;

+ 8 - 4
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;
-      }
     }
   }
 

+ 15 - 11
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>
@@ -71,7 +61,21 @@
       class="action-grade-info-title"
       v-if="IS_MARKER && stepType === 'reject'"
     >
-      原档位:{{ curPaperOrTask.originLevel || "" }}
+      <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"