From 0c7a1e656e6f6488d357ffe9ff95b727e4a9768f Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期二, 16 三月 2021 16:21:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/panel/ToolBoxPanel.vue | 290 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 167 insertions(+), 123 deletions(-)
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 7707776..80d3eb4 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -2,57 +2,63 @@
<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=""
- trigger="click"
- :popper-class="'tools-panel-content'"
- v-for="(item,index) in menuList" :key="index"
- >
- <el-button slot="reference" class="tools-panel-choose">
- <img :src="item.icon" alt=""/>
- <span>{{ item.label }}</span>
+ <transition name="animationChange">
+ <el-row v-show="selectGroup" class="specific-tools-group">
+ <el-popover
+ placement="bottom"
+ width=""
+ trigger="click"
+ :popper-class="'tools-panel-content'"
+ v-for="(item,index) in menuList" :key="index"
+ >
+ <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" @click="choiceItem(itemT,indexT)">
+ <img :src="itemT.icon" :title="itemT.title"/>
+ </el-button>
+ </el-popover>
+ <el-button @click="changeSelect" class="special-button">
+ <i :class="selectGroup === false ? 'el-icon-d-arrow-left':'el-icon-d-arrow-left'"></i>
</el-button>
- <el-button v-for="(itemT,indexT) in item.items" :key="indexT">
- <!-- <i class="el-icon-s-tools"></i>-->
- <img :src="itemT.icon" alt=""/>
- <!-- <span>{{ itemT.label }}</span>-->
- </el-button>
- </el-popover>
- </el-row>
- <el-button @click="changeSelect" class="special-button">
- <i :class="selectGroup === false ? 'el-icon-d-arrow-right':'el-icon-d-arrow-left'"></i>
- </el-button>
+ </el-row>
+ </transition>
</div>
</div>
</template>
<script>
+// 鍔熻兘瀵艰埅
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 iconRefinery from '@assets/images/map-pages/local.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 del from '@assets/images/map-pages/icon/toolbox/del.png'
-// import square from '@/assets/images/map-pages/icon/toolbox/square.png'
+// 閫変腑鐨勫唴瀹瑰浘鐗�
+import markerChoose from '@assets/images/map-pages/icon/toolbox/biaohuimark/dingweimark.png'
+import lineChoose from '@assets/images/map-pages/icon/toolbox/biaohuimark/linemark.png'
+
+// 娴嬮噺
+import distance from '@assets/images/map-pages/icon/toolbox/juli.png'
+import mm from '@assets/images/map-pages/icon/toolbox/M2.png'
+
// 娴嬮噺鐨勬柟娉�
-// 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 Measure from '@/components/plugin/MeaSure'
export default {
name: 'ToolBoxPanel',
@@ -68,27 +74,40 @@
{
index: '1-1',
label: '鐐规爣缁�',
- icon: marker
+ icon: marker,
+ title: '鐐规爣缁�',
+ iconChoose: markerChoose
},
{
index: '1-2',
label: '绾挎爣缁�',
- icon: line
+ icon: line,
+ title: '绾挎爣缁�',
+ iconChoose: lineChoose
},
{
index: '1-4',
label: '澶氳竟褰�',
- icon: polygonJ
+ icon: polygonJ,
+ title: '澶氳竟褰�'
},
{
index: '1-5',
label: '鐭╁舰',
- icon: polygonS
+ icon: polygonS,
+ title: '鐭╁舰'
},
{
index: '1-3',
label: '鍦嗗舰',
- icon: polygonY
+ icon: polygonY,
+ title: '鍦嗗舰'
+ },
+ {
+ index: '1-4',
+ label: '鍒犻櫎',
+ icon: del,
+ title: '鍒犻櫎鏍囩粯'
}
]
},
@@ -99,11 +118,15 @@
items: [
{
index: '3-1',
- label: '璺濈'
+ label: '璺濈',
+ icon: distance,
+ title: '璺濈娴嬮噺'
},
{
index: '3-2',
- label: '闈㈢Н'
+ label: '闈㈢Н',
+ icon: mm,
+ title: '闈㈢Н娴嬮噺'
}
]
},
@@ -151,104 +174,123 @@
items: [
{
index: '4-1',
- label: '鍏ㄥ睆'
+ label: '鍏ㄥ睆',
+ icon: '',
+ title: '鍏ㄥ睆'
},
{
index: '4-2',
- label: 'A4妯悜'
+ label: 'A4妯悜',
+ icon: '',
+ title: 'A4妯悜'
},
{
index: '4-3',
- label: 'A4绾靛悜'
+ label: 'A4绾靛悜',
+ icon: '',
+ title: 'A4绾靛悜'
}
]
}
],
- isCollapse: false,
selectGroup: false,
+ active: -1,
drawLayer: null,
map: null,
L: window.L
}
},
methods: {
- // handleSelect (index) {
- // console.log(index)
- // switch (index) {
- // case '4-1':
- // // this.map.toggleFullscreen()
- // var printer = this.L.easyPrint({
- // sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
- // filename: 'map_image',
- // exportOnly: true,
- // hideControlContainer: true
- // }).addTo(this.map)
- // printer.printMap('CurrentSize', 'MyManualPrint')
- // break
- // case '4-2':
- // var printerX = this.L.easyPrint({
- // sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
- // filename: 'map_image',
- // exportOnly: true,
- // hideControlContainer: true
- // }).addTo(this.map)
- // printerX.printMap('A4Landscape page', 'MyManualPrint')
- // break
- // case '4-3':
- // var printerY = this.L.easyPrint({
- // sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
- // filename: 'map_image',
- // exportOnly: true,
- // hideControlContainer: true
- // }).addTo(this.map)
- // printerY.printMap('A4Portrait page', 'MyManualPrint')
- // break
- // case '1-2':
- // this.drawLayer = this.map.editTools.startPolyline()
- // this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
- // Measure.startMeasureLen(this.map, this.L)
- // break
- // case '1-3-1':
- // // alert('鍦嗗舰')
- // this.drawLayer = this.map.editTools.circleMarker()
- // this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
- // break
- // case '1-3-2':
- // this.drawLayer = this.map.editTools.startPolygon()
- // this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
- // break
- // case '1-1':
- // MakeTation.StartPointAnnotation(this.map, this.L)
- // break
- // case '鍥炬爣鏍囨敞':
- // this.drawLayer = this.map.editTools.startIcon()
- // this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
- // break
- // case '鏂囧瓧鏍囨敞':
- // this.bouncedText = true
- // MakeTation.startMakeText(this.map, this.L)
- // break
- // case '璺濈娴嬮噺':
- // Measure.startMeasureLen(this.map, this.L)
- // break
- // case '闈㈢Н娴嬮噺':
- // Measure.startMeasureArea(this.map, this.L)
- // break
- // }
- // },
- // 鏂囧瓧鏍囨敞鎺у埗
- gitBounced (params) {
- this.bouncedText = params
+ changeChoose (index) {
+ this.active = index
},
- // 宸︿笂鍔熻兘鎺у埗
changeSelect () {
this.selectGroup = !this.selectGroup
+ },
+ choiceItem (itemT) {
+ switch (itemT.label) {
+ case '鐐规爣缁�':
+ var myIcon = this.L.icon({
+ iconUrl: iconRefinery,
+ iconSize: [26, 32],
+ iconAnchor: [13, 16],
+ popupAnchor: [26, -32]
+ })
+ this.drawLayer = this.map.editTools.startMarker()
+ this.drawLayer.setIcon(myIcon)
+ break
+ case '绾挎爣缁�':
+ this.drawLayer = this.map.editTools.startPolyline()
+ break
+ case '澶氳竟褰�':
+ this.drawLayer = this.map.editTools.startPolygon()
+ break
+ case '鐭╁舰':
+ this.drawLayer = this.map.editTools.startRectangle()
+ break
+ case '鍦嗗舰':
+ this.drawLayer = this.map.editTools.startCircle()
+ break
+ case '璺濈':
+ Measure.startMeasureLen(this.map, this.L)
+ break
+ case '闈㈢Н':
+ Measure.startMeasureArea(this.map, this.L)
+ break
+ case '鍏ㄥ睆':
+ // this.map.toggleFullscreen()
+ var printer = this.L.easyPrint({
+ sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
+ filename: 'map_image',
+ exportOnly: true,
+ hideControlContainer: true
+ }).addTo(this.map)
+ printer.printMap('CurrentSize', 'MyManualPrint')
+ break
+ case 'A4妯悜':
+ var printerX = this.L.easyPrint({
+ sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
+ filename: 'map_image',
+ exportOnly: true,
+ hideControlContainer: true
+ }).addTo(this.map)
+ printerX.printMap('A4Landscape page', 'MyManualPrint')
+ break
+ case 'A4绾靛悜':
+ var printerY = this.L.easyPrint({
+ sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
+ filename: 'map_image',
+ exportOnly: true,
+ hideControlContainer: true
+ }).addTo(this.map)
+ printerY.printMap('A4Portrait page', 'MyManualPrint')
+ break
+ case '鍒犻櫎':
+ this.map.removeLayer(this.drawLayer)
+ break
+ }
+ this.drawLayer.on('dblclick', this.L.DomEvent.stop).on('dblclick', this.drawLayer.toggleEdit)
+ this.drawLayer.setStyle({
+ color: 'red',
+ fillColor: '#ffffff',
+ fillOpacity: 0.1,
+ fill: true
+ })
}
}
}
</script>
<style lang="less" scoped>
+.animationChange-enter-active, .animationChange-leave-active {
+ transition: all 0.5s;
+}
+
+.animationChange-enter, .animationChange-leave-to {
+ opacity: 0;
+ transform: translateX(-100px);
+}
+
.left-top-toolbox-panel {
position: absolute;
left: 0;
@@ -257,17 +299,15 @@
.specific-tools {
display: flex;
- align-items: center;
- justify-content: space-evenly;
.el-button {
+ z-index: 999;
padding: 0;
margin: 0 0.015rem;
width: 45px;
height: 45px;
background: @background-color-tools;
border: none;
- box-shadow: 0 0 0.03rem #00fff6;
img {
width: 22px;
@@ -276,8 +316,23 @@
span {
display: block;
- font-size: 0.012rem;
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;
+ }
}
}
@@ -285,17 +340,6 @@
width: 22.5px;
height: 45px;
color: @color-over;
- }
-
- .tools-panel-choose {
- img {
- width: 16px;
- height: 16px;
- }
-
- span {
- display: block;
- }
}
}
}
--
Gitblit v1.8.0