From 05d623d5b806f6650b9544dcbd4f322d677bf9a8 Mon Sep 17 00:00:00 2001 From: yz3456 <2753272399@qq.com> Date: 星期二, 26 三月 2024 16:44:40 +0800 Subject: [PATCH] 完善直播模块2 --- ruoyi-ui/src/views/secret/secretInfo.vue | 559 +++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 457 insertions(+), 102 deletions(-) diff --git a/ruoyi-ui/src/views/secret/secretInfo.vue b/ruoyi-ui/src/views/secret/secretInfo.vue index 081f05b..204ac53 100644 --- a/ruoyi-ui/src/views/secret/secretInfo.vue +++ b/ruoyi-ui/src/views/secret/secretInfo.vue @@ -22,9 +22,12 @@ <el-form-item label="鍙戠敓鏃堕棿" prop="happenTime"> <el-input v-model="formData.happenTime" placeholder="璇烽�夋嫨鏃堕棿" type="date" clearable :style="{width: '100%'}" :disabled="dsb"></el-input> </el-form-item> - <el-form-item label="绫诲瀷" prop="type"> - <el-select v-model="formData.type" placeholder="璇烽�夋嫨鍩洪噾/鍙拌处" clearable :style="{width: '100%'}" :disabled="dsb" > - </el-select> + <el-form-item label="绫诲埆" prop="type"> + <el-select v-model="formData.type" placeholder="璇疯緭鍏ョ被鍒�" allow-create + filterable clearable :style="{width: '100%'}" > + <el-option v-for="(item, index) in typeOpt" :key="index" :label="item.label" :value="item.value" + ></el-option> + </el-select> </el-form-item> <el-form-item label="鏈夋晥鏈�" prop="validityDate"> <el-input v-model="formData.validityDate" placeholder="璇烽�夋嫨鏃堕棿" type="date" clearable :style="{width: '100%'}" :disabled="dsb"></el-input> @@ -38,15 +41,27 @@ </el-input> </el-form-item> <el-form-item label="鏄惁寮�鍚寚绾�" prop="isFinger"> - <el-input v-model="formData.isFinger" placeholder="璇疯緭鍏ユ寔鏈変汉" clearable :style="{width: '100%'}" :disabled="dsb"> + + <el-select v-model="formData.isFinger" placeholder="璇烽�夋嫨鏄�/鍚�" clearable :style="{width: '100%'}" :disabled="dsb" > + <el-option v-for="(item, index) in typeOptions2" :key="index" :label="item.label" :value="item.value" + ></el-option> + </el-select> + <!-- <el-input v-model="formData.isFinger" :active-value="鏄�" :inactive-value="鍚�" placeholder="璇疯緭鍏ユ寔鏈変汉" clearable :style="{width: '100%'}" :disabled="dsb"> --> </el-input> </el-form-item> <el-form-item label="鏄惁寮�鍚汉鑴�" prop="isFace"> - <el-input v-model="formData.isFace" placeholder="璇烽�夋嫨鐜伴噾/鑷姩鍒掓墸" clearable :style="{width: '100%'}" :disabled="dsb"> - </el-input> + + <el-select v-model="formData.isFace" placeholder="璇烽�夋嫨鏄�/鍚�" clearable :style="{width: '100%'}" :disabled="dsb" > + <el-option v-for="(item, index) in typeOptions2" :key="index" :label="item.label" :value="item.value" + ></el-option> + </el-select> </el-form-item> <el-form-item label="绉佹湁/鍏湁" prop="isPrivate"> - <el-input v-model="formData.isPrivate" placeholder="璇疯緭鍏ヤ綑棰�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input> + <el-select v-model="formData.isPrivate" placeholder="璇烽�夋嫨鏄�/鍚�" clearable :style="{width: '100%'}" :disabled="dsb" > + <el-option v-for="(item, index) in typeOptions3" :key="index" :label="item.label" :value="item.value" + ></el-option> + </el-select> + </el-form-item> <el-form-item label="澶囨敞" prop="remark"> <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input> @@ -58,12 +73,15 @@ action="#" list-type="picture-card" multiple - :http-request="requestUpload" - :file-list="fileList" + ref="upload" + :show-file-list="true" + :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 @@ -101,7 +119,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="" @@ -110,53 +134,71 @@ multiple list-type="picture-card" :on-preview="handleFileCardPreview" - :on-remove="handleRemoveFile" - :http-request="requestUpload" + :show-file-list="true" + + + ref="upload1" + :on-remove="handleRemoveFile" + :http-request="requestUpload1" + :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 slot="file" slot-scope="{file}"> - <img - 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 + <!-- 娣诲姞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="../../assets/401_images/401.gif" + alt="" + style="width: 147px; height: 147px" + fit="cover"> - class="el-upload-list__item-preview" - @click="handleFileCardPreview(file)" - > - <i class="el-icon-zoom-in"></i> - </span> - <span + <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 - @click="handleRemove(file)" - class="el-upload-list__item-delete" + 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> - > - <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> - - - </div> + </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> @@ -164,12 +206,12 @@ <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> <script> - import {getSecretInfo, uploadPic, download, updateSecret} from "@/api/secret/index"; + import {getSecretInfo, uploadPic, download, updateSecret,getCategory} from "@/api/secret/index"; import {addRole, updateRole} from "@/api/system/role"; import {blobValidate} from "@/utils/ruoyi"; import errorCode from "@/utils/errorCode"; @@ -182,11 +224,17 @@ 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:[ ], + fileList1:[], + uploadFileList:[], + uploadFileList1:[], fileListOther:[ - + ], dsb:true, btn:false, @@ -203,7 +251,7 @@ isPrivate:undefined, location:undefined, remark: undefined, - url: undefined, + url: "", }, dialogImageUrl: '', dialogVisible: false, @@ -251,6 +299,26 @@ }], }, + typeOptions2: [ + { + value: '鍚�', + label: '鍚�', + }, + { + value: '鏄�', + label: '鏄�', + } + ], + typeOptions3: [ + { + value: '绉佹湁', + label: '绉佹湁', + }, + { + value: '鍏湁', + label: '鍏湁', + } + ], typeOptions: [{ value: '0', label: '鍩洪噾', @@ -259,6 +327,7 @@ value: '1', label: '鍙拌处', }], + typeOpt:[], } }, computed: {}, @@ -272,11 +341,11 @@ 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; @@ -286,32 +355,72 @@ if (id) { this.loading = true; getSecretInfo({id}).then((response) => { - this.formData = response.data; + _this.formData = response.data; + if(_this.formData.isFinger==1) + _this.formData.isFinger = '鏄�' + else + _this.formData.isFinger = '鍚�' + if(_this.formData.isFace==1) + _this.formData.isFace = '鏄�' + else + _this.formData.isFace = '鍚�' + if(_this.formData.isPrivate==0) + _this.formData.isPrivate = '鍏湁' + else + _this.formData.isPrivate = '绉佹湁' 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) - - 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}) + } + else { + + // 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}) + + } } - } } + // alert(this.fileListOther.length) this.loading = false; }); - this.getCateInfor() + this.getCateInfo() } }, mounted() {}, methods: { + getCateInfo() + { + let _this = this + _this.typeOpt = [] + + getCategory().then(response=>{ + console.log(response.data) + // alert(9801) + + response.data.map(elem=>{ + _this.typeOpt.push({"label":elem, "value":elem}) + }) + // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{ + // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]}) + // }) + }) + }, getSrc1(type) { if (type === 0) { return '鍩洪噾' @@ -337,7 +446,18 @@ return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") }).join(",") this.formData.url = ul+","+uls - +if(this.formData.isFinger=='鏄�') + this.formData.isFinger = 1 + else + this.formData.isFinger = 0 + if(this.formData.isFace=='鏄�') + this.formData.isFace = 1 + else + this.formData.isFace = 0 + if(this.formData.isPrivate== '鍏湁') + this.formData.isPrivate =0 + else + this.formData.isPrivate = 1 this.$refs['elForm'].validate(valid => { @@ -345,10 +465,34 @@ if (this.formData.id != undefined) { updateSecret(this.formData).then(response => { this.$modal.msgSuccess("淇敼鎴愬姛"); + if(this.formData.isFinger==1) + this.formData.isFinger = '鏄�' + else + this.formData.isFinger = '鍚�' + if(this.formData.isFace==1) + this.formData.isFace = '鏄�' + else + this.formData.isFace = '鍚�' + if(this.formData.isPrivate==0) + this.formData.isPrivate = '鍏湁' + else + this.formData.isPrivate = '绉佹湁' // this.open = false; this.btn=false }); } else { + if(this.formData.isFinger==1) + this.formData.isFinger = '鏄�' + else + this.formData.isFinger = '鍚�' + if(this.formData.isFace==1) + this.formData.isFace = '鏄�' + else + this.formData.isFace = '鍚�' + if(this.formData.isPrivate==0) + this.formData.isPrivate = '鍏湁' + else + this.formData.isPrivate = '绉佹湁' this.$modal.msgSuccess("淇敼澶辫触"); } @@ -372,18 +516,109 @@ }) }, handleRemoveFile(file) { - for(let i = 0; i < this.fileListOther.length; i++) - { - if(this.fileListOther[i].url==file.url) - this.$delete(this.fileListOther,i); - } + 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.isFinger=='鏄�') + this.formData.isFinger = 1 + else + this.formData.isFinger = 0 + if(this.formData.isFace=='鏄�') + this.formData.isFace = 1 + else + this.formData.isFace = 0 + if(this.formData.isPrivate=='鍏湁') + this.formData.isPrivate = 0 + else + this.formData.isPrivate = 1 + updateSecret(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 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.isFinger=='鏄�') + this.formData.isFinger = 1 + else + this.formData.isFinger = 0 + if(this.formData.isFace=='鏄�') + this.formData.isFace = 1 + else + this.formData.isFace = 0 + if(this.formData.isPrivate=='鍏湁') + this.formData.isPrivate = 0 + else + this.formData.isPrivate = 1 + updateSecret(this.formData).then(response => { + this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); + }); + } + }, handleFileCardPreview(file){ this.dialogFileUrl = file.url; @@ -421,30 +656,150 @@ // 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; - this.$modal.msgSuccess("涓婁紶鎴愬姛"); - if(_this.fot.includes(pth) === true) + + //鑷畾涔変笂浼犳柟娉� + 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, fileListOther1) { + //瀹氫箟涓�涓叏灞�鏁扮粍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 + if(_this.formData.isFinger=='鏄�') + _this.formData.isFinger = 1 + else + _this.formData.isFinger = 0 + if(_this.formData.isFace=='鏄�') + _this.formData.isFace = 1 + else + _this.formData.isFace = 0 + if(_this.formData.isPrivate=='鍏湁') + _this.formData.isPrivate = 0 + else + _this.formData.isPrivate = 1 + updateSecret(_this.formData).then(response => { + this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛"); + // this.open = false; + }); + }) + + }, + 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) + if(_this.formData.isFinger=='鏄�') + _this.formData.isFinger = 1 + else + _this.formData.isFinger = 0 + if(_this.formData.isFace=='鏄�') + _this.formData.isFace = 1 + else + _this.formData.isFace = 0 + if(_this.formData.isPrivate=='鍏湁') + _this.formData.isPrivate = 0 + else + _this.formData.isPrivate = 1 + updateSecret(_this.formData).then(response => { + _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛"); + // this.open = false; + + }); + // } + // else{ + // _this.fileListOther.push({name:response.data.fileName, url:response.data.url}) + + // } + }); + }, + requestUpload(params) { - _this.fileList.push({name:response.data.fileName, "url":response.data.url}) - - } - - else{ - _this.fileListOther.push({name:response.data.fileName, url:response.data.url}) - - } - }) - - }, + // alert(124) + // this.uploadFileList.push(params.file); + + //alert(34) + + + }, + requestUpload1(params) + { + // alert(123) + // this.uploadFileList1.push(params.file); + // console.log("-----------") + //console.log(this.uploadFileList1) + }, + /** 瀵煎嚭鎸夐挳鎿嶄綔 */ handleExport() { @@ -464,7 +819,7 @@ } </script> - <style scoped lang="scss"> + <style scoped> .mt { position: relative; @@ -479,7 +834,7 @@ display: block; position: absolute; } - .hide .el-upload--picture-card { + .hide /deep/ .el-upload--picture-card { display: none; } .form{ -- Gitblit v1.9.1