Merge remote-tracking branch 'origin/test'

# Conflicts:
#	src/views/design/head/index.vue

src/views/design/head/index.vue

@@ -311,7 +311,6 @@ export default {
             item.productionFile = item.url;
             item.productionFile = item.url;
           });
           });
           imageResList = Sres.data;
           imageResList = Sres.data;
-          console.log(imageResList, "imageResList");
           this.imgList = [];
           this.imgList = [];
         }
         }
         this.$store.commit("setProductDetail", findByPodProductionNo.data);
         this.$store.commit("setProductDetail", findByPodProductionNo.data);

src/views/design/main/index.vue

@@ -359,6 +359,9 @@ export default {
       }
       }
     },
     },
     selectImg(it, i) {
     selectImg(it, i) {
+      if (this.isView) {
+        return;
+      }
       // this.selectImgIndexList.push(i)
       // this.selectImgIndexList.push(i)
       let item = this.imgList.find((img) => img.fileName === it.fileName);
       let item = this.imgList.find((img) => img.fileName === it.fileName);
       if (item) return;
       if (item) return;
@@ -527,12 +530,12 @@ export default {
       });
       });
     },
     },
     getComputedName(title) {
     getComputedName(title) {
-      let img = this.selectImgList.find((it) => it.title === title);
+      let img = this.selectImgList.find((it) => it.title === title || it.title.includes(title));
       return img?.designId;
       return img?.designId;
     },
     },
     getComputedTitle(title) {
     getComputedTitle(title) {
       console.log(this.selectImgList, "this.selectImgList");
       console.log(this.selectImgList, "this.selectImgList");
-      let img = this.selectImgList.find((it) => it.title === title);
+      let img = this.selectImgList.find((it) => it.title === title || it.title.includes(title));
       return img?.productionFile;
       return img?.productionFile;
     },
     },
     getBackFile({ files, size }, callback) {
     getBackFile({ files, size }, callback) {
@@ -541,6 +544,8 @@ export default {
         document.getElementsByClassName("grid")[0]
         document.getElementsByClassName("grid")[0]
       ).width;
       ).width;
       bw = Number(bw.replace("px", ""));
       bw = Number(bw.replace("px", ""));
+
+      // bw = Number(bw.replace("px", ""));
       for (let i = 0; i < files.length; i++) {
       for (let i = 0; i < files.length; i++) {
         files[i].url = files[i].productionFile || files[i].url;
         files[i].url = files[i].productionFile || files[i].url;
         that.$nextTick(async () => {
         that.$nextTick(async () => {
@@ -932,20 +937,18 @@ export default {
             style="margin: 5px;width: auto;"
             style="margin: 5px;width: auto;"
             border
             border
             :data="detail.imageAry"
             :data="detail.imageAry"
-            :header-cell-style="{ 'text-align': 'center' }"
-          >
-            <el-table-column
-              label="打印区域"
+            :header-cell-style="{ 'text-align': 'center' }">
+            <el-table-column align="center" label="打印区域"
               prop="title"
               prop="title"
               align="center"
               align="center"
               width="100px"
               width="100px"
             ></el-table-column>
             ></el-table-column>
-            <el-table-column label="效果图" prop="title">
-              <template slot-scope="{ row }">
+            <el-table-column align="center" label="效果图" prop="title">
+              <template slot-scope="{row}">
                 <img class="full-width" :src="row.url" alt="" />
                 <img class="full-width" :src="row.url" alt="" />
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="素材图" prop="title">
+            <el-table-column align="center" label="素材图" prop="title">
               <template slot-scope="{ row }">
               <template slot-scope="{ row }">
                 <img
                 <img
                   style="cursor: pointer"
                   style="cursor: pointer"