From 22fcbf0a9ed8e0a2df9695859d7a52d1dd55b386 Mon Sep 17 00:00:00 2001
From: TreeWish <1131093754@qq.com>
Date: 星期四, 09 二月 2023 10:35:39 +0800
Subject: [PATCH] 解决冲突
---
src/components/MapView/mapMenuTop.vue | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/components/MapView/mapMenuTop.vue b/src/components/MapView/mapMenuTop.vue
index 7c76f40..bbd2eb2 100644
--- a/src/components/MapView/mapMenuTop.vue
+++ b/src/components/MapView/mapMenuTop.vue
@@ -206,6 +206,7 @@
this.treeChange = [];
this.menuTopFrom.queryLayer = null;
this.$refs.tree.setCheckedKeys([]);
+
},
//瀵煎叆shp鏂囦欢
async setMenuTopFile() {
@@ -368,7 +369,7 @@
});
this.$bus.$emit('changeMapMenuTop', 'true');
sgworld.Creator.SimpleGraphic.edit(false, { editProp: false });
- sgworld.Creator.SimpleGraphic.clear();
+ // sgworld.Creator.SimpleGraphic.clear();
//娓呯┖inputFile
// var file = document.getElementById('getMenuTopFile');
// file.outerHTML = file.outerHTML;
@@ -380,7 +381,22 @@
this.menuTopFrom.queryLayer = null;
this.menuTopFrom.queryType = 'rectangle';
this.$refs.tree.setCheckedKeys([]);
- sgworld.Creator.SimpleGraphic.clear();
+
+
+ // //娓呴櫎瀵硅薄
+ // if (window.Viewer.scene.primitives.length != null) {
+ // window.Viewer.scene.primitives.removeAll();
+ // }
+ // if (this.$store.state.primitLayer != null) {
+ // sgworld.Creator.DeleteObject(this.$store.state.primitLayer);
+ // this.$store.state.primitLayer = null;
+ // }
+ //鍏抽棴绐楀彛
+ this.$refs && this.$refs.queryinfo && this.$refs.queryinfo.close("queryinfo");
+
+
+
+
},
setCartesianToEightFour(res) {
var std = {};
--
Gitblit v1.9.3