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 | 275 +++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 239 insertions(+), 36 deletions(-) diff --git a/src/views/Archive/index.vue b/src/views/Archive/index.vue index 4c71eac..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" @@ -244,11 +246,13 @@ <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" @@ -256,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> @@ -840,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> @@ -1131,7 +1138,7 @@ <el-button class="primary" size="small" - @click="getInsertDown" + @click="getInsertDownx" >{{ $t("common.confirm") }}</el-button> @@ -1197,6 +1204,59 @@ </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="" @@ -1232,7 +1292,8 @@ dataLib_deletes, dataLib_selectDbOverflowDep, dataLib_selectDepsByIds, - apply_insertApply + apply_insertApply, + dataLib_selectMetaOverflowDep } from '../../api/api'; import { dataLibView } from '@/api/screen.js' export default { @@ -1377,9 +1438,21 @@ 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(); @@ -1407,7 +1480,7 @@ .catch(_ => { }) }, downloadx() { - this.$bus.$emit("setInsertDown", this.codeForm) + this.$bus.$emit("setInsertDown2", this.codeForm) // }, closeDownx() { @@ -1417,7 +1490,7 @@ repassword: '', } }, - async getInsertDown() { + async getInsertDownx() { this.dialogInsertVisible = false; this.dialogVisible1 = false; @@ -1434,6 +1507,7 @@ for (var i in this.ruleForm.depname) { std.push(this.ruleForm.depname[i].name) } + obj = { pwd: encr(this.codeForm.password), entities: entities, @@ -1466,8 +1540,10 @@ } var dirs = null; if (this.listData.dirs) { + dirs = this.listData.dirs } + obj = { pwd: encr(this.codeForm.password), entities: [this.listBankData.name], // bpachydrogeology,bhydrogeologyattach @@ -1775,6 +1851,29 @@ 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() var url = BASE_URL + "/dataLib/downloadFile?token=" + token + "&guid=" + rows.guid + "&pwd=" + rows.pwd; @@ -1919,8 +2018,6 @@ filter = this.listBankData.filter; ids = null; } - - var obj = { entities: [this.listBankData.name], // bpachydrogeology,bhydrogeologyattach filter: filter, @@ -2019,39 +2116,74 @@ 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(password), - ids: std - }; + // var obj = { + + // }; this.closeDown(); this.closeDownx(); - const res = await dataLib_downloadReq(JSON.stringify(obj)); - 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) + + var obj = { + ids: std, + }; + const data = await dataLib_selectMetaOverflowDep(obj) 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)); + 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)) + } - $("#downFrame").attr("src", url).click(); - + 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; @@ -2063,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 = []; @@ -2279,6 +2449,7 @@ //鏍煎紡鍖栨椂闂� format(shijianchuo) { //shijianchuo鏄暣鏁帮紝鍚﹀垯瑕乸arseInt杞崲 + var time = new Date(shijianchuo); var y = time.getFullYear(); var m = time.getMonth() + 1; @@ -2299,6 +2470,10 @@ ':' + s ); + }, + //鏍煎紡鍖栨椂闂� + add0(m) { + return m < 10 ? '0' + m : m; }, //鏍煎紡鍖栧垪琛� formatData(row, column) { @@ -2391,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) { @@ -2402,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('鏁版嵁搴撳垪琛ㄨ皟鐢ㄥけ璐�'); @@ -2427,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) { @@ -2486,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