From 79d870e1d8c88c01fa5075e3fb30ad9f0b6f37f7 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期四, 25 四月 2024 15:15:17 +0800
Subject: [PATCH] 修改完254、258、259、260、261错误

---
 ruoyi-ui/src/views/clean/cleanInfo.vue |  544 +++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 435 insertions(+), 109 deletions(-)

diff --git a/ruoyi-ui/src/views/clean/cleanInfo.vue b/ruoyi-ui/src/views/clean/cleanInfo.vue
index 87e3171..643c656 100644
--- a/ruoyi-ui/src/views/clean/cleanInfo.vue
+++ b/ruoyi-ui/src/views/clean/cleanInfo.vue
@@ -13,12 +13,19 @@
     </div>
 
     <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="120px">
-      <!-- <el-form-item label="搴忓彿" prop="id">
-        <el-input v-model="formData.id" placeholder="璇疯緭鍏d" :maxlength="11" show-word-limit :disabled="true"
-          clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>
-      </el-form-item> -->
       <el-form-item label="绫诲瀷" prop="kind">
-        <el-select v-model="formData.kind=== 1 ? '鏀剁撼':'淇濇磥'" placeholder="璇烽�夋嫨淇濇磥/鏀剁撼" clearable :style="{width: '100%'}" :disabled="dsb" >
+        <!-- <template v-if="dsb">
+          <el-input v-model="formData.kind === 1 ? '鏀剁撼':'淇濇磥'" :disabled="true"></el-input>
+        </template>
+        <template v-else>
+          <el-select v-model="formData.kind" placeholder="璇烽�夋嫨淇濇磥/鏀剁撼" clearable :style="{width: '100%'}">
+            <el-option label="淇濇磥" value='0'></el-option>
+            <el-option label="鏀剁撼" value='1'></el-option>
+          </el-select>
+        </template> -->
+        <el-select v-model="formData.kind" placeholder="璇烽�夋嫨淇濇磥/鏀剁撼 " clearable :style="{width: '100%'}" :disabled="dsb"  >
+          <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
+          ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="绫诲埆" prop="type">
@@ -41,134 +48,164 @@
         </el-input>
       </el-form-item>
       <el-form-item label="鏃堕棿" prop="happenTime">
-        <el-input v-model="formData.happenTime" placeholder="璇疯緭鍏ユ椂闂�" type="date" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+        <el-date-picker v-model="formData.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+                        :editable="false" :clearable="false" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd"
+        ></el-date-picker>
       </el-form-item>
       <el-form-item label="澶囨敞" prop="remark">
         <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
       </el-form-item>
-      <el-form-item label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData">
-        <el-input  v-model="formData.ownData=== 1 ? '鏄�':'鍚�'" placeholder=" " clearable :style="{width: '100%'}" :disabled=true></el-input>
-      </el-form-item>
-
 
       <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
       <el-upload
         action="#"
         list-type="picture-card"
         multiple
+
         :http-request="requestUpload"
         :file-list="fileList"
+		      :on-change="handleChange"
         :disabled="!btn"
         :class="{ hide: !btn }"
+
+	  :auto-upload="false"
+	ref="upload"
       >
-        <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div>
-        <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
+        <div v-if="uploading1" class="upload-status">姝e湪涓婁紶...</div>
+        <i v-if="!uploading1" 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: 147px; height: 147px; object-fit: cover;"
             fit="cover"
             :preview-src-list="[file.url]"
           >
           <span class="el-upload-list__item-actions">
-          <span
-            class="el-upload-list__item-preview"
-            @click="handlePictureCardPreview(file)"
-          >
-            <i class="el-icon-zoom-in"></i>
-          </span>
-          <span
+        <span
 
-            class="el-upload-list__item-delete"
-            @click="handleDownload(file.url)"
-          >
-            <i class="el-icon-download"></i>
-          </span>
-          <span
-            v-if="isShow"
-            class="el-upload-list__item-delete"
-            @click="handleRemove(file)"
-          >
-            <i class="el-icon-delete"></i>
-          </span>
+          class="el-upload-list__item-preview"
+          @click="handlePictureCardPreview(file)"
+        >
+<!--          <i class="el-icon-zoom-in"></i>-->
+          <i  class="el-icon-zoom-in"></i>
         </span>
+        <span
+
+          class="el-upload-list__item-delete"
+          @click="handleDownload(file.url)"
+        >
+          <i class="el-icon-download"></i>
+        </span>
+        <span
+          v-if="isShow"
+          class="el-upload-list__item-delete"
+          @click="handleRemove(file)"
+        >
+          <i class="el-icon-delete"></i>
+        </span>
+      </span>
 
 
         </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="requestUpload"
+        :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">姝e湪涓婁紶...</div>
         <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
         <div slot="file" slot-scope="{file}">
