合并失败

src/views/classHoursReview/component/LessonTable.vue

@@ -38,7 +38,7 @@
                 <el-image
                   style="width: 100%; height: 100%"
                   :src="$methodsTools.splitImgHost(its.photo)"
-                  :preview-src-list="[$methodsTools.splitImgHost(its.photo)]"
+                  :preview-src-list="returnImgUrl(scope.row.userStudyRecordPhotoList)"
                 >
                 </el-image>
                 <div class="abos">
@@ -558,6 +558,11 @@ export default {
     allIds() {
       return this.getAllIds();
     },
+    returnImgUrl: function() {
+      return function(ary) {
+        return ary && ary.map(i => this.$methodsTools.splitImgHost(i.photo)) || []
+      }
+    }
   },
   components: {
     CheatDialog,
@@ -569,7 +574,7 @@ export default {
 .liImgs {
   float: left;
   width: 168px;
-  height: 224px;
+  //height: 224px;
   margin-right: 16px;
   margin-bottom: 16px;
   position: relative;

src/views/education/archives/fileDownload.vue

@@ -12,7 +12,7 @@
         </el-table-column>
         <el-table-column fixed="right" label="操作" width="100" align="center">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="handleDown(scope.row)"
+            <el-button type="text" size="small" :loading="scope.row.loading" @click="handleDown(scope.row)"
               >下载</el-button
             >
           </template>
@@ -93,6 +93,7 @@ export default {
         type: "warning",
       })
         .then(() => {
+          this.$set(row, 'loading', true)
           this.$api
             .userdangAndatadownload({
               userIds: this.userList,
@@ -102,6 +103,9 @@ export default {
               this.$message.success("操作成功，正在下载");
               if (!isDownRecord) this.handleDownFlieName(res.msg, row.name)
               this.$store.dispatch("downloadlist", true);
+            })
+            .finally(() => {
+              this.$set(row, 'loading', false)
             });
         })
         .catch(() => {});

src/views/education/classManageMent/classHoursReview/component/LessonTable.vue

@@ -29,7 +29,7 @@
                 <el-image
                   style="width: 100%; height: 100%"
                   :src="$methodsTools.splitImgHost(its.photo)"
-                  :preview-src-list="[$methodsTools.splitImgHost(its.photo)]"
+                  :preview-src-list="returnImgUrl(scope.row.userStudyRecordPhotoList)"
                 >
                 </el-image>
                 <div class="abos" @click="imgChange(scope.row.userStudyRecordPhotoList[inds],'photo',its.photo)">
@@ -453,6 +453,11 @@ export default {
     allIds() {
       return this.getAllIds();
     },
+    returnImgUrl: function() {
+      return function(ary) {
+        return ary && ary.map(i => this.$methodsTools.splitImgHost(i.photo)) || []
+      }
+    }
   },
   components: {
     CheatDialog,
@@ -464,7 +469,7 @@ export default {
 .liImgs {
   float: left;
   width: 210px;
-  height: 280px;
+  // height: 280px;
   margin-right: 16px;
   margin-bottom: 16px;
   position: relative;

src/views/education/classManageMent/classHoursReview/component/StudyTables.vue

@@ -370,7 +370,23 @@ export default {
     },
     checkBack() {
       if (!this.checkList.length) {
-        this.$message.warning("请勾选数据");
+        this.$confirm("您还未勾选数据，是否勾选全部数据？", "提示", {
+          confirmButtonText: "是",
+          cancelButtonText: "否",
+          type: "warning",
+        })
+          .then(() => {
+            this.checkList = this.allType3List.map((i) => {
+              if (
+                this.periodStatus === 3 &&
+                i.periodStatus === 1 &&
+                i.status !== 2
+              ) {
+                return i.periodStatusId;
+              }
+            });
+          })
+          .catch(() => {});
         return;
       }
       this.popback = true;