From 13b0e307e62aa5f0479b8e640a7e1fc7623dbd59 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 24 二月 2024 11:36:47 +0800
Subject: [PATCH] 修改提交

---
 ruoyi-ui/src/views/collection/collectionInfo.vue |  416 ++++--
 ruoyi-ui/src/views/travel/index.vue              |   26 
 ruoyi-ui/src/views/contacts/index.vue            |  156 +
 ruoyi-ui/src/views/bignote/familyeventInfo.vue   |    6 
 ruoyi-ui/src/views/doctor/doctorInfo.vue         |  365 +++-
 ruoyi-ui/src/views/clean/cleanInfo.vue           |  324 +++-
 ruoyi-ui/src/views/contacts/contactsInfo.vue     |  381 ++++--
 ruoyi-ui/src/views/economy/index.vue             |  196 ++
 ruoyi-ui/src/views/doctor/index.vue              |  211 ++
 ruoyi-ui/src/api/economy/index.js                |    2 
 ruoyi-ui/src/api/doctor/index.js                 |    2 
 ruoyi-ui/src/api/clean/index.js                  |    2 
 ruoyi-ui/src/views/economy/economyInfo.vue       |  319 +++-
 ruoyi-ui/src/api/collection/index.js             |    2 
 ruoyi-ui/src/views/bignote/index.vue             |    6 
 ruoyi-ui/vue.config.js                           |    4 
 ruoyi-ui/src/api/contacts/index.js               |    2 
 ruoyi-ui/src/api/device/index.js                 |    2 
 ruoyi-ui/src/views/collection/index.vue          |  203 ++
 ruoyi-ui/src/views/device/equipmentInfo.vue      |  335 ++++-
 ruoyi-ui/src/views/note/propertyInfo.vue         |  315 +++-
 ruoyi-ui/src/views/device/index.vue              |  217 ++
 ruoyi-ui/src/views/clean/index.vue               |   65 
 ruoyi-ui/src/api/note/index.js                   |    2 
 ruoyi-ui/src/views/note/index.vue                |  156 +
 25 files changed, 2,710 insertions(+), 1,005 deletions(-)

diff --git a/ruoyi-ui/src/api/clean/index.js b/ruoyi-ui/src/api/clean/index.js
index 2743567..ecbbe35 100644
--- a/ruoyi-ui/src/api/clean/index.js
+++ b/ruoyi-ui/src/api/clean/index.js
@@ -43,7 +43,7 @@
 //涓婁紶鏂囦欢
 export function uploadPic(data) {
   return request({
-    url: '/common/upload',
+    url: '/common/uploads',
     method: 'post',
     data: data
   })
diff --git a/ruoyi-ui/src/api/collection/index.js b/ruoyi-ui/src/api/collection/index.js
index 8d1f789..14bf1d0 100644
--- a/ruoyi-ui/src/api/collection/index.js
+++ b/ruoyi-ui/src/api/collection/index.js
@@ -57,7 +57,7 @@
 //涓婁紶鏂囦欢
 export function uploadPic(data) {
   return request({
-    url: '/common/upload',
+    url: '/common/uploads',
     method: 'post',
     data: data
   })
diff --git a/ruoyi-ui/src/api/contacts/index.js b/ruoyi-ui/src/api/contacts/index.js
index 325fafe..8e0f286 100644
--- a/ruoyi-ui/src/api/contacts/index.js
+++ b/ruoyi-ui/src/api/contacts/index.js
@@ -48,7 +48,7 @@
 //涓婁紶鏂囦欢
 export function uploadPic(data) {
   return request({
-    url: '/common/upload',
+    url: '/common/uploads',
     method: 'post',
     data: data
   })
diff --git a/ruoyi-ui/src/api/device/index.js b/ruoyi-ui/src/api/device/index.js
index 1d5a340..96b7aab 100644
--- a/ruoyi-ui/src/api/device/index.js
+++ b/ruoyi-ui/src/api/device/index.js
@@ -49,7 +49,7 @@
 //涓婁紶鏂囦欢
 export function uploadPic(data) {
   return request({
-    url: '/common/upload',
+    url: '/common/uploads',
     method: 'post',
     data: data
   })
diff --git a/ruoyi-ui/src/api/doctor/index.js b/ruoyi-ui/src/api/doctor/index.js
index 274d823..a28505b 100644
--- a/ruoyi-ui/src/api/doctor/index.js
+++ b/ruoyi-ui/src/api/doctor/index.js
@@ -56,7 +56,7 @@
 //涓婁紶鏂囦欢
 export function uploadPic(data) {
   return request({
-    url: '/common/upload',
+    url: '/common/uploads',
     method: 'post',
     data: data
   })
diff --git a/ruoyi-ui/src/api/economy/index.js b/ruoyi-ui/src/api/economy/index.js
index 214e221..cb2e9d3 100644
--- a/ruoyi-ui/src/api/economy/index.js
+++ b/ruoyi-ui/src/api/economy/index.js
@@ -50,7 +50,7 @@
 //涓婁紶鏂囦欢
 export function uploadPic(data) {
   return request({
-    url: '/common/upload',
+    url: '/common/uploads',
     method: 'post',
     data: data
   })
diff --git a/ruoyi-ui/src/api/note/index.js b/ruoyi-ui/src/api/note/index.js
index e5c17c1..b1710ab 100644
--- a/ruoyi-ui/src/api/note/index.js
+++ b/ruoyi-ui/src/api/note/index.js
@@ -36,7 +36,7 @@
 //涓婁紶鏂囦欢
 export function uploadPic(data) {
   return request({
-    url: '/common/upload',
+    url: '/common/uploads',
     method: 'post',
     data: data
   })
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index 94444e7..56e8ee5 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -127,7 +127,7 @@
         multiple
         list-type="picture-card"
 			  		ref="upload1"
- 
+   :on-remove="handleRemoveFile"
         :http-request="requestUpload1"
 		       :file-list="fileListOther"
 		:on-change="handleChange1"
@@ -238,7 +238,7 @@
         people: undefined,
         address: undefined,
         remark: undefined,
-        url: undefined,
+        url: "",
       },
       dialogImageUrl: '',
       url1:undefined,
@@ -401,7 +401,7 @@
 	  			uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
 	  })
 	  this.formData.url = ul+","+uls;
-	  alert(this.formData.url)
+	//  alert(this.formData.url)
 	  if(res==true){
 		  updateFamilyevent(this.formData).then(response => {
 			this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index 0f5bf7a..b734e4f 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -334,7 +334,7 @@
                       @click="handleFileCardPreview(file)"
                     >
                       <i class="el-icon-zoom-in"></i>
-                    </span>A
+                    </span>
              
                     <span
               
@@ -757,7 +757,7 @@
 		//alert(976)
 		//this.$refs.upload.submit();
 		//alert(8)
-		alert(this.uploadFileList.length)
+		//alert(this.uploadFileList.length)
 	if(this.uploadFileList.length==0){
 		  this.$modal.msgSuccess("鍥剧墖涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
 		  return}
@@ -783,7 +783,7 @@
     },
     requestUpload1(params)
     {
-		     this.uploadFileList1.push(params.file);
+		//     this.uploadFileList1.push(params.file);
     },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
diff --git a/ruoyi-ui/src/views/clean/cleanInfo.vue b/ruoyi-ui/src/views/clean/cleanInfo.vue
index e228639..56e75d5 100644
--- a/ruoyi-ui/src/views/clean/cleanInfo.vue
+++ b/ruoyi-ui/src/views/clean/cleanInfo.vue
@@ -57,13 +57,15 @@
         action="#"
         list-type="picture-card"
         multiple
-        accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
+ 
         :http-request="requestUpload"
         :file-list="fileList"
+		      :on-change="handleChange"
         :disabled="!btn"
         :class="{ hide: !btn }"
 
-
+	  :auto-upload="false"
+	ref="upload"
       >
         <div v-if="uploading1" class="upload-status">姝ｅ湪涓婁紶...</div>
         <i v-if="!uploading1" slot="default" class="el-icon-plus"></i>
@@ -104,19 +106,28 @@
 
         </div>
       </el-upload>
-
+		 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+				  v-if="btn"
+		          @click="picUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
       <h4 class="form-header">鍏朵粬闄勪欢 </h4>
       <el-upload
         action=""
         :file-list="fileListOther"
         class="upload-demo"
         multiple
+		ref="upload1"
         list-type="picture-card"
         :on-preview="handleFileCardPreview"
         :on-remove="handleRemoveFile"
         :http-request="requestUpload1"
         :show-file-list="true"
         :disabled="!btn"
+		:on-change="handleChange1"
+				:auto-upload="false"
         :class="{ hide: !btn }"
       >
         <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
@@ -166,7 +177,14 @@
 
       </el-upload>
 
-
+	 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+		          v-if="btn"
+		          @click="fileUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
+				      <h4 class="form-header"> </h4>
       <el-form-item size="large">
         <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
       </el-form-item>
@@ -198,8 +216,12 @@
      
       fileList:[
       ],
-      fileListOther:[
-
+	  
+	  
+	  fileList1:[],
+	  uploadFileList:[],
+	  uploadFileList1:[],
+	  fileListOther:[
       ],
       dsb:true,
       btn:false,
@@ -297,18 +319,28 @@
         for(let i = 0; i < paths.length; i++)
         {
           if(paths[i]!="") {
-
-            let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
-
-            if (_this.fot.includes(pth) === true)
-              _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
-            else {
-              // alert(paths[i])
-              let nms = paths[i].split("\/")
-              let nm = nms[nms.length - 1]
-              _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+          
+              let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+          //	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})
+          	  }
+              else {
+                // alert(paths[i])
+          	 // alert()
+                let nms = paths[i].split("\/")
+                let nm = nms[nms.length - 1]
+          	  if(paths[i][0]=="/")
+                _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+          		else
+          		_this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+          		
+          	}
             }
-          }
         }
         this.loading = false;
       });
@@ -416,25 +448,87 @@
     },
     //鍒犳枃浠�
     handleRemoveFile(file,) {
-
+ //鍒よ鏄惁鏄箣鍓嶇殑鍥剧墖
+	  let res = false
       for(let i = 0; i < this.fileListOther.length; i++)
       {
         if(this.fileListOther[i].url==file.url)
+		{
+			if(this.fileListOther[i].res==false)
+				res = true
+			else
+			{
+				this.$delete(this.uploadFileList1, Math.abs(i - this.uploadFileList1.length-1))
+			}
           this.$delete(this.fileListOther,i);
-        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;
-        updateClean(this.formData).then(response => {
-          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-          // this.open = false;
-          // this.btn=false
-        });
+    
+		}
       }
+	  
+	  let ul = ""
+	  this.fileList.map(function (elem){
+	  		if(elem.res==false)
+	  			ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+	  })
+	  let uls = ""
+	  this.fileListOther.map(function (elem){
+	    if(elem.res==false)
+	  			uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+	  })
+	  this.formData.url = ul+","+uls;
+	//  alert(this.formData.url)
+	  if(res==true){
+		  updateClean(this.formData).then(response => {
+			this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+			// this.open = false;
+		  
+		  });
+	  }
+      
+
+ 
     },
+	handleRemove(file) {
+			  //鍒ゆ柇鏄惁鏄箣鍓嶇殑鍥剧墖
+	  let res = false
+	//  alert(this.fileList.length)
+	  for(let i = 0; i < this.fileList.length; i++)
+	  {
+	    if(this.fileList[i].url==file.url)
+		{
+			//鍘熸潵鍥惧儚鏍囪涓篺alse
+			//alert(this.fileList[i].res)
+		  if(this.fileList[i].res==false)
+			res = true
+		  else
+		  {
+			//  alert(this.uploadFileList.length)
+			//  alert(87)
+			 this.$delete(this.uploadFileList, Math.abs(i - this.uploadFileList.length-1))
+			 	//	  alert(this.uploadFileList.length)
+			 }
+	      this.$delete(this.fileList,i);
+	   
+	  }
+	  }
+	  let ul = ""
+	  this.fileList.map(function (elem){
+		if(elem.res==false)
+			ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+	  })
+	  let uls = ""
+	  this.fileListOther.map(function (elem){
+	    if(elem.res==false)
+			elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+	  })
+	  this.formData.url = ul+","+uls;
+	  if(res==true){
+		  updateClean(this.formData).then(response => {
+			this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+		  });
+	  }
+	
+	},
     handleDownload(url) {
       var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
 
@@ -448,6 +542,108 @@
         saveAs(blob, filename)
       })
     },
+	handleChange(file, fileList1) {
+	       //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+	
+	     // this.uploadFileList.push(file.raw);
+	      console.log("=========5555=========")
+		  this.uploadFileList.push(file.raw);
+		   this.fileList.push({name:file.name,url:file.url,res:true})
+	    },
+		//鑷畾涔変笂浼犳柟娉�
+		handleChange1(file, fileListOther1) {
+		       //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+		
+		     // this.uploadFileList.push(file.raw);
+			 this.uploadFileList1.push(file.raw);
+			  this.fileListOther.push({name:file.name,url:file.url,res:true})
+		      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();
+		//	alert(this.uploadFileList1.length)
+			// formData.append('uploadFile', file);
+			if(this.uploadFileList1.length==0){
+				  this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+				  return}
+			
+			this.uploadFileList1.forEach((elem)=>{
+				formData.append("files", elem)
+				
+			})
+			console.log(this.uploadFileList1)
+			let _this = this
+	
+			this.uploading = true;
+			uploadPic(formData).then(response => {
+			_this.uploadFileList1 = []
+			  _this.formData.url = _this.formData.url+","+response.fileNames
+			    updateClean(_this.formData).then(response => {
+			      this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
+			      // this.open = false;
+			    });
+			  })
+	
+		},
+		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)
+				// 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)
+		//	alert(response.fileNames)
+	          _this.formData.url = _this.formData.url+","+response.fileNames
+			_this.uploadFileList = []
+	         // alert(87)
+	          updateClean(_this.formData).then(response => {
+	            _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+	            // this.open = false;
+	
+	          });
+	        // }
+	        // else{
+	        //   _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+	
+	        // }
+	      });
+		},
+	 
     handleEdit()
     {
       this.dsb = false
@@ -455,76 +651,12 @@
     },
     requestUpload(params)
     {
-      var file = params.file;
-      var formData = new FormData();
-	 // console.log(file)
-      formData.append('uploadFile', file);
-      let _this = this
-      this.uploading1 = true;
-
-      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)
-          updateClean(this.formData).then(response => {
-            this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
-            // this.open = false;
-            // this.btn=false
-          });
-        }
-        else{
-          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
-        }
-      })
+      
 
     },
     requestUpload1(params)
     {
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-      this.uploading = true;
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-        this.uploading = false;
-        // this.$modal.msgSuccess("涓婁紶鎴愬姛");
-        if(_this.fot.includes(pth) === true)
-        {
-          _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)
-          updateClean(this.formData).then(response => {
-            this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
-            // this.open = false;
-            // this.btn=false
-          });
-        }
-      })
+    
 
     },
 
diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index 6612526..05d0701 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -257,6 +257,7 @@
 			:on-change="handleChange"
 			:auto-upload="false"
 			ref="upload"
+	
           >
             <i slot="default" class="el-icon-plus"></i>
             <div slot="file" slot-scope="{ file }">
@@ -287,26 +288,41 @@
     </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=""
             :file-list="fileListOther"
             class="upload-demo"
             multiple
-
+  		ref="upload1"
+		:on-change="handleChange1"
+		:auto-upload="false"
+        list-type="picture-card"
             :on-remove="handleRemoveFile"
             :http-request="requestUpload1"
             :show-file-list="true"
           >
-
+<!-- 
             <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
-            <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+            <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div> -->
             <template #tip>
               <div class="el-upload__tip">
               </div>
             </template>
           </el-upload>
-
+	 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+		          @click="fileUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
         </el-form>
         <h4 class="form-header"> </h4>
 
@@ -373,6 +389,9 @@
       
         fileList:[
         ],
+		fileList1:[],
+		uploadFileList: [],
+		uploadFileList1: [],
         fileListOther:[
 
         ],
@@ -388,7 +407,7 @@
           location: undefined,
           remark: undefined,
           happenTime: undefined,
-          url: undefined,
+          url: "",
 
         },
         // 鑿滃崟鍒楄〃
@@ -528,7 +547,11 @@
         for(let i = 0; i < this.fileList.length; i++)
         {
           if(this.fileList[i].url==file.url)
-            this.$delete(this.fileList,i);
+           {
+             this.$delete(this.fileList,i);
+           		 this.$delete(this.uploadFileList,i);
+           		 }
+           
         }
       },
 
@@ -617,19 +640,18 @@
         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);
+            
+            }
         }
       },
       /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
       submitDataScope: function() {
 
-        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.url = ul+","+uls
+
         this.$refs["elForm"].validate(valid => {
           if (valid) {
 
@@ -658,6 +680,9 @@
     
      // this.uploadFileList.push(file.raw);
       console.log("=========5555=========")
+	  this.uploadFileList.push(file.raw);
+	       this.fileList.push({name:file.name,url:file.url})
+	  //alert(fileList1.length)
       //console.log(file)
     //  console.log(this.uploadFileList)
     //  this.fileList = fileList
@@ -667,6 +692,8 @@
     
      // this.uploadFileList.push(file.raw);
       console.log("=========5555=========")
+	  this.uploadFileList1.push(file.raw);
+	   this.fileListOther.push({name:file.name,url:file.url})
       //console.log(file)
     //  console.log(this.uploadFileList)
     //  this.fileList = fileList
@@ -675,7 +702,7 @@
     //	var file = params.file;
     
     	var formData = new FormData();
-    	this.$refs.upload1.submit();
+    	//this.$refs.upload1.submit();
     	// formData.append('uploadFile', file);
     	if(this.uploadFileList1.length==0){
     		  this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖!");
@@ -698,8 +725,11 @@
     },
     picUpload()
     {
+		//alert(89)
     	var formData = new FormData();
-    	this.$refs.upload.submit();
+		//alert(this.uploadFileList.length)
+		console.log(this.uploadFileList)
+    	//this.$refs.upload.submit();
     if(this.uploadFileList.length==0){
     	  this.$modal.msgSuccess("鍥剧墖涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
     	  return}
@@ -714,6 +744,7 @@
         uploadPic(formData).then(response => {
     	//	alert("dds")
           _this.formDat.url = _this.formDat.url+","+response.fileNames
+		  //alert( _this.formDat.url)
     	  _this.uploadFileList = []
     	  _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
     
@@ -721,11 +752,11 @@
     },
     requestUpload(params) {
     
-     this.uploadFileList.push(params.file);
+   //  this.uploadFileList.push(params.file);
     },
     requestUpload1(params)
     {
-    	     this.uploadFileList1.push(params.file);
+    //	     this.uploadFileList1.push(params.file);
     },
       /** 鍒犻櫎鎸夐挳鎿嶄綔 */
       handleDelete(row) {
diff --git a/ruoyi-ui/src/views/collection/collectionInfo.vue b/ruoyi-ui/src/views/collection/collectionInfo.vue
index 5f006b2..aa738b7 100644
--- a/ruoyi-ui/src/views/collection/collectionInfo.vue
+++ b/ruoyi-ui/src/views/collection/collectionInfo.vue
@@ -86,10 +86,13 @@
             multiple
             :http-request="requestUpload"
             :file-list="fileList"
+		
+			:on-change="handleChange"
+			:auto-upload="false"
             :disabled="!btn"
             :class="{ hide: !btn }"
           >
-            <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+
             <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
             <div slot="file" slot-scope="{file}">
               <img
@@ -127,7 +130,13 @@
 
             </div>
           </el-upload>
-
+		 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+				  v-if="btn"
+		          @click="picUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
           <h4 class="form-header">鍏朵粬闄勪欢 </h4>
           <el-upload
             action=""
@@ -136,9 +145,11 @@
             multiple
             list-type="picture-card"
             :on-preview="handleFileCardPreview"
-            :on-remove="handleRemoveFile"
+       
             :http-request="requestUpload1"
             :show-file-list="true"
+			:on-change="handleChange1"
+					:auto-upload="false"
             :disabled="!btn"
             :class="{ hide: !btn }"
           >
@@ -189,7 +200,14 @@
 
 
           </el-upload>
-
+	 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+		          v-if="btn"
+		          @click="fileUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
+				      <h4 class="form-header"> </h4>
           <el-form-item size="large">
             <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb" >淇敼</el-button>
           </el-form-item>
@@ -224,7 +242,12 @@
       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
     
       fileList:[],
-      fileListOther:[],
+   fileList1:[],
+   uploadFileList:[],
+   uploadFileList1:[],
+   fileListOther:[
+   
+   ],
       dsb:true,
       btn:false,
       isShow:true,
@@ -244,7 +267,7 @@
         price:undefined,
         location:undefined,
         remark:undefined,
-        url: undefined,
+        url: "",
       },
 
       dialogImageUrl: '',
@@ -329,19 +352,29 @@
         let paths = response.data.url.split(",");
         for(let i = 0; i < paths.length; i++)
         {
-          if(paths[i]!="") {
-
-            let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
-
-            if (_this.fot.includes(pth) === true)
-              _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
-            else {
-              // alert(paths[i])
-              let nms = paths[i].split("\/")
-              let nm = nms[nms.length - 1]
-              _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
-            }
-          }
+         if(paths[i]!="") {
+         
+             let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+         //	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})
+         	  }
+             else {
+               // alert(paths[i])
+         	 // alert()
+               let nms = paths[i].split("\/")
+               let nm = nms[nms.length - 1]
+         	  if(paths[i][0]=="/")
+               _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+         		else
+         		_this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+         		
+         	}
+           }
         }
         this.loading = false;
       });
@@ -386,13 +419,7 @@
 
     },
     submitForm() {
-      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
+
 
       this.$refs['elForm'].validate(valid => {
 
@@ -431,44 +458,85 @@
         saveAs(blob, filename)
       })
     },
-    handleRemoveFile(file) {
-      for(let i = 0; i < this.fileListOther.length; i++)
-      {
-        if(this.fileListOther[i].url==file.url)
-          this.$delete(this.fileListOther,i);
-        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;
-        updateCollection(this.formData).then(response => {
-          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-          // this.open = false;
-          // this.btn=false
-        });
-      }
-    },
-    handleRemove(file) {
-      for(let i = 0; i < this.fileList.length; i++)
-      {
-        if(this.fileList[i].url==file.url)
-          this.$delete(this.fileList,i);
-        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;
-        updateCollection(this.formData).then(response => {
-          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-          // this.open = false;
-          // this.btn=false
-        });
-      }
-    },
+  handleRemoveFile(file) {
+    //鍒よ鏄惁鏄箣鍓嶇殑鍥剧墖
+    let res = false
+    for(let i = 0; i < this.fileListOther.length; i++)
+    {
+      if(this.fileListOther[i].url==file.url)
+  	{
+  		if(this.fileListOther[i].res==false)
+  			res = true
+  		else
+  		{
+  			this.$delete(this.uploadFileList1, Math.abs(i - this.uploadFileList1.length-1))
+  		}
+        this.$delete(this.fileListOther,i);
+  
+  	}
+    }
+    
+    let ul = ""
+    this.fileList.map(function (elem){
+    		if(elem.res==false)
+    			ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+    })
+    let uls = ""
+    this.fileListOther.map(function (elem){
+      if(elem.res==false)
+    			uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+    })
+    this.formData.url = ul+","+uls;
+  //  alert(this.formData.url)
+    if(res==true){
+  	  updateCollection(this.formData).then(response => {
+  		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+  		// this.open = false;
+  	  
+  	  });
+    }
+  },
+  handleRemove(file) {	  
+  		  //鍒ゆ柇鏄惁鏄箣鍓嶇殑鍥剧墖
+    let res = false
+  //  alert(this.fileList.length)
+    for(let i = 0; i < this.fileList.length; i++)
+    {
+      if(this.fileList[i].url==file.url)
+  	{
+  		//鍘熸潵鍥惧儚鏍囪涓篺alse
+  		//alert(this.fileList[i].res)
+  	  if(this.fileList[i].res==false)
+  		res = true
+  	  else
+  	  {
+  		//  alert(this.uploadFileList.length)
+  		//  alert(87)
+  		 this.$delete(this.uploadFileList, Math.abs(i - this.uploadFileList.length-1))
+  		 	//	  alert(this.uploadFileList.length)
+  		 }
+        this.$delete(this.fileList,i);
+     
+    }
+    }
+    let ul = ""
+    this.fileList.map(function (elem){
+  	if(elem.res==false)
+  		ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+    })
+    let uls = ""
+    this.fileListOther.map(function (elem){
+      if(elem.res==false)
+  		elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+    })
+    this.formData.url = ul+","+uls;
+    if(res==true){
+  	  updateCollection(this.formData).then(response => {
+  		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+  	  });
+    }
+  
+  },
     handleFileCardPreview(file){
       this.dialogFileUrl = file.url;
       if(this.dialogFileUrl.includes("47.93.189.255")==true)
@@ -501,88 +569,162 @@
       this.btn = true
       this.isShow=false
     },
+	
+	//鑷畾涔変笂浼犳柟娉�
+	    handleChange(file, fileList1) {
+	       //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+	
+	     // this.uploadFileList.push(file.raw);
+	      console.log("=========5555=========")
+		  this.uploadFileList.push(file.raw);
+		   this.fileList.push({name:file.name,url:file.url,res:true})
+	    },
+		//鑷畾涔変笂浼犳柟娉�
+		handleChange1(file, fileListOther1) {
+		       //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+		
+		     // this.uploadFileList.push(file.raw);
+			 this.uploadFileList1.push(file.raw);
+			  this.fileListOther.push({name:file.name,url:file.url,res:true})
+		      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();
+		//	alert(this.uploadFileList1.length)
+			// formData.append('uploadFile', file);
+			if(this.uploadFileList1.length==0){
+				  this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+				  return}
+			
+			this.uploadFileList1.forEach((elem)=>{
+				formData.append("files", elem)
+				
+			})
+			console.log(this.uploadFileList1)
+			let _this = this
+	
+			this.uploading = true;
+			uploadPic(formData).then(response => {
+			_this.uploadFileList1 = []
+			  _this.formData.url = _this.formData.url+","+response.fileNames
+			    updateCollection(_this.formData).then(response => {
+			      this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
+			      // this.open = false;
+			    });
+			  })
+	
+		},
+		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)
+				// 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)
+		//	alert(response.fileNames)
+	          _this.formData.url = _this.formData.url+","+response.fileNames
+			_this.uploadFileList = []
+	         // alert(87)
+	          updateCollection(_this.formData).then(response => {
+	            _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+	            // this.open = false;
+	
+	          });
+	        // }
+	        // else{
+	        //   _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+	
+	        // }
+	      });
+		},
+	
     requestUpload(params)
     {
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-      this.uploading = true;
-
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-        this.uploading = false;
-        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)
-          updateCollection(this.formData).then(response => {
-            this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
-            // this.open = false;
-            // this.btn=false
-          });
-        }
-        else{
-          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
-        }
-      })
+     
     },
     requestUpload1(params)
     {
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-      this.uploading1 = true;
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-        this.uploading1 = false;
-        // this.$modal.msgSuccess("涓婁紶鎴愬姛");
-        if(_this.fot.includes(pth) === true)
-        {
-          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+      // var file = params.file;
+      // var formData = new FormData();
+      // formData.append('uploadFile', file);
+      // let _this = this
+      // this.uploading1 = true;
+      // uploadPic(formData).then(response => {
+      //   let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+      //   this.uploading1 = false;
+      //   // this.$modal.msgSuccess("涓婁紶鎴愬姛");
+      //   if(_this.fot.includes(pth) === true)
+      //   {
+      //     _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)
-          updateCollection(this.formData).then(response => {
-            this.$modal.msgSuccess("涓婁紶鎴愬姛");
+      //   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)
+      //     updateCollection(this.formData).then(response => {
+      //       this.$modal.msgSuccess("涓婁紶鎴愬姛");
 
-            const videoElement = document.createElement('video'); // 鍒涘缓涓�涓柊鐨剉ideo鍏冪礌
-            videoElement.src = response.data.url; // 璁剧疆video鍏冪礌鐨剆rc涓鸿棰慤RL
-            // 鐩戝惉loadedmetadata浜嬩欢浠ョ‘淇濊棰戝厓鏁版嵁鍔犺浇瀹屾垚
-            videoElement.addEventListener('loadedmetadata', function() {
-              const canvas = document.createElement('canvas');// 鍒涘缓涓�涓猚anvas鍏冪礌
-              const context = canvas.getContext('2d');
-              context.drawImage(videoElement, 0, 0, canvas.width, canvas.height); // 灏嗚棰戠殑棣栧抚鐢婚潰缁樺埗鍒扮敾甯冧笂
-              const imageURL = canvas.toDataURL();// 灏嗙敾甯冭浆鎹负鍥惧儚URL
-              videoElement.setAttribute('poster', imageURL);// 璁剧疆瑙嗛鐨勫皝闈㈠浘鍍�
+      //       const videoElement = document.createElement('video'); // 鍒涘缓涓�涓柊鐨剉ideo鍏冪礌
+      //       videoElement.src = response.data.url; // 璁剧疆video鍏冪礌鐨剆rc涓鸿棰慤RL
+      //       // 鐩戝惉loadedmetadata浜嬩欢浠ョ‘淇濊棰戝厓鏁版嵁鍔犺浇瀹屾垚
+      //       videoElement.addEventListener('loadedmetadata', function() {
+      //         const canvas = document.createElement('canvas');// 鍒涘缓涓�涓猚anvas鍏冪礌
+      //         const context = canvas.getContext('2d');
+      //         context.drawImage(videoElement, 0, 0, canvas.width, canvas.height); // 灏嗚棰戠殑棣栧抚鐢婚潰缁樺埗鍒扮敾甯冧笂
+      //         const imageURL = canvas.toDataURL();// 灏嗙敾甯冭浆鎹负鍥惧儚URL
+      //         videoElement.setAttribute('poster', imageURL);// 璁剧疆瑙嗛鐨勫皝闈㈠浘鍍�
 
-              // 鍦ㄩ〉闈腑鏄剧ず瑙嗛鍏冪礌
-              document.body.appendChild(videoElement);
-            });
-            // this.open = false;
-            // this.btn=false
-          });
-        }
-      })
+      //         // 鍦ㄩ〉闈腑鏄剧ず瑙嗛鍏冪礌
+      //         document.body.appendChild(videoElement);
+      //       });
+      //       // this.open = false;
+      //       // this.btn=false
+      //     });
+      //   }
+      // })
     },
 
   }
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 08df003..72dc517 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -314,7 +314,7 @@
           </el-input>
         </el-form-item>
         <el-form-item label="浠锋牸" prop="price">
