From f9196b257aff465909b77f7cacb0d4e9d962c4f7 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 18 五月 2024 16:16:31 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

---
 ruoyi-ui/src/views/clean/index.vue |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index 05d0701..b579620 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -257,7 +257,7 @@
 			:on-change="handleChange"
 			:auto-upload="false"
 			ref="upload"
-	
+
           >
             <i slot="default" class="el-icon-plus"></i>
             <div slot="file" slot-scope="{ file }">
@@ -292,7 +292,7 @@
 		           style="margin-left: 10px"
 		           size="small"
 		           type="success"
-		  
+
 		           @click="picUpload"
 		         >涓婁紶鍒版湇鍔″櫒</el-button>
           <h4 class="form-header">鍏朵粬闄勪欢 </h4>
@@ -309,7 +309,7 @@
             :http-request="requestUpload1"
             :show-file-list="true"
           >
-<!-- 
+<!--
             <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
             <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div> -->
             <template #tip>
@@ -386,7 +386,7 @@
         // 鏁版嵁鑼冨洿閫夐」
       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:[],
@@ -551,7 +551,7 @@
              this.$delete(this.fileList,i);
            		 this.$delete(this.uploadFileList,i);
            		 }
-           
+
         }
       },
 
@@ -586,7 +586,7 @@
             deptCheckStrictly: true,
             remark: undefined
           };
-        this.resetForm("form");
+        this.resetForm("elForm");
       },
       /** 鎼滅储鎸夐挳鎿嶄綔 */
       handleQuery() {
@@ -641,10 +641,10 @@
         {
           if(this.fileListOther[i].url==file.url)
           {
-            
+
             this.$delete(this.fileListOther,i);
             this.$delete(this.uploadFileList1,i);
-            
+
             }
         }
       },
@@ -677,7 +677,7 @@
       },
     handleChange(file, fileList1) {
        //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-    
+
      // this.uploadFileList.push(file.raw);
       console.log("=========5555=========")
 	  this.uploadFileList.push(file.raw);
@@ -689,7 +689,7 @@
     },
     handleChange1(file, fileOtherList1) {
        //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-    
+
      // this.uploadFileList.push(file.raw);
       console.log("=========5555=========")
 	  this.uploadFileList1.push(file.raw);
@@ -700,7 +700,7 @@
     },
     fileUpload(){
     //	var file = params.file;
-    
+
     	var formData = new FormData();
     	//this.$refs.upload1.submit();
     	// formData.append('uploadFile', file);
@@ -710,18 +710,18 @@
     	}
     	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()
     {
@@ -736,7 +736,7 @@
     //console.log(this.uploadFileList)
     	this.uploadFileList.forEach((elem)=>{
     		formData.append("files", elem)
-    		
+
     	})
     	//alert(90)
     	let _this = this
@@ -747,11 +747,11 @@
 		  //alert( _this.formDat.url)
     	  _this.uploadFileList = []
     	  _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
-    
+
       });
     },
     requestUpload(params) {
-    
+
    //  this.uploadFileList.push(params.file);
     },
     requestUpload1(params)

--
Gitblit v1.9.1