From 331a8018f4ffb03e7af3b111492d299a0c7a24c5 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期三, 17 七月 2024 08:56:58 +0800
Subject: [PATCH] a

---
 ruoyi-ui/src/views/bignote/familyeventInfo.vue |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index 6097d07..9510146 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -310,10 +310,18 @@
 		//	alert(pth)
             if (_this.fot.includes(pth) === true)
 			{
-				if(paths[i][0]=="/")
-              _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
-			  else
-			     _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+        if(paths[i].includes(process.env.VUE_APP_BASE_TRUE_API)){
+          if(paths[i][0]=="/")
+                _this.fileList.push({name:paths[i],url: paths[i].substr(1),res:false})
+          else
+             _this.fileList.push({name:paths[i],url: paths[i],res:false})
+        }else{
+          if(paths[i][0]=="/")
+                _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+          else
+             _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+        }
+
 			  }
             else {
               // alert(paths[i])
@@ -332,6 +340,8 @@
         this.loading = false;
       });
     }
+    console.log(this.fileList,'fileListfilelllllllllllll')
+    console.log(this.fileListOther,'fileListOtherfileListOtherfileListOther')
   },
   mounted() {},
   methods: {
@@ -509,7 +519,7 @@
     },
     handleDownload(url) {
       var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
-
+		alert(formData['path'])
       let lens = formData.path.split(".")
       let suffix = lens[lens.length-1]
       download(formData).then(async (response) => {
@@ -581,21 +591,16 @@
 	},
 	picUpload()
 	{
-
 		var formData = new FormData();
 		//this.$refs.upload.submit();
 		//alert(this.uploadFileList.length)
 	if(this.uploadFileList.length==0){
 		  this.$modal.msgSuccess("鍥惧儚涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
 		  return}
-
 		this.uploadFileList.forEach((elem)=>{
 			formData.append("files", elem)
-
 		})
 		let _this = this
-
-
         uploadPic(formData).then(response => {
 			// console.log(response.originalFilenames)
 			// console.log(response.urls)
@@ -617,19 +622,15 @@
 		//console.log(_this.fileList)
 	//	alert(response.fileNames)
           _this.formData.url = _this.formData.url+","+response.fileNames
-
-		_this.uploadFileList = []
+          _this.uploadFileList = []
          // alert(87)
           updateFamilyevent(_this.formData).then(response => {
             _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
-
             // this.open = false;
-
           });
         // }
         // else{
         //   _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
         // }
       });
 	},

--
Gitblit v1.9.1