-          <el-input v-model="formDat.price" placeholder="璇疯緭鍏ヤ环鏍�" clearable :style="{width: '100%'}" >
+          <el-input v-model="formDat.price" type="number" placeholder="璇疯緭鍏ヤ环鏍�" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
         <el-form-item label="瀛樻斁浣嶇疆" prop="location">
@@ -334,6 +334,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 }">
@@ -367,25 +370,75 @@
 
           </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=""
           :file-list="fileListOther"
           class="upload-demo"
           multiple
-
+	ref="upload1"
+	list-type="picture-card"
+		:on-change="handleChange1"
+		:auto-upload="false"
           :on-remove="handleRemoveFile"
           :http-request="requestUpload1"
           :show-file-list="true"
         >
-          <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
-          <div v-if="uploading1" class="upload-status">姝ｅ湪涓婁紶...</div>
+<i slot="default" class="el-icon-plus"></i>
+        <div slot="file" slot-scope="{file}">
+          <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
+          <video
+            v-if="file.url.includes('.mp4')"
+            class="el-upload-list__item-thumbnail"
+            :src="file.url"
+            style="width: 147px; height: 147px"
+            fit="cover"
+          ></video>
+          <img v-else
+               class="el-upload-list__item-thumbnail"
+               :src="file.url"
+               alt=""
+               style="width: 100%; height: 100%"
+               fit="cover"></img>
+
+          <span class="el-upload-list__item-actions">
+               <span class="el-upload-list__item-name">{{ file.name }}</span>
+                    <span
+                      class="el-upload-list__item-preview"
+                      @click="handleFileCardPreview(file)"
+                    >
+                      <i class="el-icon-zoom-in"></i>
+                    </span>
+             
+                    <span
+              
+                      class="el-upload-list__item-delete"
+                      @click="handleRemoveFile(file)"
+                    >
+                      <i class="el-icon-delete"></i>
+                    </span>
+              </span>
+
+        </div>
+
           <template #tip>
             <div class="el-upload__tip">
             </div>
           </template>
         </el-upload>
-
+	 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+		          @click="fileUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
       </el-form>
       <h4 class="form-header"> </h4>
 
@@ -454,7 +507,10 @@
       fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
         '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
       fileList:[],
-      fileListOther:[],
+ fileList1:[],
+ 	  uploadFileList: [],
+ 		uploadFileList1: [],
+ fileListOther:[],
       dsb:true,
       btn:false,
       fit:['fill'],
@@ -471,7 +527,7 @@
         price:undefined,
         location:undefined,
         remark:undefined,
-        url: undefined,
+        url: "",
 
       },
       // 鑿滃崟鍒楄〃
@@ -652,14 +708,23 @@
       for(let i = 0; i < this.fileList.length; i++)
       {
         if(this.fileList[i].url==file.url)
+        {
           this.$delete(this.fileList,i);
+        		 this.$delete(this.uploadFileList,i);
+        		 }
+        
       }
     },
     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);
+          
+          }
       }
     },
     // 鍙栨秷鎸夐挳
@@ -755,13 +820,7 @@
     /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
     submitDataScope: function() {
 
-      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.url = ul+","+uls
+
       this.$refs["elForm"].validate(valid => {
         if (valid) {
 
@@ -784,40 +843,88 @@
         }
       });
     },
-    requestUpload(params)
-    {
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-      this.uploading = true;
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-        this.uploading = false;
-        this.$modal.msgSuccess("涓婁紶鎴愬姛");
-        if(_this.fot.includes(pth) === true)
-        {
-          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
-        }
-      })
-    },
-    requestUpload1(params)
-    {
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-      this.uploading1 = true;
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-        this.uploading1 = false;
-        this.$modal.msgSuccess("涓婁紶鎴愬姛");
-        if(_this.fot.includes(pth) !== true)
-        {
-          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-        }
-      })
-    },
+  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.uploadFileList1.push(params.file);
+      },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const Ids = row.id || this.ids;
diff --git a/ruoyi-ui/src/views/contacts/contactsInfo.vue b/ruoyi-ui/src/views/contacts/contactsInfo.vue
index ec4a40b..c4398cf 100644
--- a/ruoyi-ui/src/views/contacts/contactsInfo.vue
+++ b/ruoyi-ui/src/views/contacts/contactsInfo.vue
@@ -90,9 +90,12 @@
         :http-request="requestUpload"
         :file-list="fileList"
         :disabled="!btn"
+		ref="upload"
+		:on-change="handleChange"
+		:auto-upload="false"
         :class="{ hide: !btn }"
       >
-        <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+
         <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
         <div slot="file" slot-scope="{file}">
           <img
@@ -130,7 +133,13 @@
 
         </div>
       </el-upload>
-
+		 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+				  v-if="btn"
+		          @click="picUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
      <h4 class="form-header">鍏朵粬闄勪欢 </h4>
       <el-upload
         action=""
@@ -142,10 +151,12 @@
         :on-remove="handleRemoveFile"
         :http-request="requestUpload1"
         :show-file-list="true"
+		:on-change="handleChange1"
+				:auto-upload="false"
         :disabled="!btn"
         :class="{ hide: !btn }"
       >
-        <div v-if="uploading1" class="upload-status">姝ｅ湪涓婁紶...</div>
+        
         <i v-if="!uploading1" slot="default" class="el-icon-plus"></i>
         <div slot="file" slot-scope="{file}">
           <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
@@ -191,7 +202,14 @@
 
 
       </el-upload>
-
+	 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+		          v-if="btn"
+		          @click="fileUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
+				      <h4 class="form-header"> </h4>
       <el-form-item size="large">
         <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
       </el-form-item>
@@ -223,9 +241,12 @@
 
       fileList:[
       ],
-      fileListOther:[
-
-      ],
+     fileList1:[],
+     uploadFileList:[],
+     uploadFileList1:[],
+     fileListOther:[
+     
+     ],
       dsb:true,
       btn:false,
       isShow:true,
@@ -248,7 +269,7 @@
         twitter:undefined,
         isAlways:undefined,
         remark:undefined,
-        url: undefined,
+        url: '',
       },
 
       dialogImageUrl: '',
