From 13f87b980adfcaa0a3f5b0854c75bdc7deec8301 Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期六, 25 二月 2023 09:35:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/Synthesis/LeftMenu.vue | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/views/Synthesis/LeftMenu.vue b/src/views/Synthesis/LeftMenu.vue
index eb8c182..22bdc1d 100644
--- a/src/views/Synthesis/LeftMenu.vue
+++ b/src/views/Synthesis/LeftMenu.vue
@@ -401,10 +401,6 @@
methods: {
//浜岀礆鑿滃崟鐐瑰嚮鍒囨崲
setChangeTwoMenu(res) {
- this.$store.state.mapMenuBoolean = false;
- this.$store.state.mapMenuBoxFlag = null;
- this.$store.state.mapPopBoolean = false;
- this.$store.state.mapPopBoxFlag = null;
var val = res.id[0];
if (window.model != null) {
window.model.deleteObject();
@@ -414,7 +410,12 @@
if (this.isMenuFlag == "d") {
this.clearAllAnalsy();
}
+
if (this.isMenuFlag != val) {
+ this.$store.state.mapMenuBoolean = false;
+ 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) {
@@ -1104,11 +1105,11 @@
setIquery(res) {
switch (res) {
case "e2":
- this.$store.state.mapMenuBoolean = true;
+ this.$store.state.mapMenuBoolean = !this.$store.state.mapMenuBoolean;
this.$store.state.mapMenuBoxFlag = "1";
break;
case "e1":
- this.$store.state.mapMenuBoolean = true;
+ this.$store.state.mapMenuBoolean = !this.$store.state.mapMenuBoolean;
this.$store.state.mapMenuBoxFlag = "2";
break;
}
@@ -1456,7 +1457,13 @@
setWander(res) {
switch (res) {
case "c1":
- window.sgworld.Analysis.setPointFly();
+ if (window.PointMY != null) {
+ window.PointMY.drawHandler && window.PointMY.drawHandler.destroy();
+ window.PointMY.end && window.PointMY.end();
+ window.PointMY = null;
+ } else {
+ window.PointMY = window.sgworld.Analysis.setPointFly();
+ }
break;
case "c2":
var url = window.location.href;
@@ -1628,7 +1635,7 @@
font-family: Microsoft YaHei;
font-weight: 400;
border: 1px solid rgba(0, 0, 0, 0);
- padding: 10px;
+ padding: 5px;
min-width: 100px;
margin-left: 10px;
margin-top: 10px;
@@ -1649,8 +1656,8 @@
}
.menuTwoImage {
- width: 40px;
- height: 40px;
+ width: 30px;
+ height: 30px;
display: inline-block;
}
}
--
Gitblit v1.9.3