From 7af2c4cc72a9af5d70e19c601f61e0a32afb8a56 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期二, 16 三月 2021 19:36:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/panel/ToolBoxPanel.vue | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index bb64c7d..c104103 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -51,9 +51,15 @@
import polygonJ from '@assets/images/map-pages/icon/toolbox/polygon.png'
import polygonS from '@assets/images/map-pages/icon/toolbox/ju.png'
import polygonY from '@assets/images/map-pages/icon/toolbox/circle.png'
+import del from '@assets/images/map-pages/icon/toolbox/del.png'
+
+// 閫変腑鐨勫唴瀹瑰浘鐗�
+import distanceChoose from '@assets/images/map-pages/icon/toolbox/biaohuimark/juliceliangmark.png'
+import mmChoose from '@assets/images/map-pages/icon/toolbox/biaohuimark/mianjiceliangmark.png'
+import delChoose from '@assets/images/map-pages/icon/toolbox/biaohuimark/shanchu.png'
// 娴嬮噺
-import distance from '@assets/images/map-pages/icon/toolbox/juli.png'
+import distance from '@assets/images/map-pages/icon/toolbox/jusli.png'
import mm from '@assets/images/map-pages/icon/toolbox/M2.png'
// 娴嬮噺鐨勬柟娉�
@@ -114,13 +120,22 @@
index: '3-1',
label: '璺濈',
icon: distance,
- title: '璺濈娴嬮噺'
+ title: '璺濈娴嬮噺',
+ iconChoose: distanceChoose
},
{
index: '3-2',
label: '闈㈢Н',
icon: mm,
- title: '闈㈢Н娴嬮噺'
+ title: '闈㈢Н娴嬮噺',
+ iconChoose: mmChoose
+ },
+ {
+ index: '3-3',
+ label: '娓呴櫎',
+ icon: del,
+ title: '娓呴櫎娴嬮噺',
+ iconChoose: delChoose
}
]
},
@@ -189,6 +204,7 @@
],
selectGroup: false,
drawLayer: null,
+ Draw: null,
map: null,
L: window.L,
active: 0
@@ -261,6 +277,9 @@
case '闈㈢Н':
Measure.startMeasureArea(this.map, this.L)
break
+ case '娓呴櫎':
+ Measure.clearMeasure(this.map, this.L)
+ break
case '鍏ㄥ睆':
// this.map.toggleFullscreen()
var printer = this.L.easyPrint({
--
Gitblit v1.8.0