From dc2b637e3ead569adee4cf7a48b0bb15f8c7aa43 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 01 三月 2024 20:46:19 +0800
Subject: [PATCH] 修改类似的代码

---
 ruoyi-ui/src/views/pet/petnote.vue |  192 +++++++++++++++++++++++++++++++++--------------
 1 files changed, 135 insertions(+), 57 deletions(-)

diff --git a/ruoyi-ui/src/views/pet/petnote.vue b/ruoyi-ui/src/views/pet/petnote.vue
index bdcfccc..f2c326b 100644
--- a/ruoyi-ui/src/views/pet/petnote.vue
+++ b/ruoyi-ui/src/views/pet/petnote.vue
@@ -166,6 +166,9 @@
           multiple
           :http-request="requestUpload"
           :file-list="fileList"
+		  :on-change="handleChange"
+		  :auto-upload="false"
+		  	ref="upload"
         >
           <i slot="default" class="el-icon-plus"></i>
           <div slot="file" slot-scope="{file}">
@@ -193,10 +196,15 @@
           <i class="el-icon-delete"></i>
         </span>
       </span>
-
-
           </div>
         </el-upload>
+		<el-button
+		         style="margin-left: 10px"
+		         size="small"
+		         type="success"
+		
+		         @click="picUpload"
+		       >涓婁紶鍒版湇鍔″櫒</el-button>
         <h4 class="form-header">鍏朵粬闄勪欢 </h4>
         <el-upload
           action=""
@@ -205,8 +213,12 @@
           multiple
 
           :on-remove="handleRemoveFile"
-          :http-request="requestUpload"
           :show-file-list="true"
+		  ref="upload1"
+		  :on-change="handleChange1"
+		  :auto-upload="false"
+		  list-type="picture-card"
+		    :http-request="requestUpload1"
         >
           <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
           <template #tip>
@@ -215,7 +227,12 @@
           </template>
         </el-upload>
 
-
+<el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+		          @click="fileUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
       </el-form>
 
       <h4 class="form-header"> </h4>
@@ -285,9 +302,10 @@
       
       fileList:[
       ],
-      fileListOther:[
-
-      ],
+      fileList1:[],
+      	  uploadFileList: [],
+      		uploadFileList1: [],
+      fileListOther:[],
       dsb:true,
       btn:false,
       PetNoteList:{},
@@ -295,7 +313,7 @@
       formDat: {
         fid:undefined,
         remindTime:undefined,
-        url:undefined,
+        url:'',
         title: undefined,
         happenTime: undefined,
       },
@@ -393,12 +411,30 @@
 
     },
     handleRemove(file) {
-      for(let i = 0; i < this.fileListOther.length; i++)
+      for(let i = 0; i < this.fileList.length; i++)
       {
-        if(this.fileListOther[i].url==file.url)
-          this.$delete(this.fileListOther,i);
+        if(this.fileList[i].url==file.url)
+        {
+          this.$delete(this.fileList,i);
+      		 this.$delete(this.uploadFileList,i);
+      		 }
+      
+      		//alert(this.formData.url)
+         
       }
     },
+	handleRemoveFile(file) {
+	  for(let i = 0; i < this.fileListOther.length; i++)
+	  {
+	    if(this.fileListOther[i].url==file.url)
+		{
+		  
+	      this.$delete(this.fileListOther,i);
+		  this.$delete(this.uploadFileList1,i);
+		  
+		  }
+	  }
+	},
 
     // 鍙栨秷鎸夐挳
     cancel() {
@@ -478,14 +514,14 @@
     /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
     submitDataScope: function() {
       const pid = this.$route.params && this.$route.params.id;
-      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(",")
+      // 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.formDat.pid = pid;
-      this.formDat.url = ul+","+uls
+      // this.formDat.url = ul+","+uls
       this.$refs["elForm"].validate(valid => {
         if (valid) {
 		//	alert(33)
@@ -501,46 +537,88 @@
         this.formDat[key] = '';
       });
     },
-    requestUpload(params)
-    {
-      var file = params.file;
-      var formData1 = new FormData();
-      formData1.append('uploadFile', file);
-      let _this = this
-	//  alert(123)
-
-      uploadPic(formData1).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
-        if(_this.fot.includes(pth) === true)
+    handleChange(file, fileList1) {
+    	   //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+    	
+    	 // this.uploadFileList.push(file.raw);
+    	  console.log("=========5555=========")
+    	  console.log(file)
+    	//  console.log(this.uploadFileList)
+    	//  this.fileList = fileList
+    	//alert(file)
+    	    this.uploadFileList.push(file.raw);
+    	     this.fileList.push({name:file.name,url:file.url})
+    	//alert(fileList1.length)
+    	},
+    	handleChange1(file, fileOtherList1) {
+    	   //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+    	this.uploadFileList1.push(file.raw);
+    	 this.fileListOther.push({name:file.name,url:file.url})
+    	 // this.uploadFileList.push(file.raw);
+    	  console.log("=========5555=========")
+    	  //console.log(file)
+    	//  console.log(this.uploadFileList)
+    	//  this.fileList = fileList
+    	},
+    	fileUpload(){
+    	//	var file = params.file;
+    
+    		var formData = new FormData();
+    	//	this.$refs.upload1.submit();
+    		// formData.append('uploadFile', file);
+    		if(this.uploadFileList1.length==0){
+    			  this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖!");
+    			  return
+    		}
+    		this.uploadFileList1.forEach((elem)=>{
+    			formData.append("files", elem)
+    			
+    		})
+    
+    		let _this = this
+    	
+    		this.uploading = true;
+    		uploadPic(formData).then(response => {
+    		_this.uploadFileList1 = []
+    		_this.formDat.url = _this.formDat.url+","+response.fileNames
+    		_this.$modal.msgSuccess("鏂囦欢涓婁紶鎴愬姛!");
+    		  })
+    	
+    	},
+    	picUpload()
+    	{
+    		var formData = new FormData();
+    		//alert(976)
+    		//this.$refs.upload.submit();
+    		//alert(8)
+    		//alert(this.uploadFileList.length)
+    	if(this.uploadFileList.length==0){
+    		  this.$modal.msgSuccess("鍥剧墖涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+    		  return}
+    	//console.log(this.uploadFileList)
+    		this.uploadFileList.forEach((elem)=>{
+    			formData.append("files", elem)
+    			
+    		})
+    		//alert(90)
+    		let _this = this
+    		//alert(9)
+    	    uploadPic(formData).then(response => {
+    		//	alert("dds")
+    	      _this.formDat.url = _this.formDat.url+","+response.fileNames
+    		  _this.uploadFileList = []
+    		  _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+    
+    	  });
+    	},
+        requestUpload(params) {
+    //alert(98)
+     //    this.uploadFileList.push(params.file);
+        },
+        requestUpload1(params)
         {
-          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
-
-        }
-
-        else{
-          _this.fileListOther.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)
-        //  alert(87)
-		const pid = _this.$route.params && _this.$route.params.id;
-		_this.formData.pid = pid
-          updatenotePet(_this.formData).then(response => {
-            this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
-            // this.open = false;
-        
-          });
-      })
-
-    },
+    		//     this.uploadFileList1.push(params.file);
+        },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const Ids = row.id || this.ids;

--
Gitblit v1.9.1