-          <img
+          <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
+          <video
+            v-if="file.url.includes('.mp4')"
             class="el-upload-list__item-thumbnail"
-            src="../../assets/401_images/401.gif"
-            alt=""
+            :src="file.url"
             style="width: 147px; height: 147px"
             fit="cover"
-          >
+          ></video>
+          <img v-else
+               class="el-upload-list__item-thumbnail"
+               src="../../assets/401_images/401.gif"
+               alt=""
+               style="width: 147px; height: 147px"
+               fit="cover">
+
           <span class="el-upload-list__item-actions">
-                <span
+               <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-preview"
-                  @click="handleFileCardPreview(file)"
-                >
-                  <i class="el-icon-zoom-in"></i>
-                </span>
-                <span
-
-                  class="el-upload-list__item-delete"
-                  @click="handleDownload(file.url)"
-                >
+                      class="el-upload-list__item-delete"
+                      @click="handleDownload(file.url)"
+                    >
                  <i class="el-icon-download"></i>
                  </span>
-                <span
-                  v-if="isShow"
-                  class="el-upload-list__item-delete"
-                  @click="handleRemoveFile(file)"
-                >
-                  <i class="el-icon-delete"></i>
-                </span>
+                    <span
+                      v-if="isShow"
+                      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"
+		          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>
     </el-form>
 
     <el-dialog  :visible.sync="dialogVisible">
-      <img w-full :src="dialogImageUrl" style="width: 700px; height: 700px" alt="Preview Image" />
+      <img w-full :src="dialogImageUrl" style="width: 100%; height: 100%" alt="Preview Image" />
     </el-dialog>
   </div>
 </template>
 <script>
-import {getCLeanInfo,  uploadPic, download} from "@/api/clean/index";
+import {getCLeanInfo, updateClean, uploadPic, download} from "@/api/clean/index";
 import {addRole, updateRole} from "@/api/system/role";
 import {blobValidate} from "@/utils/ruoyi";
 import errorCode from "@/utils/errorCode";
 import {Message} from "element-ui";
+
 
 export default {
   components: {},
@@ -177,16 +214,25 @@
     return {
       cdi:"璧勪骇璇︾粏淇℃伅",
       udi:"璧勪骇淇℃伅淇敼",
-      fot:[".jpg",".jif"],
+     // 鏁版嵁鑼冨洿閫夐」
+     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:[
       ],
+      fileListOther1:[],
       dsb:true,
       btn:false,
       isShow:true,
       uploading: false,
+      uploading1: false,
       formData: {
         type: undefined,
         kind: undefined,
@@ -239,11 +285,11 @@
 
       },
       typeOptions: [{
-        value: '0',
+        value: '淇濇磥',
         label: '淇濇磥',
       },
         {
-          value: '1',
+          value: '鏀剁撼',
           label: '鏀剁撼',
         }],
     }
@@ -259,14 +305,14 @@
       this.btn= jd
       this.dsb = !jd
       this.isShow=true
-      document.title = "淇敼淇濇磥鏀剁撼璇︾粏淇℃伅";
+  //    document.title = "淇敼淇濇磥鏀剁撼璇︾粏淇℃伅";
       this.$route.meta.title = "淇敼淇濇磥鏀剁撼璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
     }
     else{
-      document.title = "淇濇磥鏀剁撼璇︾粏淇℃伅";
+     // document.title = "淇濇磥鏀剁撼璇︾粏淇℃伅";
       this.$route.meta.title = "淇濇磥鏀剁撼璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
-      this.isShow=false;
       this.btn = false;
+      this.isShow=false;
     }
 
     let _this = this
@@ -274,22 +320,36 @@
       this.loading = true;
       getCLeanInfo(id).then((response) => {
         this.formData = response.data;
+        if(this.formData.kind==1)
+        	this.formData.kind = '鏀剁撼'
+        else
+        	this.formData.kind = '淇濇磥'
         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)
+              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})
 
-            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]})
+          	}
             }
-          }
         }
         this.loading = false;
       });
