Преглед на файлове

feature_20250811_拜访拍照任务连拍

zhujindu преди 3 месеца
родител
ревизия
5f644297cd
променени са 4 файла, в които са добавени 43 реда и са изтрити 37 реда
  1. 3 2
      src/components/deleteUploadImg1.vue
  2. 8 5
      src/components/imageWhiteStore.vue
  3. 6 5
      src/components/uploadVNormal.vue
  4. 26 25
      src/views/deviceWithin/addStoreVisit.vue

+ 3 - 2
src/components/deleteUploadImg1.vue

@@ -1,8 +1,9 @@
 <template>
   <div>
     <van-row gutter="10">
-      <van-col span="6" v-for="(urls, index) in imgs" :key="index">
-        <div class="imgview">
+      <van-col span="6" v-for="(urls, index) in imgs" :key="urls.id">
+        {{ urls.fileUrl }}
+        <div class="imgview 111">
           <van-icon
             v-if="photoIdentifyType != 6 && types != 'edit'"
             name="close"

+ 8 - 5
src/components/imageWhiteStore.vue

@@ -11,13 +11,13 @@
       <div class="AIVerifyErrMask">
         <div class="errorImg">
           <img
-            v-if="imageWhiteStoreData.data.url"
-            :src="imageWhiteStoreData.data.url"
+            v-if="imageWhiteStoreData.url"
+            :src="imageWhiteStoreData.url"
             fit="contain"
-            @click="previewsImg(imageWhiteStoreData.data.url)" />
+            @click="previewsImg(imageWhiteStoreData.url)" />
           <img v-else :src="imageEmpty" width="100%" height="300px" />
         </div>
-        <div class="AIVerifyWhite" v-html="imageWhiteStoreData.data.whiteMsg || ''"></div>
+        <div class="AIVerifyWhite" v-html="imageWhiteStoreData.whiteMsg || ''"></div>
         <div class="uploadBtnAIVerify" :style="{ 'justify-content': 'center' }">
           <div class="changeImageAIVerify" @click="normalFlow">确认</div>
         </div>
