From 39c40b7978768e2d734e8b9966bd73cabfc062b3 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Wed, 1 Nov 2023 09:42:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileUpload/index.vue         |  2 +-
 src/components/ImageUpload/index.vue        |  2 +-
 src/views/tcZz/netManage/gzdt/index.vue     |  7 ++++++-
 src/views/tcZz/netManage/qlzxxddt/index.vue | 23 +++++++++++++++++----
 src/views/tcZz/netManage/ytlc/index.vue     | 14 +++++++++----
 5 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 0f242a7..84c7670 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -90,7 +90,7 @@ export default {
           // 然后将数组转为对象数组
           this.fileList = list.map(item => {
             if (typeof item === "string") {
-              item = { name: item, url: this.baseUrl + item };
+              item = { name: item, url: item };
             }
             item.uid = item.uid || new Date().getTime() + temp++;
             return item;
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index a8f23b7..b57a15e 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -94,7 +94,7 @@ export default {
           this.fileList = list.map(item => {
             if (typeof item === "string") {
               if (item.indexOf(this.baseUrl) === -1) {
-                  item = { name: this.baseUrl + item, url: item };
+                  item = { name: this.baseUrl + item, url: this.baseUrl + item };
               } else {
                   item = { name: item, url: item };
               }
diff --git a/src/views/tcZz/netManage/gzdt/index.vue b/src/views/tcZz/netManage/gzdt/index.vue
index 58ee6ed..e55d2f6 100644
--- a/src/views/tcZz/netManage/gzdt/index.vue
+++ b/src/views/tcZz/netManage/gzdt/index.vue
@@ -638,11 +638,16 @@
       },
       /** 提交按钮 */
       submitForm() {
+        let reg = new RegExp('http')
         let arr1 = [];
         let arr2 = [];
         this.fileNameS.forEach((value) => {
           arr1.push(value.name);
-          arr2.push(value.url);
+          if(reg.test(value.url)){
+            arr2.push(value.url);
+          } else {
+            arr2.push(process.env.VUE_APP_BASE_API + value.url);
+          }
         });
         this.form.fileName = arr1.join(",");
         this.form.fileUrl = arr2.join(",");
diff --git a/src/views/tcZz/netManage/qlzxxddt/index.vue b/src/views/tcZz/netManage/qlzxxddt/index.vue
index 9f9e9e6..4508fd1 100644
--- a/src/views/tcZz/netManage/qlzxxddt/index.vue
+++ b/src/views/tcZz/netManage/qlzxxddt/index.vue
@@ -240,8 +240,8 @@
           <!-- <editor v-model="form.content" :min-height="192"/> -->
           <el-input v-model="form.content" resize="none" :rows="5" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="图片上传" prop="imageUrl">
-          <imageUpload v-model="form.imageUrl"/>
+        <el-form-item label="图片上传">
+          <imageUpload v-model="imageUrls"/>
         </el-form-item>
         <!-- <el-form-item label="文件">
           <el-button @click="addDomain" type="primary">添加图片</el-button>
@@ -395,6 +395,7 @@
         },
         fileList:[],
         images:[],
+        imageUrls:'',
       };
     },
     created() {
@@ -526,6 +527,8 @@
         const id = row.id || this.ids
         getQlzxxddt(id).then(response => {
           this.form = response.data;
+          this.imageUrls = this.form.imageUrl
+          
           // this.form.isStatus = response.data.isStatus;
           // this.form.title = response.data.title;
           // this.form.content = response.data.content;
@@ -572,11 +575,23 @@
       },
       /** 提交按钮 */
       submitForm() {
-        // let arr1 = [];
+        let arr1 = [];
         // this.form.domains.forEach((value) => {
         //   arr1.push(value.imageUrl);
         // });
-        this.form.imageUrl = process.env.VUE_APP_BASE_API + this.form.imageUrl;
+        let images = this.imageUrls.split(',')
+        let reg = new RegExp('http')
+        if(images.length > 0 && images[0] !== ''){
+          images.forEach(item=>{
+            if(reg.test(item)){
+              item = item;
+            } else {
+              item = process.env.VUE_APP_BASE_API + item;
+            }
+            arr1.push(item)
+          })
+        }
+        this.form.imageUrl = arr1.join(',')
         this.$refs["form"].validate(valid => {
           if (valid) {
             if (this.form.id != null) {
diff --git a/src/views/tcZz/netManage/ytlc/index.vue b/src/views/tcZz/netManage/ytlc/index.vue
index bbe0eb3..dd92771 100644
--- a/src/views/tcZz/netManage/ytlc/index.vue
+++ b/src/views/tcZz/netManage/ytlc/index.vue
@@ -332,7 +332,7 @@
             arr1.forEach((item,index)=>{
               let obj = {};
               obj.name = item;
-              obj.url = process.env.VUE_APP_BASE_API + arr2[index];
+              obj.url = arr2[index];
               this.files.push(obj);
             })
           } else {
@@ -355,7 +355,7 @@
         this.fileNameS = []
         const id = row.id || this.ids
         getYtlc(id).then(response => {
-          console.log(response.data,'response.data')
+          // console.log(response.data,'response.data')
           this.form = response.data;
           // this.form.name = response.data.name;
           // this.form.createTime = response.data.createTime;
@@ -372,6 +372,7 @@
               });
             });
           }
+          // console.log(this.fileNameS,'this.fileNameS')
           this.open = true;
           this.title = "修改约谈流程";
         });
@@ -380,11 +381,15 @@
       submitForm() {
         let arr1 = [];
         let arr2 = [];
-        console.log(this.fileNameS)
+        let reg = new RegExp('http')
         if (this.fileNameS.length > 0) {
           this.fileNameS.forEach((value) => {
             arr1.push(value.name);
-            arr2.push(value.url);
+            if(reg.test(value.url)){
+              arr2.push(value.url);
+            } else {
+              arr2.push(process.env.VUE_APP_BASE_API + value.url);
+            }
           });
           this.form.fileName = arr1.join(",");
           this.form.fileUrl = arr2.join(",");
@@ -392,6 +397,7 @@
           this.form.fileName = "";
           this.form.fileUrl = "";
         }
+        console.log(this.form,'this.form')
         this.$refs["form"].validate(valid => {
           if (valid) {
             if (this.form.id != null) {