From a776668a6c8def39e56140ac29e7d9e729332d11 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 23 五月 2023 09:38:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.39:8989/r/LFWEB_NEW

---
 src/components/MapView/mapMenuTop.vue |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/components/MapView/mapMenuTop.vue b/src/components/MapView/mapMenuTop.vue
index dd34abe..41798fe 100644
--- a/src/components/MapView/mapMenuTop.vue
+++ b/src/components/MapView/mapMenuTop.vue
@@ -271,7 +271,7 @@
   },
 
   mounted() {
-    this.menuTopFrom.queryType = "rectangle"
+    // this.menuTopFrom.queryType = "rectangle"
     this.getAllTable()
     this.getPipelineData()
     this.$bus.$on("setExtentBUff", res => {
@@ -389,17 +389,22 @@
     getCheckedNodes() {
       this.layerTabe = [];
       var valTree = this.$refs.tree.getCheckedNodes()
+      var parentIds = this.$refs.tree.getHalfCheckedKeys(true)
       if (valTree.length == 0) return
-
-      this.menuTopFrom.queryLayer = null;
-
-      this.$store.state.propertiesName = valTree[0];
       this.treeChange = [];
+      this.menuTopFrom.queryLayer = null;
+      if (parentIds.length > 0) {
+        this.menuTopFrom.queryLayer = this.$refs.tree.getNode(parentIds[0]).data.label
+      } else {
+        this.menuTopFrom.queryLayer = valTree[0].label
+      }
+      this.$store.state.propertiesName = valTree[0];
+
       for (var i = 0; i < valTree.length; i++) {
         if (valTree[i].entity) {
-          if (!this.menuTopFrom.queryLayer) {
-            this.menuTopFrom.queryLayer = valTree[i].tabDesc;
-          }
+          // if (!this.menuTopFrom.queryLayer) {
+          //   this.menuTopFrom.queryLayer = valTree[i].tabDesc;
+          // }
           this.layerTabe.push(valTree[i])
           // this.treeChange.push(valTree[i])
         }

--
Gitblit v1.9.3