@@ -334,18 +355,28 @@
         let paths = response.data.url.split(",");
         for(let i = 0; i < paths.length; i++)
         {
-          if(paths[i]!="") {
-
+        if(paths[i]!="") {
+        
             let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
-
+        //	alert(pth)
             if (_this.fot.includes(pth) === true)
-              _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+        	{
+        		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])
+        	 // alert()
               let nms = paths[i].split("\/")
               let nm = nms[nms.length - 1]
-              _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
-            }
+        	  if(paths[i][0]=="/")
+              _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+        		else
+        		_this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+        		
+        	}
           }
         }
         this.loading = false;
@@ -357,14 +388,7 @@
   mounted() {},
   methods: {
     submitForm() {
-      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
-
+  
 
       this.$refs['elForm'].validate(valid => {
       if(this.formData.isAlways=='鍚�')
@@ -411,42 +435,91 @@
       })
     },
     handleRemoveFile(file,) {
-      for(let i = 0; i < this.fileListOther.length; i++)
-      {
-        if(this.fileListOther[i].url==file.url)
-          this.$delete(this.fileListOther,i);
-        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;
-        updateContact(this.formData).then(response => {
-          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-          // this.open = false;
-          // this.btn=false
-        });
-      }
+ //鍒よ鏄惁鏄箣鍓嶇殑鍥剧墖
+   let res = false
+   for(let i = 0; i < this.fileListOther.length; i++)
+   {
+     if(this.fileListOther[i].url==file.url)
+ 	{
+ 		if(this.fileListOther[i].res==false)
+ 			res = true
+ 		else
+ 		{
+ 			this.$delete(this.uploadFileList1, Math.abs(i - this.uploadFileList1.length-1))
+ 		}
+       this.$delete(this.fileListOther,i);
+ 
+ 	}
+   }
+   
+   let ul = ""
+   this.fileList.map(function (elem){
+   		if(elem.res==false)
+   			ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+   })
+   let uls = ""
+   this.fileListOther.map(function (elem){
+     if(elem.res==false)
+   			uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+   })
+   if(this.formData.isAlways=='鍚�')
+     this.formData.isAlways = 0
+   else
+     this.formData.isAlways = 1
+   this.formData.url = ul+","+uls;
+ //  alert(this.formData.url)
+   if(res==true){
+ 	  updateContact(this.formData).then(response => {
+ 		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ 		// this.open = false;
+ 	  
+ 	  });
+   }
     },
     handleRemove(file) {
-      for(let i = 0; i < this.fileList.length; i++)
-      {
-        if(this.fileList[i].url==file.url)
-          this.$delete(this.fileList,i);
-        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;
-        updateContact(this.formData).then(response => {
-          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-          // this.open = false;
-          // this.btn=false
-        });
-      }
+  let res = false
+  //  alert(this.fileList.length)
+    for(let i = 0; i < this.fileList.length; i++)
+    {
+      if(this.fileList[i].url==file.url)
+  	{
+  		//鍘熸潵鍥惧儚鏍囪涓篺alse
+  		//alert(this.fileList[i].res)
+  	  if(this.fileList[i].res==false)
+  		res = true
+  	  else
+  	  {
+  		//  alert(this.uploadFileList.length)
+  		//  alert(87)
+  		 this.$delete(this.uploadFileList, Math.abs(i - this.uploadFileList.length-1))
+  		 	//	  alert(this.uploadFileList.length)
+  		 }
+        this.$delete(this.fileList,i);
+     
+    }
+    }
+    let ul = ""
+    this.fileList.map(function (elem){
+  	if(elem.res==false)
+  		ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+    })
+    let uls = ""
+    this.fileListOther.map(function (elem){
+      if(elem.res==false)
+  		elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+    })
+    this.formData.url = ul+","+uls;
+	if(this.formData.isAlways=='鍚�')
+	  this.formData.isAlways = 0
+	else
+	  this.formData.isAlways = 1
+    if(res==true){
+  	  updateContact(this.formData).then(response => {
+  		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+  	  });
+    }
+  
+
     },
     handleFileCardPreview(file){
       this.dialogFileUrl = file.url;
@@ -481,75 +554,133 @@
       this.btn = true
       this.isShow=false
     },
-    requestUpload(params)
-    {
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-      this.uploading = true;
-
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-        this.uploading = false;
-        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)
-          updateContact(this.formData).then(response => {
-            this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
-            // this.open = false;
-            // this.btn=false
-          });
-        }
-        else{
-          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
-        }
-      })
-    },
-    requestUpload1(params)
-    {
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-      this.uploading1 = true;
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-        this.uploading1 = false;
-        // this.$modal.msgSuccess("涓婁紶鎴愬姛");
-        if(_this.fot.includes(pth) === true)
-        {
-          _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)
-          updateContact(this.formData).then(response => {
-            this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
-            // this.open = false;
-            // this.btn=false
-          });
-        }
-      })
-    },
+  
+  //鑷畾涔変笂浼犳柟娉�
+      handleChange(file, fileList1) {
+         //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+  
+       // this.uploadFileList.push(file.raw);
+        console.log("=========5555=========")
+  	  this.uploadFileList.push(file.raw);
+  	   this.fileList.push({name:file.name,url:file.url,res:true})
+      },
+  	//鑷畾涔変笂浼犳柟娉�
+  	handleChange1(file, fileListOther1) {
+  	       //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+  	
+  	     // this.uploadFileList.push(file.raw);
+  		 this.uploadFileList1.push(file.raw);
+  		  this.fileListOther.push({name:file.name,url:file.url,res:true})
+  	      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();
+  	//	alert(this.uploadFileList1.length)
+  		// formData.append('uploadFile', file);
+  		if(this.uploadFileList1.length==0){
+  			  this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+  			  return}
+  		
+  		this.uploadFileList1.forEach((elem)=>{
+  			formData.append("files", elem)
+  			
+  		})
+  		console.log(this.uploadFileList1)
+  		let _this = this
+  
+  		this.uploading = true;
+  		uploadPic(formData).then(response => {
+  		_this.uploadFileList1 = []
+		if(_this.formData.isAlways=='鍚�')
+		  _this.formData.isAlways = 0
+		else
+		  _this.formData.isAlways = 1
+  		  _this.formData.url = _this.formData.url+","+response.fileNames
+  		    updateContact(_this.formData).then(response => {
+  		      this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
+  		      // this.open = false;
+  		    });
+  		  })
+  
+  	},
+  	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)
+  			// 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)
+  	//	alert(response.fileNames)
+	if(_this.formData.isAlways=='鍚�')
+	  _this.formData.isAlways = 0
+	else
+	  _this.formData.isAlways = 1
+            _this.formData.url = _this.formData.url+","+response.fileNames
+  		_this.uploadFileList = []
+           // alert(87)
+            updateContact(_this.formData).then(response => {
+              _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+              // this.open = false;
+  
+            });
+          // }
+          // 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)
+      {
+  	//	alert(123)
+     // this.uploadFileList1.push(params.file);
+    //  console.log("-----------")
+  	//console.log(this.uploadFileList1)
+      },
 
   }
 }
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index c5cbb96..079c3ce 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -309,6 +309,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 }">
@@ -342,6 +345,13 @@
 
           </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=""
@@ -352,15 +362,23 @@
           :on-remove="handleRemoveFile"
           :http-request="requestUpload1"
           :show-file-list="true"
+		  ref="upload1"
+		  :on-change="handleChange1"
+		  :auto-upload="false"
+		  list-type="picture-card"
         >
-          <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
-          <div v-if="uploading1" class="upload-status">姝ｅ湪涓婁紶...</div>
+     
           <template #tip>
             <div class="el-upload__tip">
             </div>
           </template>
         </el-upload>
-
+	 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+		          @click="fileUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
       </el-form>
       <h4 class="form-header"> </h4>
 
@@ -425,9 +443,10 @@
 
       fileList:[
       ],
-      fileListOther:[
-
-      ],
+    fileList1:[],
+    	  uploadFileList: [],
+    		uploadFileList1: [],
+    fileListOther:[],
       dsb:true,
       btn:false,
       fit:['fill'],
@@ -447,7 +466,7 @@
         twitter:undefined,
         isAlways:undefined,
         remark:undefined,
-        url: undefined,
+        url: '',
 
       },
       // 鑿滃崟鍒楄〃
@@ -600,14 +619,22 @@
       for(let i = 0; i < this.fileListOther.length; i++)
       {
         if(this.fileListOther[i].url==file.url)
-          this.$delete(this.fileListOther,i);
+       {
+         
+         this.$delete(this.fileListOther,i);
+         this.$delete(this.uploadFileList1,i);
+         
+         }
       }
     },
     handleRemove(file) {
       for(let i = 0; i < this.fileList.length; i++)
       {
         if(this.fileList[i].url==file.url)
-          this.$delete(this.fileList,i);
+         {
+           this.$delete(this.fileList,i);
+         		 this.$delete(this.uploadFileList,i);
+         		 }
       }
     },
     // 鍙栨秷鎸夐挳
@@ -702,13 +729,6 @@
     /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
     submitDataScope: function() {
 
-      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.url = ul+","+uls
       this.$refs["elForm"].validate(valid => {
         if (valid) {
 
@@ -733,38 +753,86 @@
     },
     requestUpload(params)
     {
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-      this.uploading = true;
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-        this.uploading = false;
-        this.$modal.msgSuccess("涓婁紶鎴愬姛");
-        if(_this.fot.includes(pth) === true)
-        {
-          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
-        }
-      })
+   
     },
     requestUpload1(params)
     {
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-      this.uploading1 = true;
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-        this.uploading1 = false;
-        this.$modal.msgSuccess("涓婁紶鎴愬姛");
-        if(_this.fot.includes(pth) !== true)
-        {
-          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-        }
-      })
+      
     },
+	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("鍥剧墖涓婁紶鎴愬姛");
+	
+	  });
+	},
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const Ids = row.id || this.ids;
diff --git a/ruoyi-ui/src/views/device/equipmentInfo.vue b/ruoyi-ui/src/views/device/equipmentInfo.vue
index 437cad7..752b806 100644
--- a/ruoyi-ui/src/views/device/equipmentInfo.vue
+++ b/ruoyi-ui/src/views/device/equipmentInfo.vue
@@ -67,8 +67,10 @@
         :disabled="!btn"
         :class="{ hide: !btn }"
 
+      :on-change="handleChange"
+	  :auto-upload="false"
       >
-        <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+      
         <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
         <div slot="file" slot-scope="{file}">
           <img
@@ -106,23 +108,32 @@
 
         </div>
       </el-upload>
-
+	 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+				  v-if="btn"
+		          @click="picUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
       <h4 class="form-header">鍏朵粬闄勪欢 </h4>
       <el-upload
         action=""
-        :file-list="fileListOther"
+ 
         class="upload-demo"
         multiple
         list-type="picture-card"
         :on-preview="handleFileCardPreview"
-        :on-remove="handleRemoveFile"
-        :http-request="requestUpload"
-        :show-file-list="true"
+		ref="upload1"
+		:on-remove="handleRemoveFile"
+        :http-request="requestUpload1"
+      	:file-list="fileListOther"
+      	:on-change="handleChange1"
+      	:auto-upload="false"
         :disabled="!btn"
         :class="{ hide: !btn }"
       >
 
-        <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+
         <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
         <div slot="file" slot-scope="{file}">
           <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
@@ -168,7 +179,14 @@
 
 
       </el-upload>
-
+	 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+		          v-if="btn"
+		          @click="fileUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
+							      <h4 class="form-header"> </h4>
       <el-form-item size="large">
         <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
       </el-form-item>
@@ -199,8 +217,11 @@
 
       fileList:[
       ],
+      fileList1:[],
+      uploadFileList:[],
+      uploadFileList1:[],
       fileListOther:[
-
+      
       ],
       dsb:true,
       btn:false,
@@ -214,7 +235,7 @@
         content: undefined,
         remark: undefined,
         status:undefined,
-        url: undefined,
+        url: "",
         happenTime:undefined
       },
       typeOptions2: [
@@ -311,18 +332,28 @@
         for(let i = 0; i < paths.length; i++)
         {
           if(paths[i]!="") {
-
-            let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
-
-            if (_this.fot.includes(pth) === true)
-              _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
-            else {
-              // alert(paths[i])
-              let nms = paths[i].split("\/")
-              let nm = nms[nms.length - 1]
-              _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+          
+              let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+          //	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})
+          	  }
+              else {
+                // alert(paths[i])
+          	 // alert()
+                let nms = paths[i].split("\/")
+                let nm = nms[nms.length - 1]
+          	  if(paths[i][0]=="/")
+                _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+          		else
+          		_this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+          		
+          	}
             }
-          }
         }
         this.loading = false;
       });
