From 63b70dbc269b7b9d20a7a88f3dd7c8bb0934d3f4 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 03 九月 2024 21:49:18 +0800
Subject: [PATCH] 修改了一些bug

---
 ruoyi-ui/src/views/collection/collectionInfo.vue |  538 ++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 418 insertions(+), 120 deletions(-)

diff --git a/ruoyi-ui/src/views/collection/collectionInfo.vue b/ruoyi-ui/src/views/collection/collectionInfo.vue
index 6145d2e..319744e 100644
--- a/ruoyi-ui/src/views/collection/collectionInfo.vue
+++ b/ruoyi-ui/src/views/collection/collectionInfo.vue
@@ -1,7 +1,15 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="printable-content">
     <div class="form-header mt">
-      <h4 class="dt h4">鏀惰棌涓庤崳瑾夎缁嗕俊鎭� </h4>
+      <h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;" >
+        <span>鏀惰棌涓庤崳瑾夎缁嗕俊鎭�</span>
+        <div style="display: flex; align-items: center;">
+        <el-button size="mini" type="text"  v-print="'#printable-content'" v-hasPermi="['person:information:memo']">
+        <div class="form" ><el-icon  style="padding-right:100px;"></el-icon>
+          <span class="text" style="width: 69px;height: 26px;font-size: 16px;
+            font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">鎵撳嵃</span></div>
+      </el-button></div>
+      </h1>
 <!--      <el-button v-if="isShow" type="primary" class="pt"  icon="el-icon-edit" @click="handleEdit()" >缂栬緫</el-button>-->
       <!--      <br>-->
       <!--      <el-button type="primary" class="pt"   @click="handleExport"-->
@@ -15,15 +23,15 @@
       <!--      </el-form-item>-->
          <el-container>
            <el-row :span="12">
-             <el-cow >
+             <el-col >
               <el-form-item label="鑾峰緱鏃堕棿" prop="happenTime" label-width="70px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                 <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-cow>
-             <el-cow >
+             </el-col>
+             <el-col >
                <el-form-item label="绫诲埆" prop="type" label-width="40px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                  <el-select v-model="formData.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}"   :disabled="dsb">
                    <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
@@ -31,59 +39,60 @@
                  </el-select>
                  <el-input v-model="newOption" v-if="showInput" placeholder="鑻ユ湭鍦ㄤ笂杩伴�夐」涓壘鍒板搴旂被鍒紝璇峰湪姝よ緭鍏ユ柊鐨勭被鍒�" @change="addNewOption"></el-input>
               </el-form-item>
-             </el-cow>
-             <el-cow >
+             </el-col>
+             <el-col >
               <el-form-item label="鍚嶇О" prop="name" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                 <el-input v-model="formData.name" placeholder="璇疯緭鍏ュ悕绉�" clearable :style="{width: '100%'}" :disabled="dsb">
                 </el-input>
               </el-form-item>
-             </el-cow>
-             <el-cow >
+             </el-col>
+             <el-col >
                <el-form-item label="鏉ユ簮" prop="source" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                 <el-input v-model="formData.source" placeholder="璇疯緭鍏ユ潵婧�" clearable :style="{width: '100%'}" :disabled="dsb">
                 </el-input>
               </el-form-item>
-             </el-cow>
-             <el-cow >
+             </el-col>
+             <el-col >
               <el-form-item label="鎸佹湁鑰�" prop="owner" label-width="65px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                 <el-input v-model="formData.owner" placeholder="璇疯緭鍏ユ寔鏈夎��" clearable :style="{width: '100%'}" :disabled="dsb">
                 </el-input>
               </el-form-item>
-             </el-cow>
-             <el-cow >
+             </el-col>
+             <el-col >
                <el-form-item label="浠峰��" prop="price" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
-                <el-input v-model="formData.price" placeholder="璇疯緭鍏ヤ环鍊�" clearable :style="{width: '100%'}" :disabled="dsb">
+                <el-input v-model="formData.price" type="number" placeholder="璇疯緭鍏ヤ环鍊�" clearable :style="{width: '100%'}" :disabled="dsb">
                 </el-input>
               </el-form-item>
-             </el-cow>
-             <el-cow >
+             </el-col>
+             <el-col >
               <el-form-item label="瀛樻斁浣嶇疆" prop="location" label-width="80px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                 <el-input v-model="formData.location" placeholder="璇疯緭鍏ュ瓨鏀句綅缃�" clearable :style="{width: '100%'}" :disabled="dsb">
                 </el-input>
               </el-form-item>
-             </el-cow>
-             <el-cow >
+             </el-col>
+             <el-col >
                <el-form-item label="澶囨敞" prop="remark" label-width="45px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
               <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
             </el-form-item>
-             </el-cow>
-             <el-cow >
-               <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>
-             </el-cow>
+             </el-col>
 
            </el-row>
          </el-container>
           <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
           <el-upload
             action="#"
+            accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
             list-type="picture-card"
             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">姝e湪涓婁紶...</div>
+
             <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
             <div slot="file" slot-scope="{file}">
               <img
@@ -121,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=""
@@ -130,22 +145,35 @@
             multiple
             list-type="picture-card"
             :on-preview="handleFileCardPreview"
-            :on-remove="handleRemoveFile"
-            :http-request="requestUpload"
+
+            :http-request="requestUpload1"
             :show-file-list="true"
