From 7a77a5bac194bfd6a85dc80bebc5281fe322779b Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期五, 21 四月 2023 17:33:33 +0800
Subject: [PATCH] 在线制图,空间查询修改

---
 src/views/exportMap/index.vue         |    4 ++--
 src/components/MapView/mapMenuTop.vue |   12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/MapView/mapMenuTop.vue b/src/components/MapView/mapMenuTop.vue
index a37712b..dd34abe 100644
--- a/src/components/MapView/mapMenuTop.vue
+++ b/src/components/MapView/mapMenuTop.vue
@@ -266,6 +266,7 @@
       dialogExtentVisible: false,
       setExtent: 10,
       wktExtent: null,
+      layerTabe: [],
     }
   },
 
@@ -386,7 +387,7 @@
     },
     //鑾峰彇閫夋嫨鏍戠殑鑺傜偣
     getCheckedNodes() {
-
+      this.layerTabe = [];
       var valTree = this.$refs.tree.getCheckedNodes()
       if (valTree.length == 0) return
 
@@ -399,7 +400,8 @@
           if (!this.menuTopFrom.queryLayer) {
             this.menuTopFrom.queryLayer = valTree[i].tabDesc;
           }
-          // this.treeChange.push(valTree[i].tabDesc)
+          this.layerTabe.push(valTree[i])
+          // this.treeChange.push(valTree[i])
         }
 
       }
@@ -410,6 +412,7 @@
       this.getAllTable()
       this.$refs.tree.setCheckedKeys([]);
       this.treeChange = []
+      this.layerTabe = []
       this.menuTopFrom.queryLayer = null
 
     },
@@ -480,7 +483,7 @@
 
 
 
-      if (this.treeChange.length == 0) {
+      if (this.layerTabe.length == 0) {
         this.$message.error("璇烽�夋嫨瑕佹煡璇㈢殑鏁版嵁")
         return
       }
@@ -588,7 +591,7 @@
       this.showMapMenuPop()
     },
     showMapMenuPop() {
-      this.$store.state.mapSpaceQueryLayer = this.treeChange
+      this.$store.state.mapSpaceQueryLayer = this.layerTabe
       this.$store.state.mapPopBoxFlag = "1"
       this.$refs && this.$refs.queryinfo && this.$refs.queryinfo.close()
       this.$refs &&
@@ -619,6 +622,7 @@
       this.clearBufferEntities()
       this.$refs.pathClear.value = ""
       this.treeChange = []
+      this.layerTabe = []
       this.menuTopFrom.queryLayer = null
       this.menuTopFrom.queryType = "rectangle"
       this.$refs.tree.setCheckedKeys([])
diff --git a/src/views/exportMap/index.vue b/src/views/exportMap/index.vue
index 67f5c99..ed7d7bc 100644
--- a/src/views/exportMap/index.vue
+++ b/src/views/exportMap/index.vue
@@ -375,9 +375,9 @@
       for (var i in res) {
         var str = res[i];
 
-        if (str.type == 1 && this.layername.indexOf(str.id) != -1) {
+        if (str.type == 1 && str.icon == 1) {
           val.push(str)
-        } else if (str.url != null && str.type == 2 && this.layername.indexOf(str.pid) != -1) {
+        } else if (str.url != null && str.type == 2 && str.icon == 1) {
           if (str.isShow == 1) {
 
             std.push(str.id)

--
Gitblit v1.9.3