Просмотр исходного кода

Merge branch 'feature_20250819_图像识别连拍' into dev(uat)

zhujindu 4 месяцев назад
Родитель
Сommit
841fa004d3
1 измененных файлов с 35 добавлено и 30 удалено
  1. 35 30
      src/views/agentList/visitTask.vue

+ 35 - 30
src/views/agentList/visitTask.vue

@@ -3863,15 +3863,15 @@ export default {
           ].collectionItems[this.childIndex].collectionOptionList[this.childIndex2].collectionItems[
           ].collectionItems[this.childIndex].collectionOptionList[this.childIndex2].collectionItems[
             this.childIndex3
             this.childIndex3
           ].collectionOptionList[this.childIndex4].collectionItems[this.childIndex5].fileInfoList =
           ].collectionOptionList[this.childIndex4].collectionItems[this.childIndex5].fileInfoList =
-            [val];
+            val.fileInfoList;
         } else {
         } else {
-          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);
+          let collectionItems =
+            this.collectionItemList[this.indeximg].collectionOptionList[this.childIndex1]
+              .collectionItems[this.childIndex].collectionOptionList[this.childIndex2]
+              .collectionItems[this.childIndex3].collectionOptionList[this.childIndex4]
+              .collectionItems[this.childIndex5];
+          let fileInfoList = fileInfoList.concat(val.fileInfoList);
+          this.$set(collectionItems, 'fileInfoList', fileInfoList);
         }
         }
       }
       }
       if (this.pType == 'E') {
       if (this.pType == 'E') {
@@ -3899,17 +3899,16 @@ export default {
           ].collectionOptionList[this.childIndex4].collectionItems[
           ].collectionOptionList[this.childIndex4].collectionItems[
             this.childIndex5
             this.childIndex5
           ].collectionOptionList[this.childIndex6].collectionItems[this.childIndex7].fileInfoList =
           ].collectionOptionList[this.childIndex6].collectionItems[this.childIndex7].fileInfoList =
-            [val];
+            val.fileInfoList;
         } else {
         } else {
-          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);
+          let collectionItems =
+            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];
+          let fileInfoList = fileInfoList.concat(val.fileInfoList);
+          this.$set(collectionItems, 'fileInfoList', fileInfoList);
         }
         }
       }
       }
       if (this.pType == 'A' || this.pType == 'B') {
       if (this.pType == 'A' || this.pType == 'B') {
@@ -3951,11 +3950,14 @@ export default {
             if (photoIdentifyType == 1) {
             if (photoIdentifyType == 1) {
               this.collectionItemList[this.indeximg].collectionOptionList[childi].collectionItems[
               this.collectionItemList[this.indeximg].collectionOptionList[childi].collectionItems[
                 this.childIndex
                 this.childIndex
-              ].fileInfoList = [val];
+              ].fileInfoList = val.fileInfoList;
             } else {
             } else {
-              this.collectionItemList[this.indeximg].collectionOptionList[childi].collectionItems[
-                this.childIndex
-              ].fileInfoList.push(val);
+              let collectionItems =
+                this.collectionItemList[this.indeximg].collectionOptionList[childi].collectionItems[
+                  this.childIndex
+                ];
+              let fileInfoList = fileInfoList.concat(val.fileInfoList);
+              this.$set(collectionItems, 'fileInfoList', fileInfoList);
             }
             }
           }
           }
         } else {
         } else {
@@ -3966,13 +3968,15 @@ export default {
             this.collectionItemList[this.indeximg].fileInfoList = [];
             this.collectionItemList[this.indeximg].fileInfoList = [];
           }
           }
           if (photoIdentifyType == 1) {
           if (photoIdentifyType == 1) {
-            this.collectionItemList[this.indeximg].fileInfoList = [val];
+            this.collectionItemList[this.indeximg].fileInfoList = val.fileInfoList;
             console.log(
             console.log(
               'fileInfoList222=' +
               'fileInfoList222=' +
                 JSON.stringify(this.collectionItemList[this.indeximg].fileInfoList)
                 JSON.stringify(this.collectionItemList[this.indeximg].fileInfoList)
             );
             );
           } else {
           } else {
-            this.collectionItemList[this.indeximg].fileInfoList.push(val);
+            let collectionItems = this.collectionItemList[this.indeximg];
+            let fileInfoList = fileInfoList.concat(val.fileInfoList);
+            this.$set(collectionItems, 'fileInfoList', fileInfoList);
           }
           }
         }
         }
       }
       }
@@ -3993,13 +3997,14 @@ export default {
             this.childIndex1
             this.childIndex1
           ].collectionItems[this.childIndex].collectionOptionList[this.childIndex2].collectionItems[
           ].collectionItems[this.childIndex].collectionOptionList[this.childIndex2].collectionItems[
             this.childIndex3
             this.childIndex3
-          ].fileInfoList = [val];
+          ].fileInfoList = val.fileInfoList;
         } else {
         } else {
-          this.collectionItemList[this.indeximg].collectionOptionList[
-            this.childIndex1
-          ].collectionItems[this.childIndex].collectionOptionList[this.childIndex2].collectionItems[
-            this.childIndex3
-          ].fileInfoList.push(val);
+          let collectionItems =
+            this.collectionItemList[this.indeximg].collectionOptionList[this.childIndex1]
+              .collectionItems[this.childIndex].collectionOptionList[this.childIndex2]
+              .collectionItems[this.childIndex3];
+          let fileInfoList = fileInfoList.concat(val.fileInfoList);
+          this.$set(collectionItems, 'fileInfoList', fileInfoList);
         }
         }
       }
       }
       this.$forceUpdate();
       this.$forceUpdate();