From 633192815fc213c1ef45e394973fe2d0f95280b6 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期一, 15 三月 2021 18:05:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/assets/images/map-pages/icon/toolbox/biaohui.png | 0
src/assets/images/map-pages/icon/toolbox/ditu.png | 0
src/components/plugin/Editable.js | 7
src/assets/images/map-pages/icon/toolbox/tool.png | 0
src/components/panel/BaseNavMenuItem.vue | 27 +-
src/assets/images/map-pages/icon/toolbox/line.png | 0
src/assets/css/map/map-panel-style.less | 17 ++
src/components/panel/ToolBoxPanel.vue | 374 ++++++++++++++++++++++------------------------
src/assets/images/map-pages/icon/toolbox/polygon.png | 0
src/assets/images/map-pages/icon/toolbox/circle.png | 0
src/assets/images/map-pages/icon/toolbox/ju.png | 0
src/assets/css/map/_map-variable.less | 18 +-
/dev/null | 0
src/assets/images/map-pages/icon/toolbox/xiazai.png | 0
src/assets/images/map-pages/icon/toolbox/map.png | 0
src/assets/images/map-pages/icon/toolbox/celiang1.png | 0
16 files changed, 228 insertions(+), 215 deletions(-)
diff --git a/src/assets/css/map/_map-variable.less b/src/assets/css/map/_map-variable.less
index caba7bb..9938ddd 100644
--- a/src/assets/css/map/_map-variable.less
+++ b/src/assets/css/map/_map-variable.less
@@ -1,9 +1,11 @@
-@color:#00fff6;
-@color-highlight:#fff700;
-@color-gray:#C0C4CC;
-@color-title:white;
-@color-over:white;
-@background-color:rgba(0,16,30,.8);
-@background-color-light:rgba(40,50,100,.4);
-@background-color-split:rgba(0,255,246,.14);
+@color: #00fff6;
+@color-highlight: #fff700;
+@color-gray: #C0C4CC;
+@color-title: white;
+@color-over: white;
+@color-tool:#C0C4CC;
+@background-color: rgba(0, 16, 30, .8);
+@background-color-light: rgba(40, 50, 100, .4);
+@background-color-split: rgba(0, 255, 246, .14);
+@background-color-tools: #1A4951;
@border-radius: .03rem;
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index d481698..e038a0a 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -136,3 +136,20 @@
margin-block-start: 0;
margin-block-end: 0;
}
+.tools-panel-content {
+ border: 1px solid @background-color-tools;
+ background: @background-color-tools;
+ padding: 0;
+ .el-button {
+ padding: 0;
+ margin: 10px;
+ width: 45px;
+ height: 45px;
+ background: @background-color-tools;
+ vertical-align: middle !important;
+ img {
+ width: 16px;
+ height: 16px;
+ }
+ }
+}
diff --git a/src/assets/images/map-pages/icon/toolbox/biaohui.png b/src/assets/images/map-pages/icon/toolbox/biaohui.png
new file mode 100644
index 0000000..9f7fa30
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/biaohui.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/celiang1.png b/src/assets/images/map-pages/icon/toolbox/celiang1.png
new file mode 100644
index 0000000..069e2e4
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/celiang1.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/circle.png b/src/assets/images/map-pages/icon/toolbox/circle.png
index f03cf36..c1c3f3c 100644
--- a/src/assets/images/map-pages/icon/toolbox/circle.png
+++ b/src/assets/images/map-pages/icon/toolbox/circle.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/ditu.png b/src/assets/images/map-pages/icon/toolbox/ditu.png
new file mode 100644
index 0000000..8713eff
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/ditu.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/fullscreen.png b/src/assets/images/map-pages/icon/toolbox/fullscreen.png
deleted file mode 100644
index f24bec5..0000000
--- a/src/assets/images/map-pages/icon/toolbox/fullscreen.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/ju.png b/src/assets/images/map-pages/icon/toolbox/ju.png
new file mode 100644
index 0000000..1a0341e
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/ju.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/legend.png b/src/assets/images/map-pages/icon/toolbox/legend.png
deleted file mode 100644
index 43f6416..0000000
--- a/src/assets/images/map-pages/icon/toolbox/legend.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/line.png b/src/assets/images/map-pages/icon/toolbox/line.png
new file mode 100644
index 0000000..6736258
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/line.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/location.png b/src/assets/images/map-pages/icon/toolbox/location.png
deleted file mode 100644
index 4f0f9be..0000000
--- a/src/assets/images/map-pages/icon/toolbox/location.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/map.png b/src/assets/images/map-pages/icon/toolbox/map.png
new file mode 100644
index 0000000..93cd827
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/map.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/polygon.png b/src/assets/images/map-pages/icon/toolbox/polygon.png
index e2c5ff0..4111565 100644
--- a/src/assets/images/map-pages/icon/toolbox/polygon.png
+++ b/src/assets/images/map-pages/icon/toolbox/polygon.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/square.png b/src/assets/images/map-pages/icon/toolbox/square.png
deleted file mode 100644
index 91373ad..0000000
--- a/src/assets/images/map-pages/icon/toolbox/square.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/tool.png b/src/assets/images/map-pages/icon/toolbox/tool.png
new file mode 100644
index 0000000..94528d2
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/tool.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/xiazai.png b/src/assets/images/map-pages/icon/toolbox/xiazai.png
new file mode 100644
index 0000000..83e8d59
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/xiazai.png
Binary files differ
diff --git a/src/components/panel/BaseNavMenuItem.vue b/src/components/panel/BaseNavMenuItem.vue
index 69330e9..9b497ae 100644
--- a/src/components/panel/BaseNavMenuItem.vue
+++ b/src/components/panel/BaseNavMenuItem.vue
@@ -6,12 +6,13 @@
<template slot="title" v-if="item.icon">
<img :src="item.icon" :title="item.label"/>
</template>
- <template slot="title" v-else>{{item.label}}</template>
+ <template slot="title" v-else>{{ item.label }}</template>
<base-nav-menu-item v-for="child in item.items" :key="child.title" :menuList='[child]'></base-nav-menu-item>
</el-submenu>
</template>
<template v-else>
<el-menu-item :index="item.index" :key="index">
+ <!-- <el-radio></el-radio>-->
{{ item.label }}
</el-menu-item>
</template>
@@ -33,24 +34,26 @@
</script>
<style lang="less" scoped>
+.el-menu--popup {
+ min-width: 100px;
+}
.base-nav-menu {
height: 38px;
- line-height: 38px;
display: flex;
align-items: center;
- justify-content: space-around;
+ justify-content: center;
outline: none;
border: none;
+ //margin-left: 20px;
+ padding: 0;
+ .el-menu--popup {
+ min-width: 100px;
+ }
+}
- .el-submenu {
- .el-submenu__title {
- border-radius: 50%;
-
- .el-icon-arrow-down {
- display: none;
- }
-
- }
+.el-menu--horizontal {
+ .el-menu--popup {
+ min-width: 100px;
}
}
</style>
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index ac33f0f..88f2c4e 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -1,86 +1,109 @@
<template>
- <div class="lefttop-toolbox-panel">
- <div>
- <div class="init-choose" @click="changeSelect()">
- <img src="@/assets/images/map-pages/icon/toolbox/circle.png" alt=""/>
- </div>
- <el-menu class="el-menu"
- mode="horizontal"
- :collapse="isCollapse"
- unique-opened
- @open="handleOpen"
- @close="handleClose"
- @select="handleSelect"
- v-show='selectGroup'
- >
- <base-nav-menu-item :menuList='menuList'></base-nav-menu-item>
- </el-menu>
+ <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"
+ 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>
+ </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>
</div>
- <!--鏂囧瓧鏍囨敞寮规-->
- <!-- <TextBounced v-show="this.bouncedText" @changeBounced="gitBounced"></TextBounced>-->
</div>
</template>
<script>
-// import legend from '@/assets/images/map-pages/icon/toolbox/legend.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 marker from '@assets/images/map-pages/icon/toolbox/map.png'
+import line from '@assets/images/map-pages/icon/toolbox/line.png'
+
// import square from '@/assets/images/map-pages/icon/toolbox/square.png'
-import circle from '@assets/images/map-pages/icon/toolbox/circle.png'
-import location from '@assets/images/map-pages/icon/toolbox/location.png'
-import polygon from '@assets/images/map-pages/icon/toolbox/polygon.png'
-import fullscreen from '@assets/images/map-pages/icon/toolbox/fullscreen.png'
-
// 娴嬮噺鐨勬柟娉�
-import '@/components/plugin/leaflet-measure-path/leaflet-measure-path.css'
-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 MakeTation from '@components/plugin/MakeTation'
// 灏佽鐨勯�夋嫨寮规
-import BaseNavMenuItem from '@components/panel/BaseNavMenuItem'
+// import BaseNavMenuItem from '@components/panel/BaseNavMenuItem'
export default {
name: 'ToolBoxPanel',
- components: { BaseNavMenuItem },
+ // components: { BaseNavMenuItem },
data () {
return {
menuList: [
{
- icon: circle,
+ icon: plot,
label: '鏍囩粯',
index: '1',
items: [
{
index: '1-1',
- label: '鐐规爣缁�'
+ label: '鐐规爣缁�',
+ icon: marker
},
{
index: '1-2',
- label: '绾挎爣缁�'
+ label: '绾挎爣缁�',
+ icon: line
},
{
index: '1-3',
- label: '闈㈡爣缁�',
- items: [
- {
- index: '1-3-1',
- label: '鍦嗗舰'
- },
- {
- index: '1-3-2',
- label: '澶氳竟褰�'
- },
- {
- index: '1-3-3',
- label: '鐭╁舰'
- }
- ]
+ label: '鍦嗗舰'
+ },
+ {
+ index: '1-4',
+ label: '澶氳竟褰�'
+ },
+ {
+ index: '1-5',
+ label: '鐭╁舰'
+ }
+ ]
+ },
+ {
+ icon: polygon,
+ label: '娴嬮噺',
+ index: '3',
+ items: [
+ {
+ index: '3-1',
+ label: '璺濈'
+ },
+ {
+ index: '3-2',
+ label: '闈㈢Н'
}
]
},
{
icon: location,
- label: '鍒囨崲搴曞浘',
+ label: '鍦板浘',
index: '2',
items: [
{
@@ -116,29 +139,6 @@
]
},
{
- icon: polygon,
- label: '绠＄綉',
- index: '3',
- items: [
- {
- index: '3-1',
- label: '杩為�氭�у垎鏋�'
- },
- {
- index: '3-2',
- label: '鐖嗙鍒嗘瀽'
- },
- {
- index: '3-3',
- label: '娴佸悜鍒嗘瀽'
- },
- {
- index: '3-4',
- label: '妯柇闈㈠垎鏋�'
- }
- ]
- },
- {
icon: fullscreen,
label: '涓嬭浇',
index: '4',
@@ -162,151 +162,135 @@
selectGroup: false,
drawLayer: null,
map: null,
- L: window.L,
- // 鎺у埗宸ュ叿鏍� 鏂囧瓧鏍囨敞 鐨勫脊妗嗘槸鍚︽樉绀�
- bouncedText: false
+ L: window.L
}
},
methods: {
- handleOpen () {
- },
- handleClose () {
- },
- handleSelect (index, indexPath) {
-
- },
+ // 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
},
+ // 宸︿笂鍔熻兘鎺у埗
changeSelect () {
this.selectGroup = !this.selectGroup
- },
- handleSelects (command) {
- console.log(command)
- switch (command) {
- 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.drawLayer = this.map.editTools.startPolyline()
- this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
- Measure.startMeasureLen(this.map, this.L)
- break
- case '闈㈡爣缁�':
- this.drawLayer = this.map.editTools.startPolygon()
- this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
- break
- case '澶氳竟褰�':
- alert('澶氳竟褰�')
- break
- case '鐐规爣缁�':
- 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
- }
}
}
}
</script>
-<style lang="less">
-
-.lefttop-toolbox-panel {
+<style lang="less" scoped>
+.left-top-toolbox-panel {
position: absolute;
- left: 15px;
+ left: 0;
top: 15px;
z-index: 999;
- div {
- width: 100%;
- height: 55px;
- line-height: 55px;
+ .specific-tools {
display: flex;
align-items: center;
- justify-content: space-around;
+ justify-content: space-evenly;
- .init-choose {
- background: @background-color;
- width: 35px;
- height: 35px;
- border-radius: 50%;
- border: 2px skyblue solid;
- display: flex;
- align-items: center;
- justify-content: center;
- z-index: 999;
+ .el-button {
+ 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;
+ height: 22px;
+ }
+
+ span {
+ display: block;
+ font-size: 0.012rem;
+ color: @color-tool;
+ }
}
- .el-menu {
- width: 80%;
- background: none;
- z-index: 1;
- border: none;
- background: #305B62;
- border-radius: 50px;
+ .special-button {
+ width: 22.5px;
+ height: 45px;
+ color: @color-over;
+ }
+
+ .tools-panel-choose {
+ img {
+ width: 16px;
+ height: 16px;
+ }
+
+ span {
+ display: block;
+ }
}
}
-
- //.transition {
- // @keyframes bounce-in {
- // 0% {
- // transform: scale(0);
- // opacity: 0.3;
- // }
- // 100% {
- // transform: scale(1);
- // opacity: 1;
- // }
- // }
- //
- // .fade-enter-active {
- // transform-origin: left center;
- // animation: bounce-in .2s;
- // }
- //
- // .fade-leave-active {
- // transform-origin: left;
- // animation: bounce-in .2s reverse;
- // }
- //}
-
}
</style>
diff --git a/src/components/plugin/Editable.js b/src/components/plugin/Editable.js
index d39de14..15b4c3a 100644
--- a/src/components/plugin/Editable.js
+++ b/src/components/plugin/Editable.js
@@ -301,6 +301,7 @@
// 馃崅method startPolyline(latlng: L.LatLng, options: hash): L.Polyline
// Start drawing a Polyline. If `latlng` is given, a first point will be added. In any case, continuing on user click.
// If `options` is given, it will be passed to the Polyline class constructor.
+ // 鐢荤嚎
startPolyline: function (latlng, options) {
const line = this.createPolyline([], options)
line.enableEdit(this.map).newShape(latlng)
@@ -316,6 +317,12 @@
return polygon
},
+ // circleMarker :function (latlng,options) {
+ // const yuan = this.circleMarker(latlng,options)
+ // yuan.enableEdit(this.map).newShape(latlng)
+ // return yuan
+ // }
+
// 馃崅method startMarker(latlng: L.LatLng, options: hash): L.Marker
// Start adding a Marker. If `latlng` is given, the Marker will be shown first at this point.
// In any case, it will follow the user mouse, and will have a final `latlng` on next click (or touch).
--
Gitblit v1.8.0