+			:on-change="handleChange1"
+					:auto-upload="false"
+            :disabled="!btn"
+            :class="{ hide: !btn }"
           >
 
-            <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
+              <!-- 娣诲姞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/images/deviceLis.png"
+                alt=""
+                style="width: 147px; height: 147px"
+                fit="cover">
+
               <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)"
@@ -166,14 +194,20 @@
                     >
                       <i class="el-icon-delete"></i>
                     </span>
-                  </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>
@@ -181,7 +215,7 @@
     </div>
 
         <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>
 
 
@@ -193,8 +227,8 @@
 import {blobValidate} from "@/utils/ruoyi";
 import errorCode from "@/utils/errorCode";
 import {Message} from "element-ui";
+import {addRole, updateRole} from "@/api/system/role";
 import {getCollection, updateCollection,download,uploadPic,listType} from "@/api/collection/index";
-
 
 export default {
   components: {},
@@ -203,17 +237,23 @@
     return {
       cdi:"鏀惰棌涓庤崳瑾夎缁嗕俊鎭�",
       udi:"鏀惰棌涓庤崳瑾変俊鎭鎯�",
-      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:[
+    // 鏁版嵁鑼冨洿閫夐」
+    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:[
+
+   ],
+   fileListOther1:[],
       dsb:true,
       btn:false,
       isShow:true,
       uploading: false,
+      uploading1: false,
       // 鏀惰棌涓庤崳瑾夎〃鏍兼暟鎹�
      collectionList: [],
       typeList:[],
@@ -228,8 +268,9 @@
         price:undefined,
         location:undefined,
         remark:undefined,
-        url: undefined,
+        url: "",
       },
+
       dialogImageUrl: '',
       dialogVisible: false,
       disabled: false,
@@ -294,13 +335,14 @@
       this.dsb = !jd
       this.showInput=true
       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;
     }
 
     let _this = this
@@ -311,19 +353,43 @@
         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)
-
-            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})
+         	//   }
+          {
+            if(paths[i].includes(process.env.VUE_APP_BASE_TRUE_API)){
+              if(paths[i][0]=="/")
+                    _this.fileList.push({name:paths[i],url: paths[i].substr(1),res:false})
+              else
+                 _this.fileList.push({name:paths[i],url: paths[i],res:false})
+            }else{
+              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;
       });
@@ -342,17 +408,49 @@
   },
   mounted() {},
   methods: {
-    /** 鏌ヨ绫诲埆淇℃伅 */
-    // getCateInfor()
-    // {
-    //   let _this = this
-    //   getCategory().then(response=>{
-    //
-    //     response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
-    //       _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
-    //     })
-    //   })
-    // },
+    getData(){
+      const id = this.$route.params && this.$route.params.id;
+      let _this = this
+      if (id) {
+        this.loading = true;
+        getCollection(id).then((response) => {
+          this.formData = response.data;
+          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;
+        });
+        listType(this.queryParams).then(response => {
+            this.typeList = response.data;
+            this.total = response.data.total;
+            // console.log( this.typeList )
+            // 鍦ㄥ洖璋冨嚱鏁颁腑璋冪敤 getTypeOptions()
+            this.getTypeOptions();
+            this.loading = false;
+          }
+        );
+      }
+    },
     //绫诲埆
     addNewOption() {
       const newOption = this.newOption.trim();
@@ -379,13 +477,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 => {
 
@@ -424,25 +516,93 @@
         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);
-      }
-    },
-    handleRemove(file) {
-      for(let i = 0; i < this.fileList.length; i++)
-      {
-        if(this.fileList[i].url==file.url)
-          this.$delete(this.fileList,i);
-      }
-    },
+  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)
+  		uls = uls +","+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)
+        this.dialogFileUrl = this.dialogFileUrl.replace("47.93.189.255","www.bendudu.com")
+
       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');
+      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');
     },
     handlePictureCardPreview(file) {
       this.dialogImageUrl = file.url;
@@ -464,40 +624,168 @@
     handleEdit()
     {
       this.dsb = false
-      // this.btn = true
+      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, 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
+
+			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;
+            this.getData()
+            this.fileListOther1=[]
+			    });
+			  })
+
+		},
+		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;
-        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)
+    {
+      // 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})
 
-    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
-    handleExport() {
-      this.download('/zfCollection/export', {
-        ...this.queryParams
-      }, `zfCollection_${new Date().getTime()}.xlsx`)
-    }
+      //   }
+
+      //   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);// 璁剧疆瑙嗛鐨勫皝闈㈠浘鍍�
+
+      //         // 鍦ㄩ〉闈腑鏄剧ず瑙嗛鍏冪礌
+      //         document.body.appendChild(videoElement);
+      //       });
+      //       // this.open = false;
+      //       // this.btn=false
+      //     });
+      //   }
+      // })
+    },
 
   }
 }
@@ -522,10 +810,20 @@
   display: block;
   position: absolute;
 }
+.hide /deep/ .el-upload--picture-card {
+  display: none;
+}
+.form{
+  background:center/11% no-repeat url('../../assets/icons/form.png') ;
+}
 .form_item{
   font-size: 12px;
   font-family: Microsoft YaHei-Regular, Microsoft YaHei;
   font-weight: 400;
   color: #000000;
 }
+.el-upload-list__item-name {
+  font-size: 14px; /* 璋冩暣鏂囦欢鍚嶅瓧鐨勫瓧浣撳ぇ灏� */
+
+}
 </style>

--
Gitblit v1.9.1