From 076cd08a4abcae33957e4de5b15babfcb6fed8ce Mon Sep 17 00:00:00 2001
From: Jin Lei <jinlei_182@163.com>
Date: 星期六, 11 十一月 2023 15:32:39 +0800
Subject: [PATCH] [viewer]解决合并冲突
---
src/components/menu/tools/special.vue | 19 +++----------------
1 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/src/components/menu/tools/special.vue b/src/components/menu/tools/special.vue
index 2977cfe..7ecf400 100644
--- a/src/components/menu/tools/special.vue
+++ b/src/components/menu/tools/special.vue
@@ -65,7 +65,7 @@
<el-button> <img src="@/assets/img/left/ztfx/yqfk.png" /> </el-button
></el-tooltip>
</div>
- <div class="specialTool" @click="kuangxuan()">
+ <div class="specialTool" @click="rangeQuery()">
<el-tooltip
class="item"
effect="dark"
@@ -474,7 +474,7 @@
yqfkHandle() {
this.setYqfk(!this.yqfk);
},
- kuangxuan() {
+ rangeQuery() {
Bus.$emit("showRangeBox", true);
},
tdglHandle() {
@@ -807,20 +807,7 @@
});
});
},
- spjkHandle() {
- if (window.sxtkGeojson) {
- window.sxtkGeojson.deleteObject();
- window.sxtkGeojson = null;
- window.sxthandler.destroy();
- //鍏抽棴寮圭獥
- Bus.$emit("closeRightPop", true);
- layuiLayer.close(SmartEarthPopupData.layerProp);
- return;
- } else {
- Bus.$emit("showSPJK");
- // this.spjkLoad();
- }
- },
+
handleCommand(command) {
switch (command) {
case "qytj":
--
Gitblit v1.9.3