@@ -299,6 +359,46 @@
   },
   mounted() {},
   methods: {
+    getData(){
+      const id = this.$route.params && this.$route.params.id;
+      let _this = this
+      if (id) {
+        this.loading = true;
+        getCLeanInfo(id).then((response) => {
+          this.formData = response.data;
+          if(this.formData.kind==1)
+          	this.formData.kind = '鏀剁撼'
+          else
+          	this.formData.kind = '淇濇磥'
+          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)
+            //	alert(pth)
+                if (_this.fot.includes(pth) === true)
+            	{
+              console.log()
+            	  }
+                else {
+                  let nms = paths[i].split("\/")
+                  let nm = nms[nms.length - 1]
+            	  if(paths[i][0]=="/")
+                  _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+            		else
+            		_this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+            	}
+              }
+          }
+          _this.fileListOther = _this.fileListOther1
+          this.loading = false;
+        });
+        this.getCateInfor()
+
+      }
+    },
     getSrc1(type) {
       if (type === 0) {
         return '鍩洪噾'
@@ -319,29 +419,52 @@
       {
         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;
+        updateClean(this.formData).then(response => {
+          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+          // this.open = false;
+          // this.btn=false
+        });
       }
     },
 
     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
+      // 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.kind=='鏀剁撼')
+        	this.formData.kind = 1
+        else
+        	this.formData.kind = 0
         if (valid) {
           if (this.formData.id != undefined) {
-            updateEconomy(this.formData).then(response => {
+            updateClean(this.formData).then(response => {
               this.$modal.msgSuccess("淇敼鎴愬姛");
+              if(this.formData.kind==1)
+              	this.formData.kind = '鏀剁撼'
+              else
+              	this.formData.kind = '淇濇磥'
               // this.open = false;
               this.btn=false
             });
           } else {
             this.$modal.msgSuccess("淇敼澶辫触");
+            if(this.formData.kind==1)
+            	this.formData.kind = '鏀剁撼'
+            else
+            	this.formData.kind = '淇濇磥'
 
           }
         }
@@ -372,19 +495,116 @@
     },
     handleFileCardPreview(file){
       this.dialogFileUrl = file.url;
+     // alert(file.url)
+     // this.dialogFileUrl = 'https://www.bendudu.com:8080/profile/upload/2023/10/18/20231018214647A011.doc'
+     // this.dialogFileUrl = 'https://47.93.189.255:8080/profile/upload/2023/03/19/test7_20230319222030A007.jpg'
+      if(this.dialogFileUrl.includes("47.93.189.255")==true)
+        this.dialogFileUrl = this.dialogFileUrl.replace("47.93.189.255","www.bendudu.com")
+      //alert(this.dialogFileUrl)
       const Base64 = require('js-base64').Base64
-      this.desurl = process.env.VUE_APP_BASE_OTHER_API+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
-      myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
-    },
-    //鍒犻櫎鍥剧墖
-    handleRemoveFile(file,) {
 
+      this.desurl = process.env.VUE_APP_BASE_OTHER_API+"preview/"+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
+      let myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
+    },
+    //鍒犳枃浠�
+    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){
+      if(this.formData.kind=='鏀剁撼')
+      	this.formData.kind = 1
+      else
+      	this.formData.kind = 0
+		  updateClean(this.formData).then(response => {
+			this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      if(this.formData.kind==1)
+      	this.formData.kind = '鏀剁撼'
+      else
+      	this.formData.kind = '淇濇磥'
+			// 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)
+			uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+	  })
+	  this.formData.url = ul+","+uls;
+	  if(res==true){
+      if(this.formData.kind=='鏀剁撼')
+      	this.formData.kind = 1
+      else
+      	this.formData.kind = 0
+		  updateClean(this.formData).then(response => {
+			this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      if(this.formData.kind==1)
+      	this.formData.kind = '鏀剁撼'
+      else
+      	this.formData.kind = '淇濇磥'
+		  });
+	  }
+
+	},
     handleDownload(url) {
       var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
 
@@ -398,6 +618,126 @@
         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, fileListOther12) {
+		       //瀹氫箟涓�涓叏灞�鏁扮粍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
+
+      if(this.formData.kind=='鏀剁撼')
+      	this.formData.kind = 1
+      else
+      	this.formData.kind = 0
+
+			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;
+            this.getData()
+            this.fileListOther1=[]
+            if(this.formData.kind==1)
+            	this.formData.kind = '鏀剁撼'
+            else
+            	this.formData.kind = '淇濇磥'
+			    });
+			  })
+
+		},
+		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
+
+      if(this.formData.kind=='鏀剁撼')
+      	this.formData.kind = 1
+      else
+      	this.formData.kind = 0
+	        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("鍥剧墖涓婁紶鎴愬姛");
+              if(this.formData.kind==1)
+              	this.formData.kind = '鏀剁撼'
+              else
+              	this.formData.kind = '淇濇磥'
+	            // this.open = false;
+
+	          });
+	        // }
+	        // else{
+	        //   _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+	        // }
+	      });
+		},
+
     handleEdit()
     {
       this.dsb = false
@@ -405,34 +745,20 @@
     },
     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})
+    },
+    requestUpload1(params)
+    {
 
-        }
-      })
 
-    }
+    },
 
   }
 }
 
 </script>
-<style scoped lang="scss">
+<style scoped>
 .mt
 {
   position: relative;
@@ -447,7 +773,7 @@
   display: block;
   position: absolute;
 }
-.hide .el-upload--picture-card {
+.hide /deep/ .el-upload--picture-card {
   display: none;
 }
 .form{

--
Gitblit v1.9.1