From 53d76ae60199fe1bdf5e1e5c9bafda755afb66bf Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 20 二月 2024 11:14:37 +0800
Subject: [PATCH] 修改了数据

---
 ruoyi-ui/src/views/bignote/familyeventInfo.vue |  129 +++++++++++++++++++++++++++----------------
 1 files changed, 81 insertions(+), 48 deletions(-)

diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index 59ce0a7..f5e460f 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -39,21 +39,25 @@
 <!--      <el-form-item label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData">-->
 <!--        <el-input  v-model="formData.ownData=== 1 ? '鏄�':'鍚�'" placeholder=" " clearable :style="{width: '100%'}" :disabled=true></el-input>-->
 <!--      </el-form-item>-->
-
+    <!--    :http-request="requestUpload" -->
 
       <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
       <el-upload
         action="#"
         list-type="picture-card"
         multiple
-        :http-request="requestUpload"
+		ref="upload"
+		
+ :http-request="requestUpload" 
         :file-list="fileList"
       :on-change="handleChange"
+	  :auto-upload="false"
         :disabled="!btn"
         :class="{ hide: !btn }"
 
       >
-        <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div>
+	  
+  <!--      <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div> -->
         <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
         <div slot="file" slot-scope="{file}">
           <img
@@ -90,8 +94,15 @@
 
 
         </div>
-      </el-upload>
 
+
+      </el-upload>
+		 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+		          @click="picUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
       <h4 class="form-header">鍏朵粬闄勪欢 </h4>
       <el-upload
         action="#"
@@ -178,6 +189,7 @@
 
       fileList:[
       ],
+	  fileList1:[],
       uploadFileList:[],
       fileListOther:[
 
@@ -271,6 +283,7 @@
               _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
             }
           }
+		  _this.fileList1 = _this.fileList
         }
         this.loading = false;
       });
@@ -335,12 +348,13 @@
           return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
         }).join(",")
         this.formData.url = ul+","+uls;
-        updateFamilyevent(this.formData).then(response => {
-          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-          // this.open = false;
-
-        });
+     
       }
+	  updateFamilyevent(this.formData).then(response => {
+	    this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+	    // this.open = false;
+	  
+	  });
     },
     handleRemove(file) {
       for(let i = 0; i < this.fileList.length; i++)
@@ -354,13 +368,15 @@
           return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
         }).join(",")
         this.formData.url = ul+","+uls;
-        updateFamilyevent(this.formData).then(response => {
-          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-          // this.open = false;
-
-        });
-
+		//alert(this.formData.url)
+   
       }
+	  updateFamilyevent(this.formData).then(response => {
+	    this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+	    // this.open = false;
+	  
+	  });
+	  
     },
     handleFileCardPreview(file){
       this.dialogFileUrl = file.url;
@@ -400,54 +416,71 @@
     },
 
 //鑷畾涔変笂浼犳柟娉�
-    handleChange(file, fileList) {
+    handleChange(file, fileList1) {
        //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
 
-      this.uploadFileList.push(file.raw);
+     // this.uploadFileList.push(file.raw);
       console.log("=========5555=========")
       //console.log(file)
-      console.log(this.uploadFileList)
+    //  console.log(this.uploadFileList)
+	//  this.fileList = fileList
     },
-    async requestUpload(params)
-    {
-     // alert(124)
-      var file = params.file;
+	picUpload()
+	{
+		var formData = new FormData();
+		this.$refs.upload.submit();
+	
 
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-     //alert(34)
-      this.uploading1 = true;
+		this.uploadFileList.forEach((elem)=>{
+			formData.append("files", elem)
+			
+		})
+		let _this = this
 
-      await uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-        _this.uploading1= false;
-        console.log(_this.fot.includes(pth))
-        // debugger
-        if(_this.fot.includes(pth) === true)
-        {
-          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
-          let ul = _this.fileList.map(function (elem){
-            return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
-          }).join(",")
-          let uls = _this.fileListOther.map(function (elem){
-            return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
-          }).join(",")
-          _this.formData.url = ul+","+uls
-          console.log(_this.formData.url)
+		
+        uploadPic(formData).then(response => {
+			// console.log(response.originalFilenames)
+			// console.log(response.urls)
+			// console.log(response.fileNames)
+			// 		console.log(response.newFileNames)
+        // let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+        // _this.uploading1= false;
+        // console.log(_this.fot.includes(pth))
+        // // debugger
+        // if(_this.fot.includes(pth) === true)
+        // {
+        //   _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+        //   let ul = _this.fileList.map(function (elem){
+        //     return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+        //   }).join(",")
+        //   let uls = _this.fileListOther.map(function (elem){
+        //     return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+        //   }).join(",")
+		//console.log(_this.fileList)
+	
+          _this.formData.url = _this.formData.url+","+response.fileNames
+
          // 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})
+        // }
+        // else{
+        //   _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
 
-        }
-      })
+        // }
+      });
+	},
+     requestUpload(params)
+    {
+     //alert(124)
+	 this.uploadFileList.push(params.file);
 
+     //alert(34)
+ 
+	
     },
     requestUpload1(params)
     {

--
Gitblit v1.9.1