From 97a7d4a2a256b9171bca05e69d154996645b4722 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 16 三月 2021 10:29:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/components/panel/ToolBoxPanel.vue | 134 +++++++++++++++++++++++++++++++-------------
1 files changed, 94 insertions(+), 40 deletions(-)
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 1bc1804..8433648 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -2,24 +2,24 @@
<div class="left-top-toolbox-panel">
<div class="specific-tools">
<el-button @click="changeSelect">
- <!-- <i class="el-icon-s-tools"></i>-->
<img src="@assets/images/map-pages/icon/toolbox/tool.png" alt="">
<span>宸ュ叿</span>
</el-button>
<el-row v-show="selectGroup" class="specific-tools-group">
<el-popover
placement="bottom"
- width="200"
+ width=""
trigger="click"
:popper-class="'tools-panel-content'"
v-for="(item,index) in menuList" :key="index"
>
- <el-button slot="reference" class="tools-panel-choose">
+ <el-button slot="reference" class="el-button" :class="active === index ? 'tools-panel-choose':''"
+ @click="changeChoose(index)">
<img :src="item.icon" alt=""/>
<span>{{ item.label }}</span>
</el-button>
- <el-button v-for="(itemT,indexT) in item.items" :key="indexT">
- <i class="el-icon-s-tools"></i>
+ <el-button v-for="(itemT,indexT) in item.items" :key="indexT" @click="choiceItem(itemT)">
+ <img :src="itemT.icon" alt=""/>
</el-button>
</el-popover>
</el-row>
@@ -31,19 +31,29 @@
</template>
<script>
-import circle from '@assets/images/map-pages/icon/toolbox/biaohui.png'
-import location from '@assets/images/map-pages/icon/toolbox/celiang1.png'
-import polygon from '@assets/images/map-pages/icon/toolbox/ditu.png'
+import plot from '@assets/images/map-pages/icon/toolbox/biaohui.png'
+import polygon from '@assets/images/map-pages/icon/toolbox/celiang1.png'
+import location from '@assets/images/map-pages/icon/toolbox/ditu.png'
import fullscreen from '@assets/images/map-pages/icon/toolbox/xiazai.png'
-// import square from '@/assets/images/map-pages/icon/toolbox/square.png'
+// 鏍囩粯鐨勫彲閫夋嫨鏁版嵁
+import marker from '@assets/images/map-pages/icon/toolbox/map.png'
+import line from '@assets/images/map-pages/icon/toolbox/line.png'
+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 distance from '@assets/images/map-pages/icon/toolbox/juli.png'
+import mm from '@assets/images/map-pages/icon/toolbox/M2.png'
+
// 娴嬮噺鐨勬柟娉�
+import Measure from '@/components/plugin/MeaSure'
// import '@/components/plugin/leaflet-measure-path/leaflet-measure-path.css'
-// import Measure from '@/components/plugin/MeaSure'
-// 鏍囨敞鐨勬柟娉�
-// import MakeTation from '@components/plugin/MakeTation'
// 灏佽鐨勯�夋嫨寮规
// import BaseNavMenuItem from '@components/panel/BaseNavMenuItem'
+// 鏍囨敞鐨勬柟娉�
+// import MakeTation from '@components/plugin/MakeTation'
export default {
name: 'ToolBoxPanel',
@@ -52,29 +62,34 @@
return {
menuList: [
{
- icon: circle,
+ icon: plot,
label: '鏍囩粯',
index: '1',
items: [
{
index: '1-1',
- label: '鐐规爣缁�'
+ label: '鐐规爣缁�',
+ icon: marker
},
{
index: '1-2',
- label: '绾挎爣缁�'
- },
- {
- index: '1-3',
- label: '鍦嗗舰'
+ label: '绾挎爣缁�',
+ icon: line
},
{
index: '1-4',
- label: '澶氳竟褰�'
+ label: '澶氳竟褰�',
+ icon: polygonJ
},
{
index: '1-5',
- label: '鐭╁舰'
+ label: '鐭╁舰',
+ icon: polygonS
+ },
+ {
+ index: '1-3',
+ label: '鍦嗗舰',
+ icon: polygonY
}
]
},
@@ -85,11 +100,13 @@
items: [
{
index: '3-1',
- label: '璺濈'
+ label: '璺濈',
+ icon: distance
},
{
index: '3-2',
- label: '闈㈢Н'
+ label: '闈㈢Н',
+ icon: mm
}
]
},
@@ -150,14 +167,49 @@
]
}
],
- isCollapse: false,
selectGroup: false,
drawLayer: null,
map: null,
- L: window.L
+ L: window.L,
+ active: 0
}
},
methods: {
+ changeChoose (index) {
+ this.active = index
+ },
+ choiceItem (itemT) {
+ console.log(itemT.label)
+ switch (itemT.label) {
+ case '鐐规爣缁�':
+ // MakeTation.StartPointAnnotation(this.map, this.L)
+ this.drawLayer = this.map.editTools.startMarker()
+ this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
+ break
+ case '绾挎爣缁�':
+ this.drawLayer = this.map.editTools.startPolyline()
+ this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
+ break
+ case '澶氳竟褰�':
+ this.drawLayer = this.map.editTools.startPolygon()
+ this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
+ break
+ case '鐭╁舰':
+ this.drawLayer = this.map.editTools.startRectangle()
+ this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
+ break
+ case '鍦嗗舰':
+ this.drawLayer = this.map.editTools.startCircle()
+ this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
+ break
+ case '璺濈':
+ Measure.startMeasureLen(this.map, this.L)
+ break
+ case '闈㈢Н':
+ Measure.startMeasureArea(this.map, this.L)
+ break
+ }
+ },
// handleSelect (index) {
// console.log(index)
// switch (index) {
@@ -223,9 +275,6 @@
// }
// },
// 鏂囧瓧鏍囨敞鎺у埗
- gitBounced (params) {
- this.bouncedText = params
- },
// 宸︿笂鍔熻兘鎺у埗
changeSelect () {
this.selectGroup = !this.selectGroup
@@ -262,7 +311,23 @@
span {
display: block;
font-size: 0.012rem;
- color: @color-over;
+ color: @color-tool;
+ }
+ }
+
+ .specific-tools-group {
+ .tools-panel-choose {
+ border: none;
+ box-shadow: 0 0 0.03rem @color-shadow;
+
+ img {
+ width: 22px;
+ height: 22px;
+ }
+
+ span {
+ display: block;
+ }
}
}
@@ -270,17 +335,6 @@
width: 22.5px;
height: 45px;
color: @color-over;
- }
-
- .tools-panel-choose {
- img {
- width: 16px;
- height: 16px;
- }
-
- span {
- display: block;
- }
}
}
}
--
Gitblit v1.8.0