From 5a4c6108b5c30d22d41d614c6212711607920c92 Mon Sep 17 00:00:00 2001
From: WX <1377869194@qq.com>
Date: 星期五, 08 九月 2023 14:26:20 +0800
Subject: [PATCH] 1
---
src/views/menus.vue | 15 +++++++++++++--
src/assets/js/menuTool.js | 4 ++++
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/assets/js/menuTool.js b/src/assets/js/menuTool.js
index dfe518d..4e64359 100644
--- a/src/assets/js/menuTool.js
+++ b/src/assets/js/menuTool.js
@@ -127,6 +127,8 @@
window.sgworld.Core.postMessage({ TypeG1: "Delete" });
this.delLine();
store.commit("getWGobj", null);
+ window.sgworld.Core.postMessage({ TypeG1: "End" });
+
break;
case "b2": //瓒呮爣鐐归娴嬫竻闄�
window.sgworld.Core.postMessage({ TypeG1: "Delete" });
@@ -138,6 +140,7 @@
break;
case "b4": //姹℃煋鐗╂墿鏁ｈ秼鍔挎竻闄�
window.sgworld.Core.postMessage({ TypeG1: "End" });
+
break;
case "c1": //棰勮淇℃伅娓呴櫎鎶ヨ淇℃伅娓呴櫎
this.closePoi();
@@ -176,6 +179,7 @@
break;
case "d3": //姹℃煋鐗╂ā鎷熸竻闄�
this.delWRW();
+
break;
case "d4": //鐩戞帶鐐逛綅娓呴櫎
this.closePoi();
diff --git a/src/views/menus.vue b/src/views/menus.vue
index 8e35d1b..1921875 100644
--- a/src/views/menus.vue
+++ b/src/views/menus.vue
@@ -62,12 +62,14 @@
const setMenuClick = (res) => {
if (checkMenuFlag.value && checkMenuFlag.value == res.id) {
checkMenuFlag.value = null;
+
if (childMenuOptions.value != null) {
if (childMenuOptions.value[0] == res.id[0]) {
childMenuOptions.value = null;
emit("menusData", { id: null, isActive: false });
menuTool.clearLeftTools(res);
}
+
if (checkMenuChildFlag.value != null) {
if (checkMenuChildFlag.value[0] == res.id[0]) {
checkMenuChildFlag.value = null;
@@ -78,10 +80,19 @@
}
res.isActive = false;
} else {
+ if (childMenuOptions.value != null) {
+ menuTool.clearLeftTools({ id: childMenuOptions.value });
+
+ emit("menusData", { id: null, isActive: false });
+ childMenuOptions.value = null;
+ if (checkMenuChildFlag.value != null) {
+ menuTool.clearLeftTools({ id: checkMenuChildFlag.value });
+ checkMenuChildFlag.value = null;
+ }
+ }
+ // menuTool.thematicTools(res);
checkMenuFlag.value = res.id;
res.isActive = true;
-
- // menuTool.thematicTools(res);
}
emit("menusData", res);
};
--
Gitblit v1.9.3