浏览代码

一些优化

zhangjie 4 年之前
父节点
当前提交
58ad655d91

+ 30 - 3
src/assets/styles/mark.less

@@ -317,19 +317,31 @@
     overflow-x: hidden;
     overflow-x: hidden;
   }
   }
   .detail-papers {
   .detail-papers {
-    padding: 20px;
+    padding: 0 20px;
     margin-right: 300px;
     margin-right: 300px;
     background-color: @white;
     background-color: @white;
     border-radius: @box-border-radius;
     border-radius: @box-border-radius;
     font-size: 0;
     font-size: 0;
+    display: flex;
 
 
     &-carousel {
     &-carousel {
+      position: relative;
       display: inline-block;
       display: inline-block;
       vertical-align: top;
       vertical-align: top;
+      padding: 20px 0;
       font-size: 14px;
       font-size: 14px;
       &-split {
       &-split {
         height: 40px;
         height: 40px;
       }
       }
+      &::after {
+        content: "";
+        position: absolute;
+        height: 100%;
+        border-left: 1px solid #eff0f5;
+        right: 0;
+        top: 0;
+        z-index: auto;
+      }
     }
     }
     &-list {
     &-list {
       display: inline-block;
       display: inline-block;
@@ -338,13 +350,13 @@
       font-size: 14px;
       font-size: 14px;
       min-height: 625px;
       min-height: 625px;
       position: relative;
       position: relative;
-      padding-bottom: 60px;
+      padding: 20px 0 80px;
       .image-view-list {
       .image-view-list {
         margin: 0;
         margin: 0;
       }
       }
       .part-page {
       .part-page {
         position: absolute;
         position: absolute;
-        bottom: 10px;
+        bottom: 30px;
         width: 100%;
         width: 100%;
         z-index: auto;
         z-index: auto;
       }
       }
@@ -690,6 +702,21 @@
       }
       }
     }
     }
   }
   }
+  .action-grade-pass {
+    height: 60px;
+    background-color: #f7f7fa;
+    border-radius: 20px;
+    padding: 14px;
+    color: @dark-color-light;
+    font-weight: 600;
+    line-height: 32px;
+    font-size: 20px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: shade(#f7f7fa, 5%);
+    }
+  }
 }
 }
 .mark-action {
 .mark-action {
   .mark-info {
   .mark-info {

+ 6 - 2
src/modules/grading/components/GradeAction.vue

@@ -85,8 +85,12 @@
         </div>
         </div>
       </div>
       </div>
     </div>
     </div>
-    <div class="action-grade-pass" v-if="rights.gradeList && IS_MARKER">
-      <Button @click="toPass">跳过</Button>
+    <div
+      class="action-grade-pass"
+      v-if="rights.gradeList && IS_MARKER"
+      @click="toPass"
+    >
+      跳过
     </div>
     </div>
 
 
     <!-- 评卷记录 -->
     <!-- 评卷记录 -->

+ 3 - 4
src/modules/main/PaperManage.vue

@@ -176,10 +176,9 @@ export default {
       };
       };
       const data = await paperPageList(datas);
       const data = await paperPageList(datas);
       this.papers = data.data.map(paper => {
       this.papers = data.data.map(paper => {
-        const title =
-          this.paperType === "0"
-            ? `${paper.examNumber} ${paper.studentName}`
-            : paper.examNumber;
+        const title = paper.manual
+          ? `${paper.examNumber} ${paper.studentName}`
+          : paper.examNumber;
         return {
         return {
           id: paper.id,
           id: paper.id,
           title,
           title,

+ 4 - 0
src/modules/main/StudentManage.vue

@@ -364,6 +364,10 @@ export default {
           student[subject] = hasScan;
           student[subject] = hasScan;
         });
         });
         student.workId = this.filter.workId;
         student.workId = this.filter.workId;
+        student.relateExamNumber =
+          student.relateExamNumber === student.examNumber
+            ? "--"
+            : student.relateExamNumber;
         return student;
         return student;
       });
       });
       this.total = data.totalCount;
       this.total = data.totalCount;

+ 2 - 2
src/modules/mark/components/MarkAction.vue

@@ -172,8 +172,8 @@
         }}之间
         }}之间
       </p>
       </p>
     </div>
     </div>
-    <div class="action-grade-pass" v-if="rights.levelList">
-      <Button @click="toPass">跳过</Button>
+    <div class="action-grade-pass" v-if="rights.levelList" @click="toPass">
+      跳过
     </div>
     </div>
     <!-- mark confirm grade change -->
     <!-- mark confirm grade change -->
     <div
     <div