From e20d96c28a7e1a40a593a8011a2080ce80cd8bf0 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 17 三月 2021 14:55:47 +0800
Subject: [PATCH] Merge branch 'master' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into master
---
src/components/panel/ToolBoxPanel.vue | 252 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 208 insertions(+), 44 deletions(-)
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 7d206e9..37a43a2 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -1,30 +1,43 @@
<template>
<div class="left-top-toolbox-panel">
<div class="specific-tools">
- <el-button @click="changeSelect">
- <img src="@assets/images/map-pages/icon/toolbox/tool.png" alt="">
- <span>宸ュ叿</span>
+ <el-button :class="selectGroup === true ?'active-button':''" class="el-button-choice"
+ @mouseover.enter.native="changeSelectMouse">
+ <img src="@assets/images/map-pages/icon/toolbox/Selecd/tool.png" alt=""/>
+ <span class="span-default">宸ュ叿</span>
</el-button>
<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"
+ :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=""/>
+ <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)">
- <img :src="itemT.icon" :title="itemT.title"/>
+ <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>
</el-popover>
<el-button @click="changeSelect" class="special-button">
- <i :class="selectGroup === false ? 'el-icon-d-arrow-left':'el-icon-d-arrow-left'"></i>
+ <i class="el-icon-d-arrow-left"></i>
</el-button>
</el-row>
</transition>
@@ -39,6 +52,12 @@
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'
@@ -49,15 +68,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'
// 娴嬮噺鐨勬柟娉�
@@ -65,12 +87,15 @@
export default {
name: 'ToolBoxPanel',
- // components: { BaseNavMenuItem },
data () {
return {
+ isShow: true,
+ currentBaseMapCode: 'tianditu_img',
+ basemapList: [],
menuList: [
{
icon: plot,
+ iconSelecd: plotChooose,
label: '鏍囩粯',
index: '1',
items: [
@@ -92,30 +117,35 @@
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: '鍒犻櫎鏍囩粯'
+ title: '鍒犻櫎鏍囩粯',
+ iconChoose: delChoose
}
]
},
{
icon: polygon,
+ iconSelecd: polygonChooose,
label: '娴嬮噺',
index: '3',
items: [
@@ -144,6 +174,7 @@
},
{
icon: location,
+ iconSelecd: locationChooose,
label: '鍦板浘',
index: '2',
items: [
@@ -181,6 +212,7 @@
},
{
icon: fullscreen,
+ iconSelecd: dowloadChooose,
label: '涓嬭浇',
index: '4',
items: [
@@ -206,21 +238,56 @@
}
],
selectGroup: false,
- active: -1,
drawLayer: null,
- Draw: null,
+ drawLayerArray: [],
map: null,
- L: window.L
+ // L: window.L,
+ active: -1,
+ Selecd: -1
+ }
+ },
+ computed: {
+ basemapHelper () {
+ return this.$store.state.map.basemapHelper
+ }
+ },
+ watch: {
+ basemapHelper (newVal) {
+ if (newVal != null) {
+ this.updateBasemapList()
+ }
}
},
methods: {
+ updateBasemapList () {
+ this.basemapList = this.basemapHelper.getBasemapList()
+ },
+ changeBasemap (itm) {
+ const code = itm.code
+ this.basemapList.forEach((item) => {
+ if (item.code === code) {
+ console.log(this.currentBaseMapCode)
+ if (this.currentBaseMapCode == null || this.currentBaseMapCode !== code) {
+ this.currentBaseMapCode = code
+ this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, true)
+ } else {
+ this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, false)
+ }
+
+ this.basemapHelper.getBasemapList().forEach((item) => {
+ item.layer.bringToBack()
+ })
+ }
+ })
+ },
changeChoose (index) {
+ if (this.active === index) {
+ console.log('鍙栨秷褰撳墠閫変腑鐘舵��')
+ }
this.active = index
},
- changeSelect () {
- this.selectGroup = !this.selectGroup
- },
- choiceItem (itemT) {
+ choiceItem (itemT, indexT) {
+ this.Selecd = indexT
switch (itemT.label) {
case '鐐规爣缁�':
var myIcon = this.L.icon({
@@ -231,27 +298,41 @@
})
this.drawLayer = this.map.editTools.startMarker()
this.drawLayer.setIcon(myIcon)
+ this.drawLayerArray.push(this.drawLayer)
break
case '绾挎爣缁�':
this.drawLayer = this.map.editTools.startPolyline()
+ this.drawLayerArray.push(this.drawLayer)
+ this.setLogic()
break
case '澶氳竟褰�':
this.drawLayer = this.map.editTools.startPolygon()
+ this.drawLayerArray.push(this.drawLayer)
+ this.setLogic()
break
case '鐭╁舰':
this.drawLayer = this.map.editTools.startRectangle()
+ this.drawLayerArray.push(this.drawLayer)
+ this.setLogic()
break
case '鍦嗗舰':
this.drawLayer = this.map.editTools.startCircle()
+ this.drawLayerArray.push(this.drawLayer)
+ this.setLogic()
+ break
+ case '鍒犻櫎':
+ for (let i = 0; i < this.drawLayerArray.length; i++) {
+ this.map.removeLayer(this.drawLayerArray[i])
+ }
+ 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()
@@ -261,7 +342,7 @@
exportOnly: true,
hideControlContainer: true
}).addTo(this.map)
- printer.printMap('CurrentSize', 'MyManualPrint')
+ printer.printMap('CurrentSize', '鍏ㄥ睆')
break
case 'A4妯悜':
var printerX = this.L.easyPrint({
@@ -270,7 +351,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({
@@ -279,19 +360,22 @@
exportOnly: true,
hideControlContainer: true
}).addTo(this.map)
- printerY.printMap('A4Portrait page', 'MyManualPrint')
- break
- case '鍒犻櫎':
- this.map.removeLayer(this.drawLayer)
+ printerY.printMap('A4Portrait page', '绾靛悜')
break
}
+ },
+ setLogic () {
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
+ color: 'red'
})
+ },
+ changeSelect () {
+ this.selectGroup = false
+ this.isShow = !this.isShow
+ },
+ changeSelectMouse () {
+ this.selectGroup = true
}
}
}
@@ -322,21 +406,100 @@
margin: 0 0.015rem;
width: 45px;
height: 45px;
- background: @background-color-tools;
- border: none;
+ background: @background-color;
+ //border: 1px solid @color-shadow;
+ vertical-align: middle !important;
+
+ .base-map-img {
+ position: absolute;
+ }
+
+ .base-map-img:hover {
+ cursor: pointer;
+ }
img {
width: 22px;
height: 22px;
}
+ .span-default {
+ display: block;
+ color: @color-shadow;
+ }
+
span {
display: block;
- color: @color-tool;
+ color: @color-over;
}
}
+ .el-button-choice {
+ z-index: 999;
+ padding: 0;
+ margin: 0 0.015rem;
+ width: 45px;
+ height: 45px;
+ background: @background-color;
+ border: 1px solid @color-shadow;
+ }
+
+ .active-button {
+ border: 0.00521rem solid #fff700;
+ box-shadow: 0 0 0.03rem #fff700;
+ }
+
.specific-tools-group {
+ z-index: 1;
+ //.tools-panel-content {
+ // width:220px!important;
+ //}
+ .base-map-inner-panel {
+ //width: 230px!important;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ .base-map-img {
+ position: absolute;
+ }
+
+ .base-map-img-Tool:hover {
+ cursor: pointer;
+ }
+
+ .base-map-anno-Tool {
+ position: absolute;
+ margin-left: 2px;
+ background-color: rgba(0, 0, 0, .5);
+ color: @color-over;
+
+ .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;
+ top: -53px;
+ }
+ }
+ }
+
.tools-panel-choose {
border: none;
box-shadow: 0 0 0.03rem @color-shadow;
@@ -348,14 +511,15 @@
span {
display: block;
+ color: @color-shadow;
}
}
- }
- .special-button {
- width: 22.5px;
- height: 45px;
- color: @color-over;
+ .special-button {
+ width: 22px;
+ height: 45px;
+ color: @color-over;
+ }
}
}
}
--
Gitblit v1.8.0