From 404cfaf59af1ba31f4b59685eea218c309a18f22 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期五, 17 三月 2023 15:56:08 +0800
Subject: [PATCH] 综合展示属性管理气泡，弹窗翻译，资料馆数据库文件下载修改
---
src/components/MapView/mapSpaceTop.vue | 10 +-
src/api/api.js | 7 ++
src/views/Archive/index.vue | 2
src/components/MapView/mapMenuPop.vue | 35 +++++++++++
src/components/MapView/mapSpacePop.vue | 101 ++++++++++++++++++++++++++++++++-
src/views/datamanage/SpatialData.vue | 4 +
6 files changed, 149 insertions(+), 10 deletions(-)
diff --git a/src/api/api.js b/src/api/api.js
index a674e1a..8f1bff2 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -695,6 +695,13 @@
export function dataLib_selectTabs(params) {
return request.get('/dataLib/selectTabsByPage', { params: params });
}
+
+//璧勬枡棣�=>鏌ヨ鎵�鏈夎〃鏍�
+export function dataLib_selectTabed(params) {
+ return request.get('/dataLib/selectTabs', { params: params });
+}
+
+
//璧勬枡棣�=>鏌ヨ鎵�鏈夎〃鏍�
export function dataLib_selectFields(params) {
return request.get('/dataLib/selectFields', { params: params });
diff --git a/src/components/MapView/mapMenuPop.vue b/src/components/MapView/mapMenuPop.vue
index bb86547..fc0a573 100644
--- a/src/components/MapView/mapMenuPop.vue
+++ b/src/components/MapView/mapMenuPop.vue
@@ -655,6 +655,7 @@
}
})
})
+
this.$store.state.propertiesInfo = obj
}
}, Cesium.ScreenSpaceEventType.LEFT_CLICK)
@@ -697,7 +698,39 @@
}
}
this.pageCount = data.count
- this.tableData = data.result
+
+
+ var val = data.result;
+ val = val.filter((res) => {
+
+ if (res.dirName) {
+ res.dirid = res.dirName
+ }
+ if (res.depName) {
+ res.depid = res.depName
+ }
+ if (res.verName) {
+ res.verid = res.verName
+ }
+ if (res.updateName) {
+ res.updateuser = res.updateName
+ }
+ if (res.createName) {
+ res.createuser = res.createName
+ }
+
+ if (res.createtime) {
+ res.createtime = this.format(res.createtime)
+ }
+ if (res.updatetime) {
+ res.createtime = this.format(res.updatetime)
+ }
+ return res
+ })
+
+
+
+ this.tableData = val
this.$refs.dialogPayChannel.doLayout()
// this.showAllImage(data.result)
},
diff --git a/src/components/MapView/mapSpacePop.vue b/src/components/MapView/mapSpacePop.vue
index bf678b0..adf8158 100644
--- a/src/components/MapView/mapSpacePop.vue
+++ b/src/components/MapView/mapSpacePop.vue
@@ -399,6 +399,35 @@
if (data.code != 200) {
this.$message.error("鍒楄〃璋冪敤澶辫触")
}
+ var val = data.result;
+ val = val.filter((res) => {
+
+ if (res.dirName) {
+ res.dirid = res.dirName
+ }
+ if (res.depName) {
+ res.depid = res.depName
+ }
+ if (res.verName) {
+ res.verid = res.verName
+ }
+ if (res.updateName) {
+ res.updateuser = res.updateName
+ }
+ if (res.createName) {
+ res.createuser = res.createName
+ }
+
+ if (res.createtime) {
+ res.createtime = this.format(res.createtime)
+ }
+ if (res.updatetime) {
+ res.createtime = this.format(res.updatetime)
+ }
+ return res
+ })
+
+
var val_Data = data.result
this.count = data.count
@@ -413,7 +442,9 @@
}
}
}
- this.tableData = data.result
+
+
+ this.tableData = val
this.$refs.filterTable.doLayout()
},
@@ -445,6 +476,7 @@
this.listdata.wkt = encr(wkt)
const data = await dataQuerySelectByPage(this.listdata)
+
if (data.code != 200) {
return this.$message.error("鍒楄〃璋冪敤澶辫触")
}
@@ -453,11 +485,46 @@
message: '鏈煡璇㈠埌杞瓟鐐规暟鎹�',
type: 'warning'
});
+ } else {
+ this.$message({
+ message: '鏌辩姸鍥炬煡璇㈡垚鍔�',
+ type: 'success'
+ });
}
+ var val = data.result;
+ val = val.filter((res) => {
+
+ if (res.dirName) {
+ res.dirid = res.dirName
+ }
+ if (res.depName) {
+ res.depid = res.depName
+ }
+ if (res.verName) {
+ res.verid = res.verName
+ }
+ if (res.updateName) {
+ res.updateuser = res.updateName
+ }
+ if (res.createName) {
+ res.createuser = res.createName
+ }
+
+ if (res.createtime) {
+ res.createtime = this.format(res.createtime)
+ }
+ if (res.updatetime) {
+ res.createtime = this.format(res.updatetime)
+ }
+ return res
+ })
+
+
this.listdata.count = data.count;
- this.tableData = data.result;
- this.$refs.filterTable.doLayout();
+ this.tableData = val;
+
this.showHistogramLayer(data.count)
+ this.$refs.filterTable.doLayout();
var that = this;
window.histogramHandler = new Cesium.ScreenSpaceEventHandler(
@@ -843,6 +910,7 @@
this.setMapHandler()
},
setMapHandler() {
+ var that = this;
window.propertieshandler = new Cesium.ScreenSpaceEventHandler(
sgworld.Viewer.scene.canvas
)
@@ -867,11 +935,38 @@
}
})
})
+ if (obj['鏇存柊鏃堕棿']) {
+ obj['鏇存柊鏃堕棿'] = that.format(obj['鏇存柊鏃堕棿'])
+ }
+ if (obj['鍒涘缓鏃堕棿']) {
+
+
+ obj['鍒涘缓鏃堕棿'] = that.format(obj['鍒涘缓鏃堕棿'])
+ }
+
this.$store.state.propertiesInfo = obj
}
}, Cesium.ScreenSpaceEventType.LEFT_CLICK)
},
+ //鏍煎紡鍖栨椂闂�
+ format(shijianchuo) {
+ //shijianchuo鏄暣鏁帮紝鍚﹀垯瑕乸arseInt杞崲
+ var time = new Date(shijianchuo);
+ var y = time.getFullYear();
+ var m = time.getMonth() + 1;
+ var d = time.getDate();
+ var h = time.getHours();
+ var mm = time.getMinutes();
+ var s = time.getSeconds();
+ return y + "-" + this.add0(m) + "-" + this.add0(d);
+ },
+ //鏍煎紡鍖栨椂闂�
+ add0(m) {
+ return m < 10 ? "0" + m : m;
+ },
+
},
+
destroyed() {
this.$store.state.propertiesFlag = null
if (window.propertieshandler != null && Cesium.defined(window.propertieshandler)) {
diff --git a/src/components/MapView/mapSpaceTop.vue b/src/components/MapView/mapSpaceTop.vue
index 71d8dfb..5cf19ac 100644
--- a/src/components/MapView/mapSpaceTop.vue
+++ b/src/components/MapView/mapSpaceTop.vue
@@ -58,7 +58,7 @@
<script>
import queryinfo from "../../views/Tools/queryinfo.vue";
-import { inquiry_SelectTabs, dataLib_selectTabs } from "../../api/api.js";
+import { inquiry_SelectTabs, dataLib_selectTabed } from "../../api/api.js";
export default {
components: { queryinfo },
data() {
@@ -95,9 +95,9 @@
methods: {
async getAllTable() {
// const data = await inquiry_SelectTabs();
- const data = await dataLib_selectTabs({
- pageIndex: 1,
- pageSize: 500,
+ const data = await dataLib_selectTabed({
+ hasGeom: "false",
+ name: null,
});
if (data.code != 200) {
@@ -150,7 +150,7 @@
menuTreeCheck(value) {
this.mapSpaceQueryLayer = value;
this.layerData.forEach(item => {
- if (this.menuTopFrom.queryLayer == item.entity){
+ if (this.menuTopFrom.queryLayer == item.entity) {
this.$store.state.propertiesName = item;
}
})
diff --git a/src/views/Archive/index.vue b/src/views/Archive/index.vue
index fa25dfa..631c2a4 100644
--- a/src/views/Archive/index.vue
+++ b/src/views/Archive/index.vue
@@ -1617,7 +1617,7 @@
}
var obj = {
entities: [this.listBankData.name], // bpachydrogeology,bhydrogeologyattach
- filter: this.formInline.filter,
+ filter: this.listBankData.filter,
pwd: encrypt.encrypt(this.codeForm.password),
depcodes: [this.listData.depcode],
dirs: this.listData.dirs
diff --git a/src/views/datamanage/SpatialData.vue b/src/views/datamanage/SpatialData.vue
index b89b79f..3fed848 100644
--- a/src/views/datamanage/SpatialData.vue
+++ b/src/views/datamanage/SpatialData.vue
@@ -738,12 +738,16 @@
for (var j in res_val) {
if (res_val[j].domainNa != null && res_val[j].domainNa != undefined) {
+
val_Data[res_val[j].field] = res_val[j].domainNa;
}
}
}
this.attributeTable = data.result;
+ this.$nextTick(() => {
+ this.$resfs.refAttributeTable.doLayout()
+ });
},
--
Gitblit v1.9.3