@@ -344,13 +375,7 @@
     //   })
     // },
     submitForm() {
-      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
+   
 
       this.$refs['elForm'].validate(valid => {
 if(this.formData.status=='鏄�')
@@ -396,18 +421,93 @@
       })
     },
     handleRemoveFile(file) {
+    //鍒よ鏄惁鏄箣鍓嶇殑鍥剧墖
+      let res = false
       for(let i = 0; i < this.fileListOther.length; i++)
       {
         if(this.fileListOther[i].url==file.url)
+    	{
+    		if(this.fileListOther[i].res==false)
+    			res = true
+    		else
+    		{
+    			this.$delete(this.uploadFileList1, Math.abs(i - this.uploadFileList1.length-1))
+    		}
           this.$delete(this.fileListOther,i);
+    
+    	}
+      }
+      
+      let ul = ""
+      this.fileList.map(function (elem){
+      		if(elem.res==false)
+      			ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+      })
+      let uls = ""
+      this.fileListOther.map(function (elem){
+        if(elem.res==false)
+      			uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+      })
+      this.formData.url = ul+","+uls;
+    //  alert(this.formData.url)
+	if(this.formData.status=='鏄�')
+	          this.formData.status = 1
+	        else
+	        this.formData.status = 0
+	
+      if(res==true){
+    	  updateEquipment(this.formData).then(response => {
+    		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+    		// this.open = false;
+    	  
+    	  });
       }
     },
     handleRemove(file) {
-      for(let i = 0; i < this.fileList.length; i++)
-      {
-        if(this.fileList[i].url==file.url)
-          this.$delete(this.fileList,i);
-      }
+      //鍒ゆ柇鏄惁鏄箣鍓嶇殑鍥剧墖
+        let res = false
+      //  alert(this.fileList.length)
+        for(let i = 0; i < this.fileList.length; i++)
+        {
+          if(this.fileList[i].url==file.url)
+      	{
+      		//鍘熸潵鍥惧儚鏍囪涓篺alse
+      		//alert(this.fileList[i].res)
+      	  if(this.fileList[i].res==false)
+      		res = true
+      	  else
+      	  {
+      		//  alert(this.uploadFileList.length)
+      		//  alert(87)
+      		 this.$delete(this.uploadFileList, Math.abs(i - this.uploadFileList.length-1))
+      		 	//	  alert(this.uploadFileList.length)
+      		 }
+            this.$delete(this.fileList,i);
+         
+        }
+        }
+        let ul = ""
+        this.fileList.map(function (elem){
+      	if(elem.res==false)
+      		ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+        })
+        let uls = ""
+        this.fileListOther.map(function (elem){
+          if(elem.res==false)
+      		elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+        })
+        this.formData.url = ul+","+uls;
+		if(this.formData.status=='鏄�')
+		          this.formData.status = 1
+		        else
+		        this.formData.status = 0
+		
+        if(res==true){
+      	  updateEquipment(this.formData).then(response => {
+      		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      	  });
+        }
+      
     },
     handleFileCardPreview(file){
       this.dialogFileUrl = file.url;
@@ -452,46 +552,135 @@
 
       this.$router.push("/familymodel/Device/memo/" + id );
     },
-    requestUpload(params)
-    {
-
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-      this.uploading = true;
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-        this.uploading = false;
-        this.$modal.msgSuccess("涓婁紶鎴愬姛");
-        if(_this.fot.includes(pth) === true)
-        {
-          _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)
-          updateEquipment(_this.formData).then(response => {
-            this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
-            // this.open = false;
-
-          });
-      })
-
-    }
-
+	
+	//鑷畾涔変笂浼犳柟娉�
+	    handleChange(file, fileList1) {
+	       //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+	
+	     // this.uploadFileList.push(file.raw);
+	      console.log("=========5555=========")
+		  this.uploadFileList.push(file.raw);
+		   this.fileList.push({name:file.name,url:file.url,res:true})
+	    },
+		//鑷畾涔変笂浼犳柟娉�
+		handleChange1(file, fileListOther1) {
+		       //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+		
+		     // this.uploadFileList.push(file.raw);
+			 this.uploadFileList1.push(file.raw);
+			  this.fileListOther.push({name:file.name,url:file.url,res:true})
+		      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();
+		//	alert(this.uploadFileList1.length)
+			// formData.append('uploadFile', file);
+			if(this.uploadFileList1.length==0){
+				  this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+				  return}
+			
+			this.uploadFileList1.forEach((elem)=>{
+				formData.append("files", elem)
+				
+			})
+			console.log(this.uploadFileList1)
+			let _this = this
+	
+			this.uploading = true;
+			uploadPic(formData).then(response => {
+			_this.uploadFileList1 = []
+			if(_this.formData.status=='鏄�')
+			          _this.formData.status = 1
+			        else
+			        _this.formData.status = 0
+			
+			  _this.formData.url = _this.formData.url+","+response.fileNames
+			    updateEquipment(_this.formData).then(response => {
+			      this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
+			      // this.open = false;
+			    });
+			  })
+	
+		},
+		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)
+				// 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)
+		//	alert(response.fileNames)
+	          _this.formData.url = _this.formData.url+","+response.fileNames
+			_this.uploadFileList = []
+	         // alert(87)
+			 if(_this.formData.status=='鏄�')
+			           _this.formData.status = 1
+			         else
+			         _this.formData.status = 0
+			 
+	          updateEquipment(_this.formData).then(response => {
+	            _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+	            // this.open = false;
+	
+	          });
+	        // }
+	        // 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)
+	    {
+		//	alert(123)
+	   // this.uploadFileList1.push(params.file);
+	  //  console.log("-----------")
+		//console.log(this.uploadFileList1)
+	    },
   }
 }
 
diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index 74b15b1..c08a8e6 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -269,6 +269,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}">
@@ -276,7 +279,7 @@
               class="el-upload-list__item-thumbnail"
               :src="file.url"
               alt=""
-              style="width: 126px; height: 126px"
+            style="width: 100%; height: 100%; object-fit: cover;"
               fit="cover"
               :preview-src-list="[file.url]"
             >
@@ -299,7 +302,15 @@
 
 
           </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=""
@@ -308,17 +319,63 @@
           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"
+		    :show-file-list="true"
         >
-          <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
-          <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+   
+   <i slot="default" class="el-icon-plus"></i>
+           <div slot="file" slot-scope="{file}">
+             <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
+             <video
+               v-if="file.url.includes('.mp4')"
+               class="el-upload-list__item-thumbnail"
+               :src="file.url"
+               style="width: 147px; height: 147px"
+               fit="cover"
+             ></video>
+             <img v-else
+                  class="el-upload-list__item-thumbnail"
+                  :src="file.url"
+                  alt=""
+                  style="width: 100%; height: 100%"
+                  fit="cover"></img>
+   
+             <span class="el-upload-list__item-actions">
+                  <span class="el-upload-list__item-name">{{ file.name }}</span>
+                       <span
+                         class="el-upload-list__item-preview"
+                         @click="handleFileCardPreview(file)"
+                       >
+                         <i class="el-icon-zoom-in"></i>
+                       </span>A
+                
+                       <span
+                 
+                         class="el-upload-list__item-delete"
+                         @click="handleRemoveFile(file)"
+                       >
+                         <i class="el-icon-delete"></i>
+                       </span>
+                 </span>
+   
+           </div>
           <template #tip>
             <div class="el-upload__tip">
             </div>
           </template>
         </el-upload>
-
+	 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+		          @click="fileUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
       </el-form>
       <h4 class="form-header"> </h4>
 
@@ -384,9 +441,10 @@
     
       fileList:[
       ],
-      fileListOther:[
-
-      ],
+		fileList1:[],
+   	  uploadFileList: [],
+   		uploadFileList1: [],
+	  fileListOther:[],
       dsb:true,
       btn:false,
       uploading: false,
@@ -398,7 +456,7 @@
         name:undefined,
         remark: undefined,
         familyId:undefined,
-        url: undefined,
+        url: "",
         status:undefined,
       },
       // 鑿滃崟鍒楄〃
@@ -454,7 +512,7 @@
         happenTime: [{
           required: true,
           message: '璇烽�夋嫨鏃ユ湡閫夋嫨',
-          trigger: 'change'
+          trigger: 'blur'
         }],
         content: [{
           required: true,
@@ -620,32 +678,45 @@
       for(let i = 0; i < this.fileList.length; i++)
       {
         if(this.fileList[i].url==file.url)
-          this.$delete(this.fileList,i);
+         {
+           this.$delete(this.fileList,i);
+         		 this.$delete(this.uploadFileList,i);
+         		 }
+         
       }
     },
     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.fileListOther,i);
+         this.$delete(this.uploadFileList1,i);
+         
+         }
       }
     },
     /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
     submitDataScope: function() {
 
-      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.url = ul+","+uls
       this.$refs["elForm"].validate(valid => {
         if (valid) {
 
           addEquipment(this.formDat).then(response => {
             this.$modal.msgSuccess("鏂板鎴愬姛");
             this.open = false;
+			// 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+			Object.keys(this.formDat).forEach(key => {
+			  this.formDat[key] = '';
+			});
+			for(let i = 0; i <= this.fileList.length; i++)
+			{
+			  this.handleRemove(this.fileList[0]);
+			}
+			for(let i = 0; i < this.fileListOther.length; i++){
+			  this.handleRemoveFile(this.fileListOther[0]);
+			}
             this.getList();
           });
         }
@@ -662,30 +733,88 @@
         this.handleRemoveFile(this.fileListOther[0]);
       }
     },
-    requestUpload(params)
-    {
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-      this.uploading = true;
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-        this.uploading = false;
-        this.$modal.msgSuccess("涓婁紶鎴愬姛");
-        if(_this.fot.includes(pth) === true)
-        {
-          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
-
-        }
-
-        else{
-          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
-        }
-      })
-
-    },
+	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.uploadFileList1.push(params.file);
+      },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const Ids = row.id || this.ids;
diff --git a/ruoyi-ui/src/views/doctor/doctorInfo.vue b/ruoyi-ui/src/views/doctor/doctorInfo.vue
index 8dad96d..5a8c636 100644
--- a/ruoyi-ui/src/views/doctor/doctorInfo.vue
+++ b/ruoyi-ui/src/views/doctor/doctorInfo.vue
@@ -89,10 +89,12 @@
         multiple
         :http-request="requestUpload"
         :file-list="fileList"
+		:on-change="handleChange"
+		:auto-upload="false"
         :disabled="!btn"
         :class="{ hide: !btn }"
       >
-        <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+        
         <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
         <div slot="file" slot-scope="{file}">
           <img
@@ -130,7 +132,13 @@
 
         </div>
       </el-upload>
-
+		 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+				  v-if="btn"
+		          @click="picUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
       <h4 class="form-header">鍏朵粬闄勪欢 </h4>
     <el-upload
             action=""
@@ -142,10 +150,14 @@
             :on-remove="handleRemoveFile"
             :http-request="requestUpload1"
             :show-file-list="true"
+			
+			
+			ref="upload1"
+			:on-change="handleChange1"
+			:auto-upload="false"
             :disabled="!btn"
             :class="{ hide: !btn }"
           >
-              <div v-if="uploading1" class="upload-status">姝ｅ湪涓婁紶...</div>
               <i v-if="!uploading1" slot="default" class="el-icon-plus"></i>
       <div slot="file" slot-scope="{file}">
         <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
@@ -191,7 +203,14 @@
 
 
           </el-upload>
-
+	 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+		          v-if="btn"
+		          @click="fileUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
+				      <h4 class="form-header"> </h4>
       <el-form-item size="large">
         <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
       </el-form-item>
@@ -222,7 +241,12 @@
         '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
       
       fileList:[],
-      fileListOther:[],
+      fileList1:[],
+      uploadFileList:[],
+      uploadFileList1:[],
+      fileListOther:[
+      
+      ],
       dsb:true,
       btn:false,
       isShow:true,
@@ -242,7 +266,7 @@
         effect:undefined,
         suitable:undefined,
         remark:undefined,
-        url: undefined,
+        url: "",
       },
       desurl:'',
       dialogImageUrl: '',
