From fb98e10c76d7e6c2d01f3a9f8c1b727f905cbdca Mon Sep 17 00:00:00 2001 From: surprise <15810472099@163.com> Date: 星期一, 05 二月 2024 15:30:50 +0800 Subject: [PATCH] 代码更新 --- src/views/Archive/index.vue | 678 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 611 insertions(+), 67 deletions(-) diff --git a/src/views/Archive/index.vue b/src/views/Archive/index.vue index 631c2a4..66fcff7 100644 --- a/src/views/Archive/index.vue +++ b/src/views/Archive/index.vue @@ -49,6 +49,7 @@ allow-create default-first-option size="small" + ref="cascaders" :placeholder="$t('archiveObj.label4')" @change="categorySelectChange('orgName','org',categoryOptions)" > @@ -93,6 +94,7 @@ v-model="formInline.depName" :placeholder="$t('archiveObj.label3')" :popper-append-to-body="false" + ref="treeSelect" > <el-option :value="formInline.depcode" @@ -243,10 +245,14 @@ <div class="cardItem"> {{$t('archiveObj.dataType')}} : {{ item.mold }} </div> <div class="cardItem"> {{$t('dataManage.vmobj.format')}} : {{ item.type }} </div> <div class="cardItem"> {{$t('dataManage.vmobj.size')}} : {{stateFormatSizes(item.sizes)}} </div> + <div class="cardItem"> {{$t('dataManage.vmobj.tab')}} : {{ item.tab }} </div> + <div class="cardItem"> {{$t('dataManage.vmobj.dirName')}} : {{ item.dirName }} </div> + <div class="cardItem"> {{$t('dataManage.vmobj.row')}} : {{ item.rows }} </div> <div class="cardItem"> {{$t('archiveObj.downloads')}} : {{ item.downCount }} 娆� </div> <div class="cardItem"> {{$t('dataManage.vmobj.createonuser')}} : {{item.uname}} </div> <div class="cardItem"> {{$t('dataManage.vmobj.depName')}} : {{item.depName}} </div> <div class="cardItem"> {{$t('dataManage.vmobj.createontime')}} : {{format(item.createTime)}} </div> + </div> <div :id="item.id" @@ -254,7 +260,9 @@ v-show="!item.isShow && formInline.dataType!='type2'" > <div class="cardItem"> {{$t('archiveObj.dataType')}} : {{ item.mold }} </div> + <div class="cardItem"> {{$t('dataManage.vmobj.tab')}} : {{ item.ns+'.'+item.tab }} </div> <div class="cardItem"> {{$t('dataManage.vmobj.row')}} : {{ item.rows }} </div> + <div class="cardItem"> {{$t('dataManage.vmobj.dirName')}} : {{ item.bak }} </div> <!-- <div class="cardItem"> {{$t('archiveObj.storageType')}} : {{ item.tableType }} </div> --> </div> </el-card> @@ -290,13 +298,16 @@ <el-divider></el-divider> <p>{{ $t('common.size') }}锛歿{ stateFormatSizes(itemdetail1.sizes) }}</p> <el-divider></el-divider> + <p>{{ $t('dataManage.vmobj.tab') }}锛歿{ itemdetail1.tab }}</p> + <el-divider></el-divider> + <p>{{ $t('dataManage.vmobj.row') }}锛歿{itemdetail1.rows }}</p> + <el-divider></el-divider> <p>{{ $t('archiveObj.downloads') }}锛歿{ itemdetail1.downCount }} 娆�</p> <el-divider></el-divider> <p>{{ $t('archiveObj.label9') }}锛歿{ itemdetail1.lastUser }} </p> <el-divider></el-divider> <p>{{ $t('archiveObj.label8') }}锛歿{setInfoBoxTime(itemdetail1.lastTime) }} </p> <el-divider></el-divider> - <p>{{ $t('dataManage.vmobj.depName') }}锛歿{ itemdetail1.depName }}</p> <el-divider></el-divider> <p> @@ -546,6 +557,7 @@ </el-form-item> </el-form> <el-table + @cell-dblclick="copyText" :data="tableAttach" ref="filterTable" height="calc(100% - 130px)" @@ -641,9 +653,11 @@ @click="downloadLogVisible = true" >{{$t('common.download')}}</el-button> </el-form-item> + <!-- --> </el-form> <el-divider /> <el-table + @cell-dblclick="copyText" ref="filterTable" :data="tableData" border @@ -767,6 +781,7 @@ <div class="downloadBox"> <div class="archdowntop"> <el-table + @cell-dblclick="copyText" :data="downloadTableData" style="width: 100%" height="calc(100% - 5px)" @@ -831,6 +846,7 @@ width="90%" top="10vh" :close-on-click-modal="false" + :before-close="handleMaptClose" > <div style="height:73vh"> <map-sdk v-if='showMapVisible'></map-sdk> @@ -844,6 +860,7 @@ <div style="height: 65vh; width: 100%"> <el-table + @cell-dblclick="copyText" ref="filterTable" :data="metaDataTable1" style="width: 100%" @@ -948,6 +965,7 @@ </el-form-item> </el-form> <el-table + @cell-dblclick="copyText" ref="filterTable" :data="metaDataTable" style="width: 100%" @@ -1058,14 +1076,187 @@ v-if="dialog.isJpg" class="pdfClass" > - <img + <el-image style="width:100%; height:100%" :src="dialog.src" - alt="" - /> + :preview-src-list="[dialog.src]" + > + </el-image> + </div> </el-dialog> + <el-dialog + title="鏁版嵁鐢宠" + :visible.sync="dialogInsertVisible" + width="30%" + top="35vh" + :modal="false" + :before-close="handleInsertClose" + > + <div style="width: 100%; max-height: 450px; overflow-y: auto"> + <el-form + ref="form" + :model="ruleForm" + label-width="100px" + > + <el-form-item label="瀹℃牳鍗曚綅"> + <div> + <ul> + <li v-for="item in ruleForm.depid"> + {{ item.name }} + </li> + </ul> + </div> + </el-form-item> + <el-form-item label="琛ㄥ悕"> + <div> + <ul> + <li v-for="item in ruleForm.tabs"> + {{ item.tabDesc }} + </li> + </ul> + </div> + </el-form-item> + <el-form-item label="鏉′欢"> + <el-input + :title="ruleForm.wkt" + v-model="ruleForm.wkt" + disabled + ></el-input> + </el-form-item> + <el-form-item label="鎻忚堪"> + <el-input + type="textarea" + placeholder="璇疯緭鍏ュ唴瀹�" + v-model="ruleForm.descr" + maxlength="50" + show-word-limit + > + </el-input> + </el-form-item> + <el-form-item> + <el-button + class="primary" + size="small" + @click="getInsertDownx" + >{{ + $t("common.confirm") + }}</el-button> + <el-button + type="info" + size="small" + @click="closeInsertDown" + >{{ + $t("common.cancel") + }}</el-button> + </el-form-item> + </el-form> + </div> + </el-dialog> + <el-dialog + :title="$t('common.passworld')" + :visible.sync="dialogVisible1" + width="30%" + top="35vh" + :modal="false" + :before-close="handleCloseDown1" + > + <el-form + :model="codeForm" + :rules="rules" + ref="codeForm" + label-width="100px" + class="codeForm" + > + <el-form-item + :label="$t('common.passworld')" + prop="password" + > + <el-input + type="password" + v-model="codeForm.password" + show-password + ></el-input> + </el-form-item> + <el-form-item + :label="$t('common.SPassword')" + prop="repassword" + > + <el-input + type="password" + v-model="codeForm.repassword" + show-password + ></el-input> + </el-form-item> + <el-form-item> + <el-button + class="primary" + size="small" + @click="downloadx('codeForm')" + >{{ $t("common.confirm") }}</el-button> + <el-button + type="info" + size="small" + @click="closeDownx('codeForm')" + >{{ + $t("common.cancel") + }}</el-button> + </el-form-item> + </el-form> + </el-dialog> + <el-dialog + title="鏁版嵁鐢宠" + :visible.sync="dialogInsertFile" + width="30%" + top="10vh" + :modal="false" + :close-on-click-modal="false" + :show-close="false" + > + <el-form + ref="form" + :model="fileFrom" + label-width="100px" + > + <el-form-item label="瀹℃牳鍗曚綅"> + <div> + <ul> + <li v-for="item in fileFrom.depid"> + {{ item.name }} + </li> + </ul> + </div> + </el-form-item> + <el-form-item label="鎻忚堪"> + <el-input + type="textarea" + placeholder="璇疯緭鍏ュ唴瀹�" + v-model="fileFrom.descr" + maxlength="50" + show-word-limit + > + </el-input> + </el-form-item> + <el-form-item> + <el-button + class="primary" + size="small" + @click="getFileInsertApply()" + >{{ + $t("common.confirm") + }}</el-button> + <el-button + type="info" + size="small" + @click="handleInsertFileClose()" + >{{ + $t("common.cancel") + }}</el-button> + </el-form-item> + </el-form> + + </el-dialog> <iframe id="downFrame" src="" @@ -1081,6 +1272,8 @@ import $ from 'jquery' import { getToken } from '@/utils/auth'; import { + decr, + encr, selectdepTab, dataLib_selectProject, dataLib_selectDirTypes, @@ -1096,7 +1289,11 @@ dataLib_selectPageAndCountByPid, dataLib_selectMetaById, dataLib_selectFiles, - dataLib_deletes + dataLib_deletes, + dataLib_selectDbOverflowDep, + dataLib_selectDepsByIds, + apply_insertApply, + dataLib_selectMetaOverflowDep } from '../../api/api'; import { dataLibView } from '@/api/screen.js' export default { @@ -1125,6 +1322,7 @@ } }; return { + fromfile: { file: '' }, fromSqlflag: false, filedsOption: [], @@ -1229,16 +1427,183 @@ src: '' }, checkedDataType: [], + ruleForm: { + depname: [], + tabs: [], + pwd: null, + repwd: null, + wkt: null, + descr: null, + }, + dialogInsertVisible: false, + dialogVisible1: false, + multipleSelection: [], + dialogInsertFile: false, + fileFrom: { + descr: null, + depid: null, + ids: null, + pwd: null, + depcodes: null + } }; }, - + watch: { + "formInline.depName"() { + this.$refs.treeSelect.visible = false; + }, + }, mounted() { this.getDepTreeData(); this.getCategorySelectData(); this.getItemSelectData(); this.signGetPublicKey(); + this.$bus.$on("setDialogInsertVisible", (res) => { + if (res == true) { + this.dialogVisible1 = true; + } else { + this.setDialogInsertVisible(res); + } + }) }, methods: { + //鏁版嵁搴撴煡璇笅杞� + downloadBankData() { + // downloadLogVisible + + }, + handleCloseDown1() { + this.$confirm("纭鍏抽棴锛�") + .then(_ => { + this.closeDownx(); + }) + .catch(_ => { }) + }, + downloadx() { + this.$bus.$emit("setInsertDown2", this.codeForm) + // + }, + closeDownx() { + this.dialogVisible1 = false; + this.codeForm = { + password: '', + repassword: '', + } + }, + async getInsertDownx() { + + this.dialogInsertVisible = false; + this.dialogVisible1 = false; + this.downloadLogVisible = false; + var obj = null + if (this.dialogMapVisible == true) { + var entities = []; + var tabs = []; + for (var i in this.ruleForm.tabs) { + entities.push(this.ruleForm.tabs[i].entity) + tabs.push(this.ruleForm.tabs[i].tabDesc) + } + var std = []; + for (var i in this.ruleForm.depname) { + std.push(this.ruleForm.depname[i].name) + } + + obj = { + pwd: encr(this.codeForm.password), + entities: entities, + wkt: encr(this.ruleForm.wkt), + filter: null, + ids: null, + depcode: null, + dirs: null, + depcodes: std, + descr: this.ruleForm.descr, + tabs: tabs + } + } else { + var ids = []; + var filter = null; + this.downloadLogVisible = false; + if (this.multipleSelection.length != 0) { + for (var i in this.multipleSelection) { + ids.push(this.multipleSelection[i].gid) + } + filter = null; + } else { + filter = this.listBankData.filter; + ids = null; + } + + var std = []; + for (var i in this.ruleForm.depname) { + std.push(this.ruleForm.depname[i].name) + } + var dirs = null; + if (this.listData.dirs) { + + dirs = this.listData.dirs + } + + obj = { + pwd: encr(this.codeForm.password), + entities: [this.listBankData.name], // bpachydrogeology,bhydrogeologyattach + wkt: null, + filter: filter, + ids: ids, + depcode: this.listData.depcode, + dirs: dirs, + depcodes: std, + descr: this.ruleForm.descr, + tabs: [this.listBankData.title] + } + } + + const data = await apply_insertApply(JSON.stringify(obj)) + if (data.code != 200) { + this.$message.error("鏁版嵁鐢宠澶辫触") + return + } + this.$message({ + message: "鏁版嵁鐢宠鎴愬姛", + type: "success", + }) + this.closeDownx(); + this.closeDown1(); + }, + + closeInsertDown() { + this.ruleForm = { + depname: [], + tabs: [], + pwd: null, + repwd: null, + wkt: null, + descr: null, + } + this.dialogInsertVisible = false + this.closeDown1(); + }, + handleInsertClose() { + this.$confirm("纭鍏抽棴锛�") + .then(_ => { + this.closeInsertDown() + }) + .catch(_ => { }) + }, + setDialogInsertVisible(res) { + this.ruleForm = res; + this.dialogInsertVisible = true; + }, + copyText(row, column, cell, event) { + // 鍙屽嚮澶嶅埗 + let save = function (e) { + e.clipboardData.setData('text/plain', event.target.innerText); + e.preventDefault(); //闃绘榛樿琛屼负 + } + document.addEventListener('copy', save);//娣诲姞涓�涓猚opy浜嬩欢 + document.execCommand("copy");//鎵цcopy鏂规硶 + this.$message({ message: '澶嶅埗鎴愬姛', type: 'success' })//鎻愮ず + }, //鎵归噺涓嬭浇澶嶉�夋chagne handleCheckedDataTypeChange(res) { var std = 0; @@ -1464,10 +1829,13 @@ this.metaDataTable1 = [data.result]; }, getSpaceMapVisibale() { - sgworld.Creator.SimpleGraphic.clear(); - for (var i in this.$store.state.queryInfo) { - sgworld.Viewer.entities.remove(this.$store.state.queryInfo[i]); + if (window.sgworld) { + window.sgworld.Creator.SimpleGraphic.clear(); + for (var i in this.$store.state.queryInfo) { + window.sgworld.Viewer.entities.remove(this.$store.state.queryInfo[i]); + } } + this.$store.state.queryInfo = []; if (this.$store.state.primitLayer != null) { sgworld.Viewer.entities.remove(this.$store.state.primitLayer); @@ -1482,6 +1850,29 @@ this.$store.state.mapPopBoxFlag = null; this.$store.state.download = true; + }, + + handleMaptClose() { + this.dialogMapVisible = false; + this.showMapVisible = false; + this.$store.state.mapMenuBoolean = false; + this.$store.state.mapMenuBoxFlag = null; + this.$store.state.mapPopBoolean = false; + this.$store.state.mapPopBoxFlag = false; + this.$store.state.download = false; + if (window.sgworld) { + window.sgworld.Creator.SimpleGraphic.clear(); + for (var i in this.$store.state.queryInfo) { + window.sgworld.Viewer.entities.remove(this.$store.state.queryInfo[i]); + } + } + + this.$store.state.queryInfo = []; + if (this.$store.state.primitLayer != null) { + sgworld.Viewer.entities.remove(this.$store.state.primitLayer); + sgworld.Creator.DeleteObject(this.$store.state.primitLayer); + this.$store.state.primitLayer = null; + } }, downloadMap(index, rows) { var token = getToken() @@ -1615,32 +2006,74 @@ if (!passwordreg.test(this.codeForm.password)) { return; } + var ids = []; + var filter = null; + this.downloadLogVisible = false; + if (this.multipleSelection.length != 0) { + for (var i in this.multipleSelection) { + ids.push(this.multipleSelection[i].gid) + } + filter = null; + } else { + filter = this.listBankData.filter; + ids = null; + } var obj = { entities: [this.listBankData.name], // bpachydrogeology,bhydrogeologyattach - filter: this.listBankData.filter, + filter: filter, + ids: ids, + wkt: null, pwd: encrypt.encrypt(this.codeForm.password), - depcodes: [this.listData.depcode], + depcode: this.listData.depcode, dirs: this.listData.dirs - }; + const data = await dataLib_selectDbOverflowDep(obj) + if (data.code != 200) { + return + } + if (data.result.length == 0) { + var that = this; + $.ajax({ + url: BASE_URL + "/dataLib/downloadDbData?token=" + getToken(), + type: "POST", + data: JSON.stringify(obj), + dataType: 'json', // html銆乯son銆乯sonp銆乻cript銆乼ext + contentType: "application/json", // "application/x-www-form-urlencoded" + success: (data) => { + if (data.code == 200) { + that.downloadflie(data, this.codeForm.password) - var that = this; - $.ajax({ - url: BASE_URL + "/dataLib/downloadEntityReq?token=" + getToken(), - type: "POST", - data: JSON.stringify(obj), - dataType: 'json', // html銆乯son銆乯sonp銆乻cript銆乼ext - contentType: "application/json", // "application/x-www-form-urlencoded" - success: (data) => { - if (data.code == 200) { - that.downloadflie(data, this.codeForm.password) - + } + }, + error: function (e) { } - }, - error: function (e) { + }); + + } else { + var val = "" + var std = []; + for (var i in data.result) { + if (val == "") { + val += "codes=" + data.result[i] + } else { + val += "&codes=" + data.result[i] + } + + std.push({ + name: data.result[i], + }) } - }); - this.closeDown1(); + + const data1 = await dataLib_selectDepsByIds(val) + this.ruleForm.depid = data1.result + this.ruleForm.depname = std + this.ruleForm.wkt = null + this.ruleForm.tabs = [{ + tabDesc: this.listBankData.title + }] + this.dialogInsertVisible = true + } + // this.closeDown1(); }, downloadflie(data, pwd) { @@ -1648,6 +2081,8 @@ var url = BASE_URL + "/dataLib/downloadFile?token=" + token + "&guid=" + data.result + "&pwd=" + encrypt.encrypt(pwd); $("#downFrame").attr("src", url).click(); this.loading = false; + this.closeDownx(); + this.closeDown1(); }, closeDown1() { this.downloadLogVisible = false; @@ -1679,36 +2114,76 @@ return; } this.passWorldVisible = false; + var password = this.codeForm.repassword var std = []; + var ids = []; for (var i in this.multipleSelection1) { std.push(this.multipleSelection1[i].id) + ids.push(this.multipleSelection1[i].id) } - var obj = { - pwd: encrypt.encrypt(this.codeForm.repassword), - ids: std - }; - const res = await dataLib_downloadReq(JSON.stringify(obj)); + // var obj = { - if (res.code != 200) { - this.$message.error('涓嬭浇璇锋眰澶辫触'); - return - } - - var downObj = { - guid: res.result, - pwd: encodeURIComponent(encrypt.encrypt(this.codeForm.repassword)) - } - - const data = await dataLib_selectDownloadFile(downObj) - if (data.code != 200) { - this.$message.error('涓嬭浇璇锋眰澶辫触'); - return - } - var token = getToken() - var url = BASE_URL + "/dataLib/downloadFile?token=" + token + "&guid=" + res.result + "&pwd=" + encodeURIComponent(encrypt.encrypt(this.codeForm.repassword)); - - $("#downFrame").attr("src", url).click(); + // }; this.closeDown(); + this.closeDownx(); + + + + var obj = { + ids: std, + }; + const data = await dataLib_selectMetaOverflowDep(obj) + if (data.code != 200) { + return + } + if (data.result.length == 0) { + const res = await dataLib_downloadReq(JSON.stringify({ + pwd: encrypt.encrypt(password), + ids: std + })); + if (res.code != 200) { + this.$message.error('涓嬭浇璇锋眰澶辫触'); + return + } + if (!res.result) { + return + } + var downObj = { + guid: res.result, + pwd: encodeURIComponent(encrypt.encrypt(password)) + } + + const data = await dataLib_selectDownloadFile(downObj) + if (data.code != 200) { + this.$message.error('涓嬭浇璇锋眰澶辫触'); + return + } + var token = getToken() + var url = BASE_URL + "/dataLib/downloadFile?token=" + token + "&guid=" + res.result + "&pwd=" + encodeURIComponent(encrypt.encrypt(this.codeForm.repassword)); + $("#downFrame").attr("src", url).click(); + } else { + var val = "" + var std = []; + for (var i in data.result) { + if (val == "") { + val += "codes=" + data.result[i] + } else { + val += "&codes=" + data.result[i] + } + std.push({ + name: data.result[i], + }) + } + const data1 = await dataLib_selectDepsByIds(val) + if (data1.code != 200) { + return + } + this.fileFrom.depid = data1.result + this.fileFrom.ids = ids; + this.fileFrom.pwd = encr(password); + this.fileFrom.depcodes = data.result; + this.dialogInsertFile = true; + } this.monthdata.filter((res) => { return res.ischecked = false; @@ -1720,6 +2195,44 @@ this.codeForm.password = ''; this.codeForm.repassword = ''; }, + + async getFileInsertApply() { + this.dialogInsertFile = false + + var obj = { + ids: this.fileFrom.ids, + pwd: this.fileFrom.pwd, + tabs: ["鍏冩暟鎹〃"], + entities: ["sysmeta"], + descr: this.fileFrom.descr, + depcodes: this.fileFrom.depcodes + }; + + const data = await apply_insertApply(JSON.stringify(obj)) + this.handleInsertFileClose(); + if (data.code != 200) { + this.$message.error("鏁版嵁鐢宠澶辫触") + return + } + this.$message({ + message: "鏁版嵁鐢宠鎴愬姛", + type: "success", + }) + + + }, + handleInsertFileClose() { + this.dialogInsertFile = false + this.fileFrom = { + descr: null, + depid: null, + ids: null, + pwd: null, + depcodes: null + } + }, + + //鏂囦欢涓嬭浇 setCardDownload(res) { // this.multipleSelection1 = []; @@ -1752,8 +2265,8 @@ this.formInline.keywords = "";//楂樼骇鎼滅储 this.getAllTabesData(); }, - handleSelectionChange() { - + handleSelectionChange(val) { + this.multipleSelection = val; }, //鍗$墖璇︽儏鐐瑰嚮浜嬩欢 async setCardDetails(res) { @@ -1768,7 +2281,7 @@ break; } }, - //鑾峰彇鏁版嵁搴撴暟鎹� + //鑾峰彇鏁版嵁搴撴暟鎹甹s getBankTableData(res) { this.listBankData.name = res.entity; this.listBankData.pageIndex = 1; @@ -1816,18 +2329,15 @@ } } for (var i in data.result) { + if (data.result[i].createtime) { data.result[i].createtime = this.format(data.result[i].createtime) } if (data.result[i].updatetime) { data.result[i].updatetime = this.format(data.result[i].updatetime) } - if (data.result[i].createName) { - data.result[i].createuser = data.result[i].createName - } - if (data.result[i].updateName) { - data.result[i].updateuser = data.result[i].updateName - } + data.result[i].createuser = data.result[i].createName + data.result[i].updateuser = data.result[i].updateName if (data.result[i].verName) { data.result[i].verid = data.result[i].verName } @@ -1939,6 +2449,7 @@ //鏍煎紡鍖栨椂闂� format(shijianchuo) { //shijianchuo鏄暣鏁帮紝鍚﹀垯瑕乸arseInt杞崲 + var time = new Date(shijianchuo); var y = time.getFullYear(); var m = time.getMonth() + 1; @@ -1959,6 +2470,10 @@ ':' + s ); + }, + //鏍煎紡鍖栨椂闂� + add0(m) { + return m < 10 ? '0' + m : m; }, //鏍煎紡鍖栧垪琛� formatData(row, column) { @@ -2051,8 +2566,22 @@ //鏌ヨ鏁版嵁搴撴暟鎹� async getQueryBankData() { this.listData.dirs = ""; + this.listData.types = "" if (this.formInline.category.length != 0) { - this.listData.dirs += this.formInline.category.toString(); + // this.listData.dirs += this.formInline.category.toString(); + } + + var val_data = this.formInline.category; + var data_type = [] + if (val_data.length > 0) { + for (var i in val_data) { + for (var j in this.categoryOptions) { + if (this.categoryOptions[j].key == val_data[i]) { + + data_type.push(this.categoryOptions[j].value) + } + } + } } if (this.formInline.item.length != 0) { if (this.listData.dirs.length != 0) { @@ -2062,6 +2591,8 @@ } this.listData.depcode = this.formInline.depcode; this.listData.tab = this.formInline.keywords; + + this.listData.types = data_type.toString(); const data = await dataLib_selectTabs(this.listData); if (data.code != 200) { this.$message.error('鏁版嵁搴撳垪琛ㄨ皟鐢ㄥけ璐�'); @@ -2087,7 +2618,9 @@ this.listData.dirs = ""; if (this.formInline.category.length != 0) { - this.listData.dirs += this.formInline.category.toString(); + this.listData.types = this.formInline.category.toString(); + }else{ + this.listData.types=null; } if (this.formInline.item.length != 0) { if (this.listData.dirs.length != 0) { @@ -2101,6 +2634,7 @@ if (data.code != 200) { this.$message.error('鏂囦欢鏁版嵁鍒楄〃璋冪敤澶辫触'); } + var val = data.result; if (val) { val = val.filter((res) => { @@ -2145,12 +2679,22 @@ }, //鑾峰彇璧勬枡绫诲埆鏁版嵁 async getCategorySelectData() { - const data = await dataLib_selectDirTypes(); - if (data.code != 200) { - this.$message.error('璧勬枡绫诲埆鍒楄〃璋冪敤澶辫触'); - } + // const data = await dataLib_selectDirTypes(); + // if (data.code != 200) { + // this.$message.error('璧勬枡绫诲埆鍒楄〃璋冪敤澶辫触'); + // } - this.categoryOptions = data.result; + this.categoryOptions = [ + {key:'鍩虹娴嬬粯',value:'鍩虹娴嬬粯'}, + {key:'鍩虹鍦扮伨',value:'鍩虹鍦扮伨'}, + {key:'鍩虹鍕樺療',value:'鍩虹鍕樺療'}, + {key:'鍚堣鏁版嵁',value:'鍚堣鏁版嵁'}, + {key:'绠$悊鏁版嵁',value:'绠$悊鏁版嵁'}, + {key:'娴嬬粯锛圗SV锛�',value:'娴嬬粯锛圗SV锛�'}, + {key:'鍕樺療锛圗GE锛�',value:'鍕樺療锛圗GE锛�'}, + {key:'鍦扮伨锛圗GD锛�',value:'鍦扮伨锛圗GD锛�'}, + {key:'娲炲簱锛圗GD锛�',value:'娲炲簱锛圗GD锛�'}, + ]; }, //鍏抽敭瀛楁煡璇� setSearchKeyWords() { -- Gitblit v1.9.3