From 76a3eb05129f0af9f9b5798b1c8abbf9afaf7f19 Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期二, 27 八月 2024 17:59:26 +0800 Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web --- ruoyi-ui/src/views/contacts/contactsInfo.vue | 552 ++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 388 insertions(+), 164 deletions(-) diff --git a/ruoyi-ui/src/views/contacts/contactsInfo.vue b/ruoyi-ui/src/views/contacts/contactsInfo.vue index 594a6a8..a0182a4 100644 --- a/ruoyi-ui/src/views/contacts/contactsInfo.vue +++ b/ruoyi-ui/src/views/contacts/contactsInfo.vue @@ -66,8 +66,12 @@ </el-cow> <el-cow> <el-form-item label="鏄惁甯歌仈绯�" prop="isAlways" label-width="90px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> - <el-input v-model="formData.isAlways === 1 ? '鏄�':'鍚�' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> + <el-input v-if="dte" v-model="formData.isAlways === 1 ? '鏄�':'鍚�' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> + <el-select v-if="!dte" v-model="formData.isAlways" placeholder="璇烽�夋嫨鏄惁甯歌仈绯�" clearable :style="{width: '100%'}" > + <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value" + ></el-option> + </el-select> </el-form-item> </el-cow> <el-cow> @@ -86,16 +90,19 @@ :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">姝e湪涓婁紶...</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: 100%; height: 100%; object-fit: cover;" + style="width: 147px; height: 147px; object-fit: cover;" fit="cover" :preview-src-list="[file.url]" > @@ -126,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="" @@ -138,56 +151,72 @@ :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">姝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 + <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> </div> <el-dialog :visible.sync="dialogVisible"> - <img w-full :src="dialogImageUrl" alt="Preview Image" /> + <img w-full :src="dialogImageUrl" style="width: 100%; height: 100%" alt="Preview Image" /> </el-dialog> </div> </template> @@ -206,12 +235,19 @@ return { cdi:"閫氳褰曡缁嗕俊鎭�", udi:"閫氳褰曚俊鎭鎯�", - fot:[".jpg",".jif","png"], + // 鏁版嵁鑼冨洿閫夐」 + 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, @@ -234,9 +270,9 @@ twitter:undefined, isAlways:undefined, remark:undefined, - url: undefined, + url: '', }, - desurl:'', + dialogImageUrl: '', dialogVisible: false, disabled: false, @@ -274,7 +310,15 @@ }], }, - typeOptions: [], + typeOptions: [{ + value: '鏄�', + label: '鏄�', + }, + { + value: '鍚�', + label: '鍚�', + }], + dte:false, } }, computed: {}, @@ -287,14 +331,16 @@ jd = this.$route.query.detail this.btn= jd this.dsb = !jd + this.dte = false this.isShow=true - document.title = "淇敼閫氳褰曡缁嗕俊鎭�"; + // document.title = "淇敼閫氳褰曡缁嗕俊鎭�"; this.$route.meta.title = "淇敼閫氳褰曡缁嗕俊鎭�";//鍒楄〃鐨勫悕绉� } else{ - document.title = "閫氳褰曡缁嗕俊鎭�"; + // document.title = "閫氳褰曡缁嗕俊鎭�"; this.$route.meta.title = "閫氳褰曡缁嗕俊鎭�";//鍒楄〃鐨勫悕绉� this.isShow=false + this.dte=true this.btn = false; } @@ -303,21 +349,49 @@ this.loading = true; getContactIdList(id).then((response) => { this.formData = response.data; + if(this.formData.isAlways==0) + this.formData.isAlways='鍚�' + else + this.formData.isAlways = '鏄�' 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}) + // } + { + 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] - _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; @@ -328,37 +402,74 @@ }, 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; + getContactIdList(id).then((response) => { + this.formData = response.data; + if(this.formData.isAlways==0) + this.formData.isAlways='鍚�' + else + this.formData.isAlways = '鏄�' + 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 { + // alert(paths[i]) + // alert() + 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() + + } + }, + 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=='鍚�') + this.formData.isAlways = 0 + else + this.formData.isAlways = 1 if (valid) { if (this.formData.id != undefined) { updateContact(this.formData).then(response => { this.$modal.msgSuccess("淇敼鎴愬姛"); // this.open = false; + if(this.formData.isAlways==0) + this.formData.isAlways='鍚�' + else + this.formData.isAlways = '鏄�' this.btn=false }); } else { + if(this.formData.isAlways==0) + this.formData.isAlways='鍚�' + else + this.formData.isAlways = '鏄�' this.$modal.msgSuccess("淇敼澶辫触"); } @@ -382,48 +493,101 @@ }) }, 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) + uls = uls +","+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; + 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; @@ -448,75 +612,135 @@ 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}) + //鑷畾涔変笂浼犳柟娉� + handleChange(file, fileList1) { + //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍 - } - }) - }, - 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}) + // 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; - 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 - }); - } - }) - }, + 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; + 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) + 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) + }, } } @@ -541,7 +765,7 @@ display: block; position: absolute; } -.hide .el-upload--picture-card { +.hide /deep/ .el-upload--picture-card { display: none; } .form{ -- Gitblit v1.9.1