@@ -328,18 +352,28 @@
         for(let i = 0; i < paths.length; i++)
         {
           if(paths[i]!="") {
-
-            let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
-
-            if (_this.fot.includes(pth) === true)
-              _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
-            else {
-              // alert(paths[i])
-              let nms = paths[i].split("\/")
-              let nm = nms[nms.length - 1]
-              _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+          
+              let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+          //	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})
+          	  }
+              else {
+                // alert(paths[i])
+          	 // alert()
+                let nms = paths[i].split("\/")
+                let nm = nms[nms.length - 1]
+          	  if(paths[i][0]=="/")
+                _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+          		else
+          		_this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+          		
+          	}
             }
-          }
         }
         this.loading = false;
       });
@@ -384,13 +418,7 @@
 
     },
     submitForm() {
-      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
+    
 
       this.$refs['elForm'].validate(valid => {
 
@@ -426,42 +454,83 @@
       })
     },
     handleRemoveFile(file,) {
-      for(let i = 0; i < this.fileListOther.length; i++)
-      {
-        if(this.fileListOther[i].url==file.url)
-          this.$delete(this.fileListOther,i);
-        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 res = false
+        for(let i = 0; i < this.fileListOther.length; i++)
+        {
+          if(this.fileListOther[i].url==file.url)
+      	{
+      		if(this.fileListOther[i].res==false)
+      			res = true
+      		else
+      		{
+      			this.$delete(this.uploadFileList1, Math.abs(i - this.uploadFileList1.length-1))
+      		}
+            this.$delete(this.fileListOther,i);
+      
+      	}
+        }
+        
+        let ul = ""
+        this.fileList.map(function (elem){
+        		if(elem.res==false)
+        			ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+        })
+        let uls = ""
+        this.fileListOther.map(function (elem){
+          if(elem.res==false)
+        			uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+        })
         this.formData.url = ul+","+uls;
-        updateDoctor(this.formData).then(response => {
-          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-          // this.open = false;
-          // this.btn=false
-        });
-      }
+      //  alert(this.formData.url)
+        if(res==true){
+      	  updateDoctor(this.formData).then(response => {
+      		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      		// this.open = false;
+      	  
+      	  });
+        }
     },
     handleRemove(file) {
-      for(let i = 0; i < this.fileList.length; i++)
-      {
-        if(this.fileList[i].url==file.url)
-          this.$delete(this.fileList,i);
-        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 res = false
+      //  alert(this.fileList.length)
+        for(let i = 0; i < this.fileList.length; i++)
+        {
+          if(this.fileList[i].url==file.url)
+      	{
+      		//鍘熸潵鍥惧儚鏍囪涓篺alse
+      		//alert(this.fileList[i].res)
+      	  if(this.fileList[i].res==false)
+      		res = true
+      	  else
+      	  {
+      		//  alert(this.uploadFileList.length)
+      		//  alert(87)
+      		 this.$delete(this.uploadFileList, Math.abs(i - this.uploadFileList.length-1))
+      		 	//	  alert(this.uploadFileList.length)
+      		 }
+            this.$delete(this.fileList,i);
+         
+        }
+        }
+        let ul = ""
+        this.fileList.map(function (elem){
+      	if(elem.res==false)
+      		ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+        })
+        let uls = ""
+        this.fileListOther.map(function (elem){
+          if(elem.res==false)
+      		elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+        })
         this.formData.url = ul+","+uls;
-        updateDoctor(this.formData).then(response => {
-          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-          // this.open = false;
-          // this.btn=false
-        });
-      }
+        if(res==true){
+      	  updateDoctor(this.formData).then(response => {
+      		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      	  });
+        }
+      
     },
     handleFileCardPreview(file){
       this.dialogFileUrl = file.url;
@@ -496,75 +565,125 @@
       this.btn = true
       this.isShow=false
     },
-    requestUpload(params)
-    {
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-      this.uploading = true;
-
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-        this.uploading = false;
-        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)
-          updateDoctor(this.formData).then(response => {
-            this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
-            // this.open = false;
-            // this.btn=false
+    
+    //鑷畾涔変笂浼犳柟娉�
+        handleChange(file, fileList1) {
+           //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+    
+         // this.uploadFileList.push(file.raw);
+          console.log("=========5555=========")
+    	  this.uploadFileList.push(file.raw);
+    	   this.fileList.push({name:file.name,url:file.url,res:true})
+        },
+    	//鑷畾涔変笂浼犳柟娉�
+    	handleChange1(file, fileListOther1) {
+    	       //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+    	
+    	     // this.uploadFileList.push(file.raw);
+    		 this.uploadFileList1.push(file.raw);
+    		  this.fileListOther.push({name:file.name,url:file.url,res:true})
+    	      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();
+    	//	alert(this.uploadFileList1.length)
+    		// formData.append('uploadFile', file);
+    		if(this.uploadFileList1.length==0){
+    			  this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+    			  return}
+    		
+    		this.uploadFileList1.forEach((elem)=>{
+    			formData.append("files", elem)
+    			
+    		})
+    		console.log(this.uploadFileList1)
+    		let _this = this
+    
+    		this.uploading = true;
+    		uploadPic(formData).then(response => {
+    		_this.uploadFileList1 = []
+    		  _this.formData.url = _this.formData.url+","+response.fileNames
+    		    updateDoctor(_this.formData).then(response => {
+    		      this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
+    		      // this.open = false;
+    		    });
+    		  })
+    
+    	},
+    	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)
+    			// 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)
+    	//	alert(response.fileNames)
+              _this.formData.url = _this.formData.url+","+response.fileNames
+    		_this.uploadFileList = []
+             // alert(87)
+              updateDoctor(_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})
-
-        }
-      })
-    },
-    requestUpload1(params)
-    {
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-      this.uploading1 = true;
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-        this.uploading1 = false;
-        // this.$modal.msgSuccess("涓婁紶鎴愬姛");
-        if(_this.fot.includes(pth) === true)
+    	},
+         requestUpload(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)
-          updateDoctor(this.formData).then(response => {
-            this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
-            // this.open = false;
-            // this.btn=false
-          });
-        }
-      })
-    },
+       //  alert(124)
+    //	 this.uploadFileList.push(params.file);
+    
+         //alert(34)
+     
+    	
+        },
+        requestUpload1(params)
+        {
+    	//	alert(123)
+       // this.uploadFileList1.push(params.file);
+      //  console.log("-----------")
+    	//console.log(this.uploadFileList1)
+        },
 
   }
 }
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index 4222612..86932e5 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -248,7 +248,7 @@
           <el-input v-model="formDat.symptom" placeholder="璇疯緭鍏ョ棁鐘�" clearable :style="{width: '100%'}" ></el-input>
         </el-form-item>
         <el-form-item label="鎸佺画鏃堕棿" prop="duration">
-          <el-input v-model="formDat.duration" placeholder="璇疯緭鍏ユ寔缁椂闂�" clearable :style="{width: '100%'}" >
+          <el-input v-model="formDat.duration" placeholder="璇疯緭鍏ユ寔缁椂闂�" type="number" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
         <el-form-item label="涓尰澶勬柟" prop="cmedical">
@@ -278,8 +278,11 @@
           accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
           list-type="picture-card"
           multiple
-          :http-request="requestUpload"
-          :file-list="fileList"
+		  :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}">
@@ -313,6 +316,13 @@
 
           </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=""
@@ -323,15 +333,59 @@
           :on-remove="handleRemoveFile"
           :http-request="requestUpload1"
           :show-file-list="true"
+		  
+		  ref="upload1"
+		  :on-change="handleChange1"
+		  :auto-upload="false"
+		  list-type="picture-card"
         >
-          <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
-          <div v-if="uploading1" class="upload-status">姝ｅ湪涓婁紶...</div>
-          <template #tip>
-            <div class="el-upload__tip">
-            </div>
-          </template>
-        </el-upload>
+     
 
+<i slot="default" class="el-icon-plus"></i>
+        <div slot="file" slot-scope="{file}">
+          <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
+          <video
+            v-if="file.url.includes('.mp4')"
+            class="el-upload-list__item-thumbnail"
+            :src="file.url"
+            style="width: 147px; height: 147px"
+            fit="cover"
+          ></video>
+          <img v-else
+               class="el-upload-list__item-thumbnail"
+               :src="file.url"
+               alt=""
+               style="width: 100%; height: 100%"
+               fit="cover"></img>
+
+          <span class="el-upload-list__item-actions">
+               <span class="el-upload-list__item-name">{{ file.name }}</span>
+                    <span
+                      class="el-upload-list__item-preview"
+                      @click="handleFileCardPreview(file)"
+                    >
+                      <i class="el-icon-zoom-in"></i>
+                    </span>
+             
+                    <span
+              
+                      class="el-upload-list__item-delete"
+                      @click="handleRemoveFile(file)"
+                    >
+                      <i class="el-icon-delete"></i>
+                    </span>
+              </span>
+
+        </div>
+
+
+        </el-upload>
+ <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+		          @click="fileUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
       </el-form>
       <h4 class="form-header"> </h4>
 
@@ -398,6 +452,9 @@
       fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
         '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
       fileList:[],
+      fileList1:[],
+      	  uploadFileList: [],
+      		uploadFileList1: [],
       fileListOther:[],
       dsb:true,
       btn:false,
@@ -415,7 +472,7 @@
         effect:undefined,
         suitable:undefined,
         remark:undefined,
-        url: undefined,
+        url: "",
 
       },
       // 鑿滃崟鍒楄〃
@@ -581,14 +638,22 @@
       for(let i = 0; i < this.fileList.length; i++)
       {
         if(this.fileList[i].url==file.url)
+        {
           this.$delete(this.fileList,i);
+        		 this.$delete(this.uploadFileList,i);
+        		 }
       }
     },
     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);
+          
+          }
       }
     },
     // 鍙栨秷鎸夐挳
@@ -687,13 +752,7 @@
     /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
     submitDataScope: function() {
 
-      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.url = ul+","+uls
+    
       this.$refs["elForm"].validate(valid => {
         if (valid) {
 
@@ -716,40 +775,88 @@
         }
       });
     },
-    requestUpload(params)
-    {
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-      this.uploading = true;
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-        this.uploading = false;
-        this.$modal.msgSuccess("涓婁紶鎴愬姛");
-        if(_this.fot.includes(pth) === true)
-        {
-          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
-        }
-      })
-    },
-    requestUpload1(params)
-    {
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-      this.uploading1 = true;
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-        this.uploading1 = false;
-        this.$modal.msgSuccess("涓婁紶鎴愬姛");
-        if(_this.fot.includes(pth) !== true)
-        {
-          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-        }
-      })
-    },
+   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.uploadFileList1.push(params.file);
+       },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const Ids = row.id || this.ids;
diff --git a/ruoyi-ui/src/views/economy/economyInfo.vue b/ruoyi-ui/src/views/economy/economyInfo.vue
index c5ee8a4..dd1600a 100644
--- a/ruoyi-ui/src/views/economy/economyInfo.vue
+++ b/ruoyi-ui/src/views/economy/economyInfo.vue
@@ -59,17 +59,19 @@
         multiple
         :http-request="requestUpload"
         :file-list="fileList"
+		:on-change="handleChange"
+		:auto-upload="false"
         :disabled="!btn"
         :class="{ hide: !btn }"
       >
-        <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+
         <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
         <div slot="file" slot-scope="{file}">
           <img
             class="el-upload-list__item-thumbnail"
             :src="file.url"
             alt=""
-            style="width: 147px; height: 147px"
+            style="width: 100%; height: 100%"
             fit="cover"
             :preview-src-list="[file.url]"
           >
@@ -100,7 +102,13 @@
 
         </div>
       </el-upload>
-
+		 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+				  v-if="btn"
+		          @click="picUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
       <h4 class="form-header">鍏朵粬闄勪欢 </h4>
       <el-upload
         action=""
@@ -110,12 +118,15 @@
         list-type="picture-card"
         :on-preview="handleFileCardPreview"
         :on-remove="handleRemoveFile"
-        :http-request="requestUpload"
+        :http-request="requestUpload1"
+					  		ref="upload1"
         :show-file-list="true"
+		:on-change="handleChange1"
+				:auto-upload="false"
         :disabled="!btn"
         :class="{ hide: !btn }"
       >
-        <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+
         <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
         <div slot="file" slot-scope="{file}">
           <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
@@ -161,7 +172,14 @@
 
 
       </el-upload>
