From ed98e3ee3d4744bdd28c380fa33e5590a86e4b6a Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 17 三月 2021 14:15:35 +0800
Subject: [PATCH] Merge branch 'master' of http://www.xearth.cn:6600/r/wuyushui/SewerAndRainNetwork
---
src/main.js | 2
src/assets/css/map/map-panel-style.less | 2
src/components/panel/ToolBoxPanel.vue | 312 ++++++++++++++++++++++++++++------------------------
3 files changed, 171 insertions(+), 145 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 0a9adea..7827c9f 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -160,7 +160,7 @@
border: 1px solid @background-color-tools;
background: @background-color-tools;
padding: 0;
- width: 90px;
+ //width: 90px;
display: flex;
flex-wrap: wrap;
justify-content: space-evenly;
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index c104103..8d942da 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -1,51 +1,69 @@
<template>
<div class="left-top-toolbox-panel">
<div class="specific-tools">
- <el-button @click="changeSelect">
+ <el-button class="el-button-choice" @click="changeSelect" v-show="selectGroup">
<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"
- trigger="click"
- :popper-class="'tools-panel-content'"
- v-for="(item,index) in menuList" :key="index"
- :width="item.index === '2'?230 : 150"
- >
- <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)" v-show="item.index!=='2'">
- <img :src="itemT.icon" :title="itemT.title" v-show="item.index!=='2'"/>
- </el-button>
- <div class="base-map-inner-panel" v-show="!isShow&&item.index==='2'">
- <div v-for="item in basemapList" :key="item.code" class="basemap-layer-item">
- <img class="base-map-img" width="50" height="50" :src="item.conf.icon_actived" :title="item.name"
- @click="changeBasemap(item)"/>
- <el-checkbox class="base-map-anno" name="basemap" v-model="item.conf.annotationCheck"
- label="鏍囨敞" @change="changeBasemap(item)">
- </el-checkbox>
+ <el-button class="el-button-choice" @click="changeSelect" v-show="!selectGroup">
+ <img src="@assets/images/map-pages/icon/toolbox/Selecd/tool.png" alt="">
+ <a>宸ュ叿</a>
+ </el-button>
+ <transition name="animationChange">
+ <el-row v-show="selectGroup" class="specific-tools-group">
+ <el-popover
+ placement="bottom"
+ trigger="click"
+ :popper-class="'tools-panel-content'"
+ v-for="(item,index) in menuList" :key="index"
+ :width="item.index === '2'?230 : 150"
+ >
+ <el-button slot="reference" class="el-button" :class="active === index ? 'tools-panel-choose':''"
+ @click="changeChoose(index)">
+ <img :src="item.iconSelecd" alt="" v-if="active === index"/>
+ <img :src="item.icon" alt="" v-else/>
+ <span>{{ item.label }}</span>
+ </el-button>
+ <el-button v-for="(itemT,indexT) in item.items" :key="indexT" @click="choiceItem(itemT,indexT)"
+ v-show="item.index!=='2'">
+ <img :src="itemT.iconChoose" :title="itemT.title" v-if="Selecd === indexT"/>
+ <img :src="itemT.icon" :title="itemT.title" v-else/>
+ </el-button>
+ <div class="base-map-inner-panel" v-show="!isShow&&item.index==='2'">
+ <div v-for="item in basemapList" :key="item.code" class="basemap-layer-item">
+ <img class="base-map-img" width="50" height="50" :src="item.conf.icon_actived" :title="item.name"
+ @click="changeBasemap(item)"/>
+ <el-checkbox class="base-map-anno" name="basemap" v-model="item.conf.annotationCheck"
+ label="鏍囨敞" @change="changeBasemap(item)">
+ </el-checkbox>
+ </div>
</div>
- </div>
- </el-popover>
- <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>
+ </el-popover>
+ <el-button @click="changeSelect" class="special-button">
+ <i class="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 plotChooose from '@assets/images/map-pages/icon/toolbox/Selecd/biaohui.png'
+import polygonChooose from '@assets/images/map-pages/icon/toolbox/Selecd/celiang1.png'
+import locationChooose from '@assets/images/map-pages/icon/toolbox/Selecd/ditu.png'
+import dowloadChooose from '@assets/images/map-pages/icon/toolbox/Selecd/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'
@@ -53,13 +71,18 @@
import polygonY from '@assets/images/map-pages/icon/toolbox/circle.png'
import del from '@assets/images/map-pages/icon/toolbox/del.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 polygonJChoose from '@assets/images/map-pages/icon/toolbox/biaohuimark/liubianxing2mark.png'
+import polygonSChoose from '@assets/images/map-pages/icon/toolbox/biaohuimark/rectmark.png'
+import polygonYChoose from '@assets/images/map-pages/icon/toolbox/biaohuimark/circlemark.png'
+import delChoose from '@assets/images/map-pages/icon/toolbox/biaohuimark/shanchu.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/jusli.png'
+import distance from '@assets/images/map-pages/icon/toolbox/juli.png'
import mm from '@assets/images/map-pages/icon/toolbox/M2.png'
// 娴嬮噺鐨勬柟娉�
@@ -67,7 +90,6 @@
export default {
name: 'ToolBoxPanel',
- // components: { BaseNavMenuItem },
data () {
return {
isShow: true,
@@ -76,6 +98,7 @@
menuList: [
{
icon: plot,
+ iconSelecd: plotChooose,
label: '鏍囩粯',
index: '1',
items: [
@@ -83,36 +106,49 @@
index: '1-1',
label: '鐐规爣缁�',
icon: marker,
- title: '鐐规爣缁�'
+ title: '鐐规爣缁�',
+ iconChoose: markerChoose
},
{
index: '1-2',
label: '绾挎爣缁�',
icon: line,
- title: '绾挎爣缁�'
+ title: '绾挎爣缁�',
+ iconChoose: lineChoose
},
{
index: '1-4',
label: '澶氳竟褰�',
icon: polygonJ,
- title: '澶氳竟褰�'
+ title: '澶氳竟褰�',
+ iconChoose: polygonJChoose
},
{
index: '1-5',
label: '鐭╁舰',
icon: polygonS,
- title: '鐭╁舰'
+ title: '鐭╁舰',
+ iconChoose: polygonSChoose
},
{
index: '1-3',
label: '鍦嗗舰',
icon: polygonY,
- title: '鍦嗗舰'
+ title: '鍦嗗舰',
+ iconChoose: polygonYChoose
+ },
+ {
+ index: '1-4',
+ label: '鍒犻櫎',
+ icon: del,
+ title: '鍒犻櫎鏍囩粯',
+ iconChoose: delChoose
}
]
},
{
icon: polygon,
+ iconSelecd: polygonChooose,
label: '娴嬮噺',
index: '3',
items: [
@@ -141,6 +177,7 @@
},
{
icon: location,
+ iconSelecd: locationChooose,
label: '鍦板浘',
index: '2',
items: [
@@ -178,6 +215,7 @@
},
{
icon: fullscreen,
+ iconSelecd: dowloadChooose,
label: '涓嬭浇',
index: '4',
items: [
@@ -204,10 +242,10 @@
],
selectGroup: false,
drawLayer: null,
- Draw: null,
map: null,
- L: window.L,
- active: 0
+ // L: window.L,
+ active: -1,
+ Selecd: -1
}
},
computed: {
@@ -246,39 +284,56 @@
},
changeChoose (index) {
this.active = index
+ if (this.drawLayer == null) {
+ this.drawLayer = this.L.layerGroup().addTo(this.map)
+ }
},
- choiceItem (itemT) {
- console.log(itemT.label)
+ choiceItem (itemT, indexT) {
+ this.Selecd = indexT
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)
+ var myIcon = this.L.icon({
+ iconUrl: iconRefinery,
+ iconSize: [26, 32],
+ iconAnchor: [13, 16],
+ popupAnchor: [26, -32]
+ })
+ var drawLayerMarker = this.map.editTools.startMarker()
+ drawLayerMarker.setIcon(myIcon)
+ this.drawLayer.addLayer(drawLayerMarker)
+ this.setLogic(drawLayerMarker)
break
case '绾挎爣缁�':
- this.drawLayer = this.map.editTools.startPolyline()
- this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
+ var drawLayerLine = this.map.editTools.startPolyline()
+ this.drawLayer.addLayer(drawLayerLine)
+ this.setLogic(drawLayerLine)
break
case '澶氳竟褰�':
- this.drawLayer = this.map.editTools.startPolygon()
- this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
+ var drawLayerPolygonD = this.map.editTools.startPolygon()
+ this.drawLayer.addLayer(drawLayerPolygonD)
+ this.setLogic(drawLayerPolygonD)
break
case '鐭╁舰':
- this.drawLayer = this.map.editTools.startRectangle()
- this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
+ var drawLayerPolygonJ = this.map.editTools.startRectangle()
+ this.drawLayer.addLayer(drawLayerPolygonJ)
+ this.setLogic(drawLayerPolygonJ)
break
case '鍦嗗舰':
- this.drawLayer = this.map.editTools.startCircle()
- this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
+ var drawLayerPolygonY = this.map.editTools.startCircle()
+ this.drawLayer.addLayer(drawLayerPolygonY)
+ this.setLogic(drawLayerPolygonY)
+ break
+ case '鍒犻櫎':
+ this.drawLayer.clearLayers()
+ break
+ case '娓呴櫎':
+ Measure.clearMeasure(this.map, this.L)
break
case '璺濈':
Measure.startMeasureLen(this.map, this.L)
break
case '闈㈢Н':
Measure.startMeasureArea(this.map, this.L)
- break
- case '娓呴櫎':
- Measure.clearMeasure(this.map, this.L)
break
case '鍏ㄥ睆':
// this.map.toggleFullscreen()
@@ -288,7 +343,7 @@
exportOnly: true,
hideControlContainer: true
}).addTo(this.map)
- printer.printMap('CurrentSize', 'MyManualPrint')
+ printer.printMap('CurrentSize', '鍏ㄥ睆')
break
case 'A4妯悜':
var printerX = this.L.easyPrint({
@@ -297,7 +352,7 @@
exportOnly: true,
hideControlContainer: true
}).addTo(this.map)
- printerX.printMap('A4Landscape page', 'MyManualPrint')
+ printerX.printMap('A4Landscape page', '妯悜')
break
case 'A4绾靛悜':
var printerY = this.L.easyPrint({
@@ -306,76 +361,16 @@
exportOnly: true,
hideControlContainer: true
}).addTo(this.map)
- printerY.printMap('A4Portrait page', 'MyManualPrint')
+ printerY.printMap('A4Portrait page', '绾靛悜')
break
}
},
- // 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
- // }
- // },
- // 鏂囧瓧鏍囨敞鎺у埗
- // 宸︿笂鍔熻兘鎺у埗
+ setLogic (layer) {
+ layer.on('dblclick', this.L.DomEvent.stop).on('dblclick', layer.toggleEdit)
+ layer.setStyle({
+ color: 'red'
+ })
+ },
changeSelect () {
this.selectGroup = !this.selectGroup
this.isShow = !this.isShow
@@ -385,6 +380,15 @@
</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;
@@ -393,6 +397,7 @@
.specific-tools {
display: flex;
+
.el-button {
z-index: 999;
padding: 0;
@@ -401,11 +406,13 @@
height: 45px;
background: @background-color-tools;
border: none;
- .base-map-img{
+
+ .base-map-img {
position: absolute;
}
- .base-map-img:hover{
- cursor:pointer;
+
+ .base-map-img:hover {
+ cursor: pointer;
}
img {
@@ -415,9 +422,23 @@
span {
display: block;
- font-size: 0.012rem;
color: @color-tool;
}
+
+ a {
+ display: block;
+ color: @color-shadow;
+ }
+ }
+
+ .el-button-choice {
+ z-index: 999;
+ padding: 0;
+ margin: 0 0.015rem;
+ width: 45px;
+ height: 45px;
+ background: @background-color-tools;
+ border: 1px solid @color-shadow;
}
.specific-tools-group {
@@ -431,29 +452,38 @@
justify-content: center;
align-items: center;
- .base-map-img{
+ .base-map-img {
position: absolute;
}
- .base-map-img-Tool:hover{
- cursor:pointer;
+
+ .base-map-img-Tool:hover {
+ cursor: pointer;
}
- .base-map-anno-Tool{
- position: absolute;margin-left: 2px;background-color: rgba(0,0,0,.5);color: white;
- .el-checkbox__label{
+
+ .base-map-anno-Tool {
+ position: absolute;
+ margin-left: 2px;
+ background-color: rgba(0, 0, 0, .5);
+ color: white;
+
+ .el-checkbox__label {
padding-left: 5px !important;
}
}
+
.basemap-layer-item {
display: flex;
width: 50px;
height: 50px;
margin: 10px;
border: 2px solid white;
+
input {
position: relative;
left: 0;
top: -53px;
}
+
.basemap-layer-item-name {
position: relative;
left: 0;
@@ -461,6 +491,7 @@
}
}
}
+
.tools-panel-choose {
border: none;
box-shadow: 0 0 0.03rem @color-shadow;
@@ -482,12 +513,5 @@
color: @color-over;
}
}
-}
-.isD-enter-active, .isD-leave-active{
- transition: all 0.5s;
-}
-.isD-enter, .isD-leave-to{
- opacity: 0;
- transform: translateX(-100px);
}
</style>
diff --git a/src/main.js b/src/main.js
index 8ca4020..f174d4a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -13,6 +13,8 @@
import 'leaflet/dist/leaflet.css'
import L from 'leaflet'
import '@/utils/dialogDrag.js'
+import '@components/plugin/leaflet-measure-path/leaflet-measure-path.css'
+import '@components/plugin/leaflet-measure-path/leaflet-measure-path'
Vue.config.productionTip = false
--
Gitblit v1.8.0