zhangjie 10 月之前
父节点
当前提交
949da5a671

+ 1 - 1
src/assets/styles/common-comp.scss

@@ -78,7 +78,7 @@
     height: 80px;
     line-height: 80px;
     top: 50%;
-    margin-top: -80px;
+    margin-top: -40px;
     text-align: center;
     color: #d0d0d0;
     z-index: 9;

+ 1 - 1
src/assets/styles/element-ui-costom.scss

@@ -168,7 +168,7 @@
     border-radius: $--border-radius;
     border-color: #ddd;
     background-color: #fff;
-    padding: 0 8px;
+    padding-left: 8px;
   }
   // .el-input__suffix {
   //   right: 0;

+ 16 - 4
src/assets/styles/pages.scss

@@ -489,17 +489,29 @@
     padding-left: 5px !important;
     padding-right: 5px !important;
   }
+  .cursor-column {
+    cursor: pointer;
+
+    &:hover {
+      color: $--color-primary;
+    }
+  }
   .el-button--text {
     font-size: 12px !important;
   }
   .el-table__expanded-cell {
     padding-left: 22px;
     border-bottom: 0;
-    background-color: $--color-background !important;
 
-    .el-table,
-    tr {
-      background-color: $--color-background !important;
+    .el-table {
+      &::before {
+        display: none;
+      }
+      .el-table__row:last-child {
+        td.el-table__cell {
+          border-bottom: none;
+        }
+      }
     }
 
     .cell {

+ 2 - 2
src/components/ImageContain.vue

@@ -31,7 +31,7 @@
         @load="resizeImage"
       />
     </div>
-    <div :class="[`${prefixCls}-none`]" v-if="!image.url">
+    <div v-if="!image.url" :class="[`${prefixCls}-none`]">
       <i class="el-icon-picture"></i>
       <p>暂无数据</p>
     </div>
@@ -40,7 +40,7 @@
       <i class="el-icon-loading"></i>
     </div>
     <!-- action -->
-    <div :class="[`${prefixCls}-action`]">
+    <div v-if="image.url" :class="[`${prefixCls}-action`]">
       <ul>
         <li v-if="showAction" title="合适大小" @click.stop="toOrigin">
           <i class="el-icon-rank" />

+ 5 - 1
src/mixins/uploadTaskMixin.js

@@ -38,7 +38,11 @@ export default {
 
       const uploadTasks = unuploadList.map((item) => {
         return async () => {
-          await toUploadImg(item);
+          let result = true;
+          await toUploadImg(item).catch(() => {
+            result = false;
+          });
+          if (!result) return;
           await db.updateUploadState(item.id);
         };
       });

+ 6 - 1
src/modules/client/components/ScanResultTable.vue

@@ -20,7 +20,11 @@
               ></el-checkbox>
             </template>
           </el-table-column>
-          <el-table-column label="文件名" prop="filename">
+          <el-table-column
+            label="文件名"
+            prop="filename"
+            class-name="cursor-column"
+          >
             <template slot-scope="subScope">
               第{{ subScope.$index + 1 }}张
             </template>
@@ -55,6 +59,7 @@
     <el-table-column
       prop="studentCode"
       label="学号"
+      class-name="cursor-column"
       :width="isNormalTab ? 120 : undefined"
     ></el-table-column>
     <el-table-column

+ 1 - 8
src/modules/client/views/ScanOther.vue

@@ -9,7 +9,7 @@
         label-width="85px"
         inline
       >
-        <el-form-item prop="roomOrClass" label="考场/班级:">
+        <el-form-item label="考场/班级:">
           <room-class-select
             v-model="modalForm.roomOrClass"
             placeholder="请选择考场/班级"
@@ -120,13 +120,6 @@ export default {
         fileTypeName: "",
       },
       rules: {
-        roomOrClass: [
-          {
-            required: true,
-            message: "请选择考场/班级",
-            trigger: "change",
-          },
-        ],
         fileTypeId: [
           {
             required: true,

+ 2 - 0
src/modules/client/views/ScanPaper.vue

@@ -525,6 +525,7 @@ export default {
           return row.papers.map((p) => {
             return {
               ...p,
+              select: false,
               studentCode: studentInfo.studentCode,
               studentName: studentInfo.studentName,
               id: `${studentInfo.studentCode}-${randomCode(16)}`,
@@ -571,6 +572,7 @@ export default {
           return row.papers.map((p) => {
             return {
               ...p,
+              select: false,
               studentCode: studentInfo.studentCode,
               studentName: studentInfo.studentName,
               id: `${studentInfo.studentCode}-${randomCode(16)}`,