-
+ <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+		          v-if="btn"
+		          @click="fileUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
+				      <h4 class="form-header"> </h4>
       <el-form-item size="large">
         <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
       </el-form-item>
@@ -193,8 +211,11 @@
 
       fileList:[
       ],
+      fileList1:[],
+      uploadFileList:[],
+      uploadFileList1:[],
       fileListOther:[
-
+      
       ],
       dsb:true,
       btn:false,
@@ -207,7 +228,7 @@
         usePeople: undefined,
         kind:undefined,
         remark: undefined,
-        url: undefined,
+        url: "",
       },
       dialogImageUrl: '',
       dialogVisible: false,
@@ -300,18 +321,28 @@
         for(let i = 0; i < paths.length; i++)
         {
           if(paths[i]!="") {
-
-            let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
-
-            if (_this.fot.includes(pth) === true)
-              _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
-            else {
-              // alert(paths[i])
-              let nms = paths[i].split("\/")
-              let nm = nms[nms.length - 1]
-              _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+          
+              let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+          //	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})
+          	  }
+              else {
+                // alert(paths[i])
+          	 // alert()
+                let nms = paths[i].split("\/")
+                let nm = nms[nms.length - 1]
+          	  if(paths[i][0]=="/")
+                _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+          		else
+          		_this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+          		
+          	}
             }
-          }
         }
         this.loading = false;
       });
@@ -330,13 +361,7 @@
     },
 
     submitForm() {
-      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
+
 
       this.$refs['elForm'].validate(valid => {
 
@@ -372,18 +397,83 @@
       })
     },
     handleRemoveFile(file) {
-      for(let i = 0; i < this.fileListOther.length; i++)
-      {
-        if(this.fileListOther[i].url==file.url)
-          this.$delete(this.fileListOther,i);
-      }
+      //鍒よ鏄惁鏄箣鍓嶇殑鍥剧墖
+        let res = false
+        for(let i = 0; i < this.fileListOther.length; i++)
+        {
+          if(this.fileListOther[i].url==file.url)
+      	{
+      		if(this.fileListOther[i].res==false)
+      			res = true
+      		else
+      		{
+      			this.$delete(this.uploadFileList1, Math.abs(i - this.uploadFileList1.length-1))
+      		}
+            this.$delete(this.fileListOther,i);
+      
+      	}
+        }
+        
+        let ul = ""
+        this.fileList.map(function (elem){
+        		if(elem.res==false)
+        			ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+        })
+        let uls = ""
+        this.fileListOther.map(function (elem){
+          if(elem.res==false)
+        			uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+        })
+        this.formData.url = ul+","+uls;
+      //  alert(this.formData.url)
+        if(res==true){
+      	  updateEconomy(this.formData).then(response => {
+      		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      		// this.open = false;
+      	  
+      	  });
+        }
     },
     handleRemove(file) {
-      for(let i = 0; i < this.fileList.length; i++)
-      {
-        if(this.fileList[i].url==file.url)
-          this.$delete(this.fileList,i);
-      }
+     //鍒ゆ柇鏄惁鏄箣鍓嶇殑鍥剧墖
+       let res = false
+     //  alert(this.fileList.length)
+       for(let i = 0; i < this.fileList.length; i++)
+       {
+         if(this.fileList[i].url==file.url)
+     	{
+     		//鍘熸潵鍥惧儚鏍囪涓篺alse
+     		//alert(this.fileList[i].res)
+     	  if(this.fileList[i].res==false)
+     		res = true
+     	  else
+     	  {
+     		//  alert(this.uploadFileList.length)
+     		//  alert(87)
+     		 this.$delete(this.uploadFileList, Math.abs(i - this.uploadFileList.length-1))
+     		 	//	  alert(this.uploadFileList.length)
+     		 }
+           this.$delete(this.fileList,i);
+        
+       }
+       }
+       let ul = ""
+       this.fileList.map(function (elem){
+     	if(elem.res==false)
+     		ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+       })
+       let uls = ""
+       this.fileListOther.map(function (elem){
+         if(elem.res==false)
+     		elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+       })
+       this.formData.url = ul+","+uls;
+       if(res==true){
+     	  updateEconomy(this.formData).then(response => {
+     		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+     	  });
+       }
+     
     },
     handleFileCardPreview(file){
       this.dialogFileUrl = file.url;
@@ -421,44 +511,125 @@
       this.btn = true
       this.isShow=false
     },
-    requestUpload(params)
-    {
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-      this.uploading = true;
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-        this.uploading = false;
-        this.$modal.msgSuccess("涓婁紶鎴愬姛");
-        if(_this.fot.includes(pth) === true)
-        {
-          _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)
-          updateEconomy(_this.formData).then(response => {
-            this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
-            // this.open = false;
-
-          });
-      })
-
-    },
+   
+   //鑷畾涔変笂浼犳柟娉�
+       handleChange(file, fileList1) {
+          //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+   
+        // this.uploadFileList.push(file.raw);
+         console.log("=========5555=========")
+   	  this.uploadFileList.push(file.raw);
+   	   this.fileList.push({name:file.name,url:file.url,res:true})
+       },
+   	//鑷畾涔変笂浼犳柟娉�
+   	handleChange1(file, fileListOther1) {
+   	       //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+   	
+   	     // this.uploadFileList.push(file.raw);
+   		 this.uploadFileList1.push(file.raw);
+   		  this.fileListOther.push({name:file.name,url:file.url,res:true})
+   	      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();
+   	//	alert(this.uploadFileList1.length)
+   		// formData.append('uploadFile', file);
+   		if(this.uploadFileList1.length==0){
+   			  this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+   			  return}
+   		
+   		this.uploadFileList1.forEach((elem)=>{
+   			formData.append("files", elem)
+   			
+   		})
+   		console.log(this.uploadFileList1)
+   		let _this = this
+   
+   		this.uploading = true;
+   		uploadPic(formData).then(response => {
+   		_this.uploadFileList1 = []
+   		  _this.formData.url = _this.formData.url+","+response.fileNames
+   		    updateEconomy(_this.formData).then(response => {
+   		      this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
+   		      // this.open = false;
+   		    });
+   		  })
+   
+   	},
+   	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)
+   			// 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)
+   	//	alert(response.fileNames)
+             _this.formData.url = _this.formData.url+","+response.fileNames
+   		_this.uploadFileList = []
+            // alert(87)
+             updateEconomy(_this.formData).then(response => {
+               _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+               // this.open = false;
+   
+             });
+           // }
+           // 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)
+       {
+   	//	alert(123)
+      // this.uploadFileList1.push(params.file);
+     //  console.log("-----------")
+   	//console.log(this.uploadFileList1)
+       },
 
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index e21230a..d0f7635 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -240,6 +240,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}">
@@ -271,6 +274,13 @@
 
           </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=""
@@ -279,17 +289,60 @@
           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>
-          <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
-          <template #tip>
-            <div class="el-upload__tip">
-            </div>
-          </template>
+        
+        <i slot="default" class="el-icon-plus"></i>
+                <div slot="file" slot-scope="{file}">
+                  <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
+                  <video
+                    v-if="file.url.includes('.mp4')"
+                    class="el-upload-list__item-thumbnail"
+                    :src="file.url"
+                    style="width: 147px; height: 147px"
+                    fit="cover"
+                  ></video>
+                  <img v-else
+                       class="el-upload-list__item-thumbnail"
+                       :src="file.url"
+                       alt=""
+                       style="width: 100%; height: 100%"
+                       fit="cover"></img>
+        
+                  <span class="el-upload-list__item-actions">
+                       <span class="el-upload-list__item-name">{{ file.name }}</span>
+                            <span
+                              class="el-upload-list__item-preview"
+                              @click="handleFileCardPreview(file)"
+                            >
+                              <i class="el-icon-zoom-in"></i>
+                            </span>A
+                     
+                            <span
+                      
+                              class="el-upload-list__item-delete"
+                              @click="handleRemoveFile(file)"
+                            >
+                              <i class="el-icon-delete"></i>
+                            </span>
+                      </span>
+        
+                </div>
+        
+ 
         </el-upload>
-
+	 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+		          @click="fileUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
       </el-form>
       <h4 class="form-header"> </h4>
 
@@ -356,9 +409,10 @@
 
       fileList:[
       ],
-      fileListOther:[
-
-      ],
+	  fileList1:[],
+ 	  uploadFileList: [],
+ 	  uploadFileList1: [],
+	  fileListOther:[],
       dsb:true,
       btn:false,
       uploading: false,
@@ -369,7 +423,7 @@
         usePeople: undefined,
         kind:undefined,
         remark: undefined,
-        url: undefined,
+        url: "",
       },
       // 鑿滃崟鍒楄〃
       menuOptions: [],
@@ -517,14 +571,22 @@
       for(let i = 0; i < this.fileList.length; i++)
       {
         if(this.fileList[i].url==file.url)
+        {
           this.$delete(this.fileList,i);
+        		 this.$delete(this.uploadFileList,i);
+        		 }
       }
     },
     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);
+          
+          }
       }
     },
     getCateInfor()
@@ -624,13 +686,7 @@
     /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
     submitDataScope: function() {
 
-      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.url = ul+","+uls
+    
       this.$refs["elForm"].validate(valid => {
         if (valid) {
 
@@ -653,29 +709,87 @@
         this.handleRemoveFile(this.fileListOther[0]);
       }
     },
-    requestUpload(params)
+	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)
     {
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-      this.uploading = true;
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-        this.uploading = false;
-        this.$modal.msgSuccess("涓婁紶鎴愬姛");
-        if(_this.fot.includes(pth) === true)
-        {
-          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
-
-        }
-
-        else{
-          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
-        }
-      })
-
+		//     this.uploadFileList1.push(params.file);
     },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index 730314f..82de811 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -267,6 +267,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}">
@@ -298,6 +301,13 @@
 
           </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=""
@@ -306,17 +316,24 @@
           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>
-          <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
           <template #tip>
             <div class="el-upload__tip">
             </div>
           </template>
         </el-upload>
-
+	 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+		          @click="fileUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
       </el-form>
       <h4 class="form-header"> </h4>
 
@@ -385,9 +402,10 @@
 
       fileList:[
       ],
-      fileListOther:[
-
-      ],
+      fileList1:[],
+      uploadFileList: [],
+      uploadFileList1: [],
+      fileListOther:[],
       dsb:true,
       uploading: false,
       formDat: {
@@ -398,7 +416,7 @@
         address: undefined,
         remark: undefined,
         happenTime:undefined,
-        url: undefined,
+        url: "",
 
       },
       // 鑿滃崟鍒楄〃
@@ -455,7 +473,7 @@
         happenTime: [{
           required: true,
           message: '璇烽�夋嫨鏃ユ湡閫夋嫨',
-          trigger: 'change'
+          trigger: 'blur'
         }],
       },
       typeOptions: [],
@@ -531,14 +549,22 @@
       for(let i = 0; i < this.fileList.length; i++)
       {
         if(this.fileList[i].url==file.url)
+        {
           this.$delete(this.fileList,i);
+        		 this.$delete(this.uploadFileList,i);
+        		 }
       }
     },
     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);
+          
+          }
       }
     },
     // 鍙栨秷鎸夐挳
@@ -625,13 +651,7 @@
     /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
     submitDataScope: function() {
 
-      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.url = ul+","+uls
+ 
       this.$refs["elForm"].validate(valid => {
         if (valid) {
 
@@ -654,30 +674,88 @@
         this.handleRemoveFile(this.fileListOther[0]);
       }
     },
-    requestUpload(params)
-    {
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-      this.uploading = true;
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-        this.uploading = false;
-        this.$modal.msgSuccess("涓婁紶鎴愬姛");
-        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})
-
-        }
-      })
-
-    },
+    		//     this.uploadFileList1.push(params.file);
+        },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
 		//alert(23)
diff --git a/ruoyi-ui/src/views/note/propertyInfo.vue b/ruoyi-ui/src/views/note/propertyInfo.vue
index be926bb..7ca4bda 100644
--- a/ruoyi-ui/src/views/note/propertyInfo.vue
+++ b/ruoyi-ui/src/views/note/propertyInfo.vue
@@ -61,10 +61,13 @@
         multiple
         :http-request="requestUpload"
         :file-list="fileList"
+		:on-change="handleChange"
+		ref="upload"
+		:auto-upload="false"
         :disabled="!btn"
         :class="{hide:!btn}"
       >
-        <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+   
         <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
         <div slot="file" slot-scope="{file}">
           <img
