From e0346e64f4f0451086f5888266cae7368151af75 Mon Sep 17 00:00:00 2001
From: 584911253@qq.com <584911253@qq.com>
Date: 星期五, 17 三月 2023 15:57:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/MapView/mapMenuPop.vue | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
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)
},
--
Gitblit v1.9.3