From a556edcc35bb08a6ec1bc1818674840751cfe6ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 10 Oct 2023 16:00:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=9B=BE=E7=89=87=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ProjectDetails.vue             | 37 ++++++-----
 .../components/addModel.vue                   | 64 +++++++++++--------
 2 files changed, 58 insertions(+), 43 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
index 47dfb37fa..fc6ffae2a 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/ProjectDetails.vue
@@ -219,22 +219,27 @@
               this.queryForm.brandText = this.queryForm.brandText
             }
             let file = []
-            getAction('sys/common/getFileInfos', { id: this.queryForm.brandLabel }).then((res) => {
-              if (res.success) {
-                console.log(res.result)
-                res.result.forEach((item =>{
-                  file.push({
-                    name : item.fileName,
-                    uid : item.id,
-                    url : item.url
-                  })
-                }))
-                console.log(file)
-                this.fileList = file
-              } else {
-                // this.$refs.uploadFile.perentHandleFunc()
-              }
-            })
+            if(this.queryForm.brandLabel){
+              let list = this.queryForm.brandLabel.split(',')
+              list.forEach((item => {
+                getAction('sys/common/getFileInfos', { id: item }).then((res) => {
+                  if (res.success) {
+                    console.log(res.result)
+                    res.result.forEach((item =>{
+                      file.push({
+                        name : item.fileName,
+                        uid : item.id,
+                        url : window._CONFIG['domianURL']+'/sys/split/file/getImage?fileUrl='+item.url
+                      })
+                    }))
+                    console.log(file)
+                    this.fileList = file
+                  } else {
+                    // this.$refs.uploadFile.perentHandleFunc()
+                  }
+                })
+              }))
+            }
           } else {
             this.queryForm = {}
           }
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
index 40bd35b50..16883fcf2 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/addModel.vue
@@ -732,18 +732,23 @@
       },
       handleChange({ fileList }) {
         this.fileList = fileList;
-        console.log(this.fileList)
-        let filelist = []
         let filelistId = []
-        this.fileList.forEach((item => {
-          filelist.push(item.response)
-        }))
-        console.log(filelist,'111')
-        filelist.forEach((item => {
-          filelistId.push(item.result.id)
-        }))
-        this.formInline.brandLabel = filelistId.join(',')
-        this.formInline = { ...this.formInline }
+        let file = []
+        console.log(this.fileList)
+          this.fileList.forEach((item => {
+            if (item.response) {
+              file.push(item.response.result)
+            } else {
+              file.push(item)
+            }
+          }))
+        console.log(file)
+        file.forEach((item => {
+            filelistId.push(item.id || item.uid)
+          }))
+          console.log(filelistId,'111')
+          this.formInline.brandLabel = filelistId.join(',')
+          this.formInline = { ...this.formInline }
       },
       getFirstLevelDutyTerritory() {
         getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
@@ -769,22 +774,27 @@
                 value.dutyDepart = value.dutyDepart.split(',')
               }
               let file = []
-              getAction('sys/common/getFileInfos', { id: value.brandLabel }).then((res) => {
-                if (res.success) {
-                  console.log(res.result)
-                  res.result.forEach((item =>{
-                    file.push({
-                      name : item.fileName,
-                      uid : item.id,
-                      url : item.url
-                    })
-                  }))
-                  console.log(file)
-                  this.fileList = file
-                } else {
-                  // this.$refs.uploadFile.perentHandleFunc()
-                }
-              })
+              if(value.brandLabel){
+                let list = value.brandLabel.split(',')
+                list.forEach((item => {
+                  getAction('sys/common/getFileInfos', { id: item }).then((res) => {
+                    if (res.success) {
+                      console.log(res.result)
+                      res.result.forEach((item =>{
+                        file.push({
+                          name : item.fileName,
+                          uid : item.id,
+                          url : window._CONFIG['domianURL']+'/sys/split/file/getImage?fileUrl='+item.url
+                        })
+                      }))
+                      console.log(file)
+                      this.fileList = file
+                    } else {
+                      // this.$refs.uploadFile.perentHandleFunc()
+                    }
+                  })
+                }))
+              }
               this.formInline = value
               console.log(this.formInline)
               this.formInline = { ...this.formInline }