@@ -59,7 +59,10 @@ export default {
     initData() {},
     normalFlow() {
       this.$emit('close');
-      this.$emit('normalFlow', this.imageWhiteStoreData);
+      let res = {
+        data: [this.imageWhiteStoreData],
+      };
+      this.$emit('normalFlow', res);
     },
     close() {
       this.$emit('close');

+ 6 - 5
src/components/uploadVNormal.vue

@@ -342,7 +342,7 @@ export default {
         thirdCollectionId = that.thirdCollectionId;
       }
       var form = {
-        mediaIds: '',
+        mediaIds: [],
         fileUrl: '',
         collectionItemId: that.collectionId,
         objectType: that.objectType,
@@ -405,9 +405,9 @@ export default {
         } else {
           // 正常流程
           // 图像识别白名单用户弹出框提示
-          if (res.data.whiteStore) {
+          if (res.data[0].whiteStore) {
             this.imageWhiteStoreFlag = true;
-            this.imageWhiteStoreData = res;
+            this.imageWhiteStoreData = res.data[0];
           } else {
             this.normalFlow(res);
           }
@@ -468,7 +468,7 @@ export default {
     confirmUpload(res) {
       if (this.photoIdentifyType && this.photoIdentifyType != '6') {
         var form = {
-          mediaIds: '',
+          mediaIds: [],
           fileUrl: '',
           visitSource: '1', //	Long	拜访模式
           storeGroupId: this.storeGroupId, //	string	门店任务组,多个用逗号隔开
@@ -498,7 +498,8 @@ export default {
           if (resData.code == 200) {
             console.log(resData);
             res.data.fileId = resData.data[0].fileId;
-            this.normalFlow([res]);
+            res.data = [res.data];
+            this.normalFlow(res);
           }
         });
       }

+ 26 - 25
src/views/deviceWithin/addStoreVisit.vue

@@ -4293,6 +4293,7 @@ export default {
       this.show = true;
     },
     newimgarr1(val) {
+      debugger;
       //  店招识别只允许上传一张
       let photoIdentifyType = val.photoIdentifyType;
       this.show = false;
@@ -4318,12 +4319,13 @@ export default {
           ].collectionOptionList[this.childIndex4].collectionItems[this.childIndex5].fileInfoList =
             val.fileInfoList;
         } else {
-          let fileInfoList =
-            this.collectionItemList[this.indeximg].collectionOptionList[this.childIndex1]
-              .collectionItems[this.childIndex].collectionOptionList[this.childIndex2]
-              .collectionItems[this.childIndex3].collectionOptionList[this.childIndex4]
-              .collectionItems[this.childIndex5].fileInfoList;
-          fileInfoList = fileInfoList.concat(val.fileInfoList);
+          this.collectionItemList[this.indeximg].collectionOptionList[
+            this.childIndex1
+          ].collectionItems[this.childIndex].collectionOptionList[this.childIndex2].collectionItems[
+            this.childIndex3
+          ].collectionOptionList[this.childIndex4].collectionItems[
+            this.childIndex5
+          ].fileInfoList.push(val.fileInfoList);
         }
       }
       if (this.pType == 'E') {
@@ -4353,13 +4355,15 @@ export default {
           ].collectionOptionList[this.childIndex6].collectionItems[this.childIndex7].fileInfoList =
             val.fileInfoList;
         } else {
-          let fileInfoList =
-            this.collectionItemList[this.indeximg].collectionOptionList[this.childIndex1]
-              .collectionItems[this.childIndex].collectionOptionList[this.childIndex2]
-              .collectionItems[this.childIndex3].collectionOptionList[this.childIndex4]
-              .collectionItems[this.childIndex5].collectionOptionList[this.childIndex6]
-              .collectionItems[this.childIndex7].fileInfoList;
-          fileInfoList = fileInfoList.concat(val.fileInfoList);
+          this.collectionItemList[this.indeximg].collectionOptionList[
+            this.childIndex1
+          ].collectionItems[this.childIndex].collectionOptionList[this.childIndex2].collectionItems[
+            this.childIndex3
+          ].collectionOptionList[this.childIndex4].collectionItems[
+            this.childIndex5
+          ].collectionOptionList[this.childIndex6].collectionItems[
+            this.childIndex7
+          ].fileInfoList.push(val.fileInfoList);
         }
       }
       if (this.pType == 'A' || this.pType == 'B') {
@@ -4403,11 +4407,9 @@ export default {
                 this.childIndex
               ].fileInfoList = val.fileInfoList;
             } else {
-              let fileInfoList =
-                this.collectionItemList[this.indeximg].collectionOptionList[childi].collectionItems[
-                  this.childIndex
-                ].fileInfoList;
-              fileInfoList = fileInfoList.concat(val.fileInfoList);
+              this.collectionItemList[this.indeximg].collectionOptionList[childi].collectionItems[
+                this.childIndex
+              ].fileInfoList.push(val.fileInfoList);
             }
           }
         } else {
@@ -4424,8 +4426,7 @@ export default {
                 JSON.stringify(this.collectionItemList[this.indeximg].fileInfoList)
             );
           } else {
-            let fileInfoList = this.collectionItemList[this.indeximg].fileInfoList;
-            fileInfoList = fileInfoList.concat(val.fileInfoList);
+            this.collectionItemList[this.indeximg].fileInfoList.push(val.fileInfoList);
           }
         }
       }
@@ -4448,11 +4449,11 @@ export default {
             this.childIndex3
           ].fileInfoList = val.fileInfoList;
         } else {
-          let fileInfoList =
-            this.collectionItemList[this.indeximg].collectionOptionList[this.childIndex1]
-              .collectionItems[this.childIndex].collectionOptionList[this.childIndex2]
-              .collectionItems[this.childIndex3].fileInfoList;
-          fileInfoList = fileInfoList.concat(val.fileInfoList);
+          this.collectionItemList[this.indeximg].collectionOptionList[
+            this.childIndex1
+          ].collectionItems[this.childIndex].collectionOptionList[this.childIndex2].collectionItems[
+            this.childIndex3
+          ].fileInfoList.push(val.fileInfoList);
         }
       }
       this.$forceUpdate();