From dc2b637e3ead569adee4cf7a48b0bb15f8c7aa43 Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期五, 01 三月 2024 20:46:19 +0800 Subject: [PATCH] 修改类似的代码 --- ruoyi-ui/src/views/bignote/index.vue | 260 +++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 185 insertions(+), 75 deletions(-) diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue index d366e30..fd35c32 100644 --- a/ruoyi-ui/src/views/bignote/index.vue +++ b/ruoyi-ui/src/views/bignote/index.vue @@ -51,7 +51,7 @@ <el-form-item label="鏃堕棿" prop="happenTime"> <el-date-picker v-model="dateRange" - style="width: 197px; + style="width: 240px; height: 30px; background: #FFFFFF; border-radius: 14px 14px 14px 14px; @@ -124,7 +124,7 @@ v-hasPermi="['family:note:export']" >瀵煎叆妯℃澘涓嬭浇</el-button> </el-col> - <el-col :span="1.2"> + <el-col :span="1.5"> <el-upload action="" @@ -135,7 +135,7 @@ > <el-button size="mini" type="primary" plain - icon="el-icon-plus" >瀵煎叆</el-button> + icon="el-icon-top">瀵煎叆</el-button> </el-upload> </el-col> @@ -192,6 +192,7 @@ size="mini" type="text" icon="el-icon-edit" + :disabled="!scope.row.ownData" @click="handleUpdate(scope.row)" v-hasPermi="['familymodel:bignote:list']" >淇敼</el-button> @@ -199,6 +200,7 @@ size="mini" type="text" icon="el-icon-delete" + :disabled="!scope.row.ownData" @click="handleDelete(scope.row)" v-hasPermi="['system:role:remove']" >鍒犻櫎</el-button> @@ -255,6 +257,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 }"> @@ -285,26 +290,71 @@ </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 - - :on-remove="handleRemoveFile" + ref="upload1" + :on-change="handleChange1" + :auto-upload="false" + list-type="picture-card" :http-request="requestUpload1" :show-file-list="true" > +<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> - <el-button type="primary">鐐瑰嚮涓婁紶</el-button> - <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div> - <template #tip> - <div class="el-upload__tip"> - </div> - </template> - </el-upload> + <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> @@ -355,6 +405,8 @@ total: 0, // 瀹跺ぇ浜嬭琛ㄦ牸鏁版嵁 familyList: [], + + // 寮瑰嚭灞傛爣棰� title: "", // 鏄惁鏄剧ず寮瑰嚭灞� @@ -371,6 +423,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, @@ -384,7 +439,7 @@ remark: undefined, familyId:undefined, happenTime:undefined, - url: undefined, + url: '', }, // 鑿滃崟鍒楄〃 menuOptions: [], @@ -478,16 +533,21 @@ console.log(this.queryParams) this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0] this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1] - + let _this = this // listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => { listFamilyevent(this.queryParams).then(response => { // alert(123) - // console.log(response.data.data) // alert(response.data.data[1].url) - this.familyList = response.data.data; + if(response.msg=="鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠$悊鍛�") + { + _this.$modal.msgSuccess("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠$悊鍛�"); + _this.loading = false; + }else{ + _this.familyList = response.data.data; - this.total = response.data.total; - this.loading = false; + _this.total = response.data.total; + _this.loading = false; + } } ); }, @@ -571,18 +631,33 @@ }, handleRemove(file) { - for(let i = 0; i < this.fileList.length; i++) - { - if(this.fileList[i].url==file.url) - this.$delete(this.fileList,i); - - } + //alert(98) + //alert(this.fileList.length) + 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); + } + } + // let ul = this.fileList.map(function (elem){ + // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") + // }).join(",") + // alert(this.fileListOther.length) + // let uls = this.fileListOther.map(function (elem){ + // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") + // }).join(",") + // this.formDat.url = ul+","+uls; }, 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); + } } }, handlePictureCardPreview(file) { @@ -592,13 +667,14 @@ /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */ 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 + // 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 + // alert(this.formDat.url) this.$refs["elForm"].validate(valid => { if (valid) { @@ -622,53 +698,87 @@ }); }, + 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) { - - 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}) - - } - }) +//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}) - _this.fileListOther.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) { @@ -724,7 +834,7 @@ } }; </script> -<style> +<style scoped=""> .el-table__row.statistics-warning-row { background: #E0EEFE; -- Gitblit v1.9.1