From 7a8747bc51caf48afcc1e5b41be9eb27d8deb728 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期四, 16 三月 2023 10:04:44 +0800
Subject: [PATCH] 资料馆翻译，标绘功能修改
---
src/views/Archive/index.vue | 20 ++++++++++++++++++--
src/views/Synthesis/LeftMenu.vue | 9 ++++++---
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/src/views/Archive/index.vue b/src/views/Archive/index.vue
index 23f173a..fa25dfa 100644
--- a/src/views/Archive/index.vue
+++ b/src/views/Archive/index.vue
@@ -1816,13 +1816,29 @@
}
}
for (var i in data.result) {
- if (data.result[i].createtime != null) {
+ if (data.result[i].createtime) {
data.result[i].createtime = this.format(data.result[i].createtime)
}
- if (data.result[i].updatetime != null) {
+ 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
+ }
+ if (data.result[i].verName) {
+ data.result[i].verid = data.result[i].verName
+ }
+ if (data.result[i].depName) {
+ data.result[i].depid = data.result[i].depName
+ }
+ if (data.result[i].dirName) {
+ data.result[i].dirid = data.result[i].dirName
+ }
}
+
this.listBankData.count = data.count;
this.tableData = data.result;
diff --git a/src/views/Synthesis/LeftMenu.vue b/src/views/Synthesis/LeftMenu.vue
index be8092f..4cf4a26 100644
--- a/src/views/Synthesis/LeftMenu.vue
+++ b/src/views/Synthesis/LeftMenu.vue
@@ -691,7 +691,6 @@
}
this.$store.state.propertiesFlag = '';
- Viewer.entities.removeAll();
if (this.isMenuFlag != val) {
if (res.id != "b9") {
@@ -699,7 +698,7 @@
this.$store.state.mapMenuBoxFlag = null;
this.$store.state.mapPopBoolean = false;
this.$store.state.mapPopBoxFlag = null;
- sgworld.Creator.SimpleGraphic.clear();
+
this.isMenuFlag = val;
if (this.entityaLayers.length != 0) {
for (var i in this.entityaLayers) {
@@ -719,7 +718,10 @@
}
}
this.showTwoMenuFlag = res.id;
-
+ if (val != 'h') {
+ sgworld.Creator.SimpleGraphic.clear();
+ Viewer.entities.removeAll();
+ }
switch (val) {
case "a": //鍥惧眰绠＄悊
this.setCoverage(res.id);
@@ -749,6 +751,7 @@
}
},
setPlot(res) {
+
switch (res) {
case "h1":
sgworld.Creator.createSimpleGraphic(
--
Gitblit v1.9.3