@@ -102,7 +105,13 @@
 
         </div>
       </el-upload>
-
+	 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+				  v-if="btn"
+		          @click="picUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
       <h4 class="form-header">鍏朵粬闄勪欢 </h4>
       <el-upload
         action=""
@@ -112,13 +121,16 @@
         list-type="picture-card"
         :on-preview="handleFileCardPreview"
         :on-remove="handleRemoveFile"
-        :http-request="requestUpload"
+        :http-request="requestUpload1"
+
+        :on-change="handleChange1"
+        		:auto-upload="false"
   :disabled="!btn"
         :class="{hide:!btn}"
 
 
       >
-        <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+   
         <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
         <div slot="file" slot-scope="{file}">
           <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
@@ -162,7 +174,14 @@
 
         </div>
       </el-upload>
-
+	 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+		          v-if="btn"
+		          @click="fileUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
+				      <h4 class="form-header"> </h4>
       <el-form-item size="large">
         <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
       </el-form-item>
@@ -193,9 +212,12 @@
 
       fileList:[
       ],
-      fileListOther:[
-
-      ],
+     fileList1:[],
+     uploadFileList:[],
+     uploadFileList1:[],
+     fileListOther:[
+     
+     ],
       dsb:true,
       btn:false,
       isShow:true,
@@ -208,7 +230,7 @@
         holder: undefined,
         address: undefined,
         remark: undefined,
-        url: undefined,
+        url: "",
       },
       desurl:'',
       dialogImageUrl: '',
@@ -219,7 +241,7 @@
         type: [{
           required: true,
           message: '璇烽�夋嫨绫诲埆',
-          trigger: 'change'
+          trigger: 'blur'
         }],
         title: [{
           required: true,
@@ -277,20 +299,30 @@
         let paths = response.data.url.split(",");
         for(let i = 0; i < paths.length; i++)
         {
-          if(paths[i]!="") {
-
-            let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
-
-            if (_this.fot.includes(pth) === true)
-              _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
-            else {
-              // alert(paths[i])
-              let nms = paths[i].split("\/")
-              let nm = nms[nms.length - 1]
-              _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
-            }
-          }
+         if(paths[i]!="") {
+         
+             let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+         //	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})
+         	  }
+             else {
+               // alert(paths[i])
+         	 // alert()
+               let nms = paths[i].split("\/")
+               let nm = nms[nms.length - 1]
+         	  if(paths[i][0]=="/")
+               _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+         		else
+         		_this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+         		
+         	}
         }
+		}
         this.loading = false;
       });
       this.getCateInfor()
@@ -313,13 +345,7 @@
       })
     },
     submitForm() {
-      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
+
 
       this.$refs['elForm'].validate(valid => {
 
@@ -368,18 +394,83 @@
       })
     },
     handleRemoveFile(file) {
+    //鍒よ鏄惁鏄箣鍓嶇殑鍥剧墖
+      let res = false
       for(let i = 0; i < this.fileListOther.length; i++)
       {
         if(this.fileListOther[i].url==file.url)
+    	{
+    		if(this.fileListOther[i].res==false)
+    			res = true
+    		else
+    		{
+    			this.$delete(this.uploadFileList1, Math.abs(i - this.uploadFileList1.length-1))
+    		}
           this.$delete(this.fileListOther,i);
+    
+    	}
+      }
+      
+      let ul = ""
+      this.fileList.map(function (elem){
+      		if(elem.res==false)
+      			ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+      })
+      let uls = ""
+      this.fileListOther.map(function (elem){
+        if(elem.res==false)
+      			uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+      })
+      this.formData.url = ul+","+uls;
+    //  alert(this.formData.url)
+      if(res==true){
+    	  updateProperty(this.formData).then(response => {
+    		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+    		// this.open = false;
+    	  
+    	  });
       }
     },
     handleRemove(file) {
-      for(let i = 0; i < this.fileList.length; i++)
-      {
-        if(this.fileList[i].url==file.url)
-          this.$delete(this.fileList,i);
-      }
+      //鍒ゆ柇鏄惁鏄箣鍓嶇殑鍥剧墖
+        let res = false
+      //  alert(this.fileList.length)
+        for(let i = 0; i < this.fileList.length; i++)
+        {
+          if(this.fileList[i].url==file.url)
+      	{
+      		//鍘熸潵鍥惧儚鏍囪涓篺alse
+      		//alert(this.fileList[i].res)
+      	  if(this.fileList[i].res==false)
+      		res = true
+      	  else
+      	  {
+      		//  alert(this.uploadFileList.length)
+      		//  alert(87)
+      		 this.$delete(this.uploadFileList, Math.abs(i - this.uploadFileList.length-1))
+      		 	//	  alert(this.uploadFileList.length)
+      		 }
+            this.$delete(this.fileList,i);
+         
+        }
+        }
+        let ul = ""
+        this.fileList.map(function (elem){
+      	if(elem.res==false)
+      		ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+        })
+        let uls = ""
+        this.fileListOther.map(function (elem){
+          if(elem.res==false)
+      		elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+        })
+        this.formData.url = ul+","+uls;
+        if(res==true){
+      	  updateProperty(this.formData).then(response => {
+      		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      	  });
+        }
+      
     },
     handlePictureCardPreview(file) {
       this.dialogImageUrl = file.url;
@@ -411,41 +502,125 @@
       // const fid =2031
       this.$router.push("/familymodel/property/memo/" + id );
     },
-    requestUpload(params)
-    {
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-      this.uploading = true;
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-        this.uploading = false;
-        this.$modal.msgSuccess("涓婁紶鎴愬姛");
-        if(_this.fot.indexOf(pth) !== -1)
-        {
-          _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)
-        updateProperty(_this.formData).then(response => {
-          this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
-          // this.open = false;
-
-        });
-      })
-
-    }
+	
+	//鑷畾涔変笂浼犳柟娉�
+	    handleChange(file, fileList1) {
+	       //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+	
+	     // this.uploadFileList.push(file.raw);
+	      console.log("=========5555=========")
+		  this.uploadFileList.push(file.raw);
+		   this.fileList.push({name:file.name,url:file.url,res:true})
+	    },
+		//鑷畾涔変笂浼犳柟娉�
+		handleChange1(file, fileListOther1) {
+		       //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+		
+		     // this.uploadFileList.push(file.raw);
+			 this.uploadFileList1.push(file.raw);
+			  this.fileListOther.push({name:file.name,url:file.url,res:true})
+		      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();
+		//	alert(this.uploadFileList1.length)
+			// formData.append('uploadFile', file);
+			if(this.uploadFileList1.length==0){
+				  this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+				  return}
+			
+			this.uploadFileList1.forEach((elem)=>{
+				formData.append("files", elem)
+				
+			})
+			console.log(this.uploadFileList1)
+			let _this = this
+	
+			this.uploading = true;
+			uploadPic(formData).then(response => {
+			_this.uploadFileList1 = []
+			  _this.formData.url = _this.formData.url+","+response.fileNames
+			    updateProperty(_this.formData).then(response => {
+			      this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
+			      // this.open = false;
+			    });
+			  })
+	
+		},
+		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)
+				// 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)
+		//	alert(response.fileNames)
+	          _this.formData.url = _this.formData.url+","+response.fileNames
+			_this.uploadFileList = []
+	         // alert(87)
+	          updateProperty(_this.formData).then(response => {
+	            _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+	            // this.open = false;
+	
+	          });
+	        // }
+	        // 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)
+	    {
+		//	alert(123)
+	   // this.uploadFileList1.push(params.file);
+	  //  console.log("-----------")
+		//console.log(this.uploadFileList1)
+	    },
 
   }
 }
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index 33687b0..2fdc27e 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -108,8 +108,8 @@
               <el-table-column label="浣忓璐�" prop="stay" sortable width="100px" />
               <el-table-column label="浜ら��" prop="travel" sortable width="70px" />
               <el-table-column label="闂ㄧエ" prop="entrance" sortable width="70px" />
-             <el-table-column label="鍏跺畠璐圭敤" prop="entrance" sortable width="120px" />
-			 <el-table-column label="澶囨敞" prop="entrance" sortable width="120px" />
+             <el-table-column label="鍏跺畠璐圭敤" prop="otherCost" sortable width="120px" />
+			 <el-table-column label="澶囨敞" prop="backInfo" sortable width="120px" />
 			 
               <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" >
                 <template slot-scope="scope" >
@@ -172,7 +172,7 @@
       <el-table-column label="鏃呮父鍚嶇О" prop="name" sortable width="200px" />
       <el-table-column label="鍘诲悜" prop="destination" sortable width="150px" />
       <el-table-column label="鏃呮父鎬ц川" prop="property" sortable width="100" />
-	       <el-table-column label="鎰熻█" prop="groupTotal" sortable width="120px" />
+	       <el-table-column label="鎰熻█" prop="spee" sortable width="120px" />
       <el-table-column label="鏃呮父鏂瑰紡" prop="manner" sortable width="100" />
       <el-table-column label="鎬婚噾棰�" prop="totalPrice" sortable width="100" />
       <el-table-column label="椁愯垂" prop="eatTotal" sortable width="70px" />
@@ -308,7 +308,10 @@
           <el-input  v-model="formDat4.manner" placeholder="璇疯緭鍏ユ梾娓告柟寮�" style="width: 80%;"></el-input>
 
         </el-form-item>
+        <el-form-item label="鎰熻█" prop="spee">
+          <textarea type="textarea" v-model="formDat4.spee" placeholder="璇疯緭鍏ユ梾娓告劅瑷�" style="width: 80%;"></textarea>
 
+        </el-form-item>
       </el-form>
       <h4 class="form-header"> </h4>
 
@@ -339,8 +342,8 @@
           <el-input v-model="formDat.travelMode" placeholder="璇疯緭鍏ュ嚭琛屾柟寮�" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
-        <el-form-item label="鎸佽瘉鏃呮父" prop="certificate">
-          <el-select v-model="formDat.certificate" placeholder="璇烽�夋嫨璇佷欢" clearable :style="{width: '80%'}" >
+        <el-form-item label="鎸佽瘉鏃呮父" prop="document">
+          <el-select v-model="formDat.document" placeholder="璇烽�夋嫨璇佷欢" clearable :style="{width: '80%'}" >
             <el-option label="灞呮皯韬唤璇�" value="灞呮皯韬唤璇�"></el-option>
             <el-option label="涓存椂韬唤璇�" value="涓存椂韬唤璇�"></el-option>
             <el-option label="鎴峰彛鏈�" value="鎴峰彛鏈�"></el-option>
@@ -352,6 +355,12 @@
         <el-form-item label="杞︽/鑸彮" prop="flight">
           <el-input v-model="formDat.flight" placeholder="璇疯緭鍏ヨ溅娆�/鑸彮" clearable :style="{width: '100%'}" ></el-input>
         </el-form-item>
+		<el-form-item label="鍏跺畠璐圭敤" prop="otherCost">
+		  <el-input v-model="formDat.otherCost" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
+		</el-form-item>
+		<el-form-item label="澶囨敞" prop="backInfo">
+		  <el-input v-model="formDat.backInfo" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
+		</el-form-item>
 <!--        <el-form-item label="澶囨敞" prop="remark">-->
 <!--          <el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>-->
 <!--        </el-form-item>-->
@@ -529,12 +538,14 @@
         happenTime: undefined,
         title: undefined,
         travelPeriod:undefined,
-        certificate: undefined,
+        document: undefined,
         totalPrice: undefined,
         self: undefined,
         remark: undefined,
         groupTotal:undefined,
         url: undefined,
+		otherCost: undefined,
+		backInfo: undefined
       },
       formDat1: {
         eat: undefined,
@@ -559,6 +570,7 @@
         property:undefined,
         name: undefined,
         destination: undefined,
+		spee: undefined
       },
       // 鑿滃崟鍒楄〃
       menuOptions: [],
@@ -758,7 +770,7 @@
 
       listTravelPrice(this.queryParams).then(response => {
         this.travelpriceList = response.data.data;
-
+		console.log(this.travelpriceList)
         this.total = response.data.total;
         this.loading = false;
 
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index f75dbad..4bb1e04 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -35,8 +35,8 @@
     proxy: {
       // detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-       target: `https://192.168.1.3:8080/`,
-       //target: 'https://www.bendudu.com:8080/',
+      // target: `https://192.168.1.3:8080/`,
+       target: 'https://www.bendudu.com:8080/',
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''

--
Gitblit v1.9.1