zhangjie 4 年之前
父节点
当前提交
85d01e05cb

+ 4 - 1
src/modules/grading/GradingProgress.vue

@@ -52,7 +52,10 @@
       </Col>
       <Col span="12">
         <div class="part-box progress-table">
-          <table class="table table-noborder" v-if="IS_LEVEL">
+          <table
+            class="table table-noborder"
+            v-if="IS_LEVEL && markerProgress.length"
+          >
             <tr>
               <td>{{ kzzInfo.name }}</td>
               <td colspan="3" style="text-align:left">

+ 1 - 0
src/modules/grading/components/GradeAction.vue

@@ -18,6 +18,7 @@
         class="search-input"
         v-model.trim="filter.code"
         placeholder="输入密号"
+        clearable
       >
       </Input>
       <Button size="small" type="primary" class="search-btn" @click="searchCode"

+ 1 - 1
src/modules/main/PaperManage.vue

@@ -172,7 +172,7 @@ export default {
           thumbSrc: paper.thumbSrc,
           missing: paper.missing,
           stage: paper.stage,
-          style: {},
+          styles: {},
           deg: 0
         };
       });

+ 19 - 10
src/modules/main/components/ImageActionList.vue

@@ -11,19 +11,20 @@
           />
         </div>
         <div class="image-view-actions" v-if="actions.length">
-          <Button
-            size="small"
-            icon="md-refresh"
-            @click="toRotate(image)"
-            v-if="canRotate"
-          ></Button>
           <Button
             size="small"
             type="primary"
             @click="toSaveRotate(image)"
-            v-if="canRotate && image['deg']"
+            :disabled="saving"
+            v-if="canRotate && image['stepDeg']"
             >保存</Button
           >
+          <Button
+            size="small"
+            icon="md-refresh"
+            @click="toRotate(image)"
+            v-if="canRotate"
+          ></Button>
           <Button
             :type="image.missing ? 'error' : 'default'"
             size="small"
@@ -63,7 +64,8 @@ export default {
   data() {
     return {
       curImageIndex: 0,
-      stepDeg: 0
+      stepDeg: 0,
+      saving: false
     };
   },
   computed: {
@@ -83,7 +85,7 @@ export default {
   },
   methods: {
     toRotate(image) {
-      if (!image["stepDeg"]) image.stepDeg = 0;
+      if (!image["stepDeg"]) this.$set(image, "stepDeg", 0);
       image.deg += 90;
       if (image.deg === 360) image.deg = 0;
       image.stepDeg += 90;
@@ -93,9 +95,16 @@ export default {
       };
     },
     async toSaveRotate(image) {
+      if (this.saving) return;
       if (!image.stepDeg) return;
+      this.saving = true;
 
-      await rotatePaper(image.id, image.stepDeg);
+      let result = true;
+      await rotatePaper(image.id, image.stepDeg).catch(() => {
+        result = false;
+      });
+      this.saving = false;
+      if (!result) return;
       image.stepDeg = 0;
       this.$Message.success("保存成功!");
     },

+ 1 - 1
src/modules/mark/MarkDetail.vue

@@ -412,7 +412,7 @@ export default {
         this.$Message.error("没有查找到结果!");
         return;
       }
-      data.title = data.examNumber;
+      data.title = this.IS_ADMIN ? data.examNumber : `NO.${data.sn}`;
       this.papers = [data];
       this.total = 1;
     },

+ 1 - 0
src/modules/mark/components/MarkAction.vue

@@ -18,6 +18,7 @@
         class="search-input"
         v-model.trim="filter.code"
         placeholder="输入密号"
+        clearable
       >
       </Input>
       <Button size="small" type="primary" class="search-btn" @click="searchCode"

+ 1 - 1
src/modules/quality/Quality.vue

@@ -230,7 +230,7 @@ export default {
           thumbSrc: paper.thumbSrc,
           missing: paper.missing,
           stage: paper.stage,
-          style: {},
+          styles: {},
           deg: 0
         };
       });