From 7e98976e49b810265924568a03df37cbf15bcaa8 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 17 三月 2021 18:02:48 +0800
Subject: [PATCH] Merge branch 'master' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork
---
src/components/panel/ToolBoxPanel.vue | 226 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 179 insertions(+), 47 deletions(-)
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index e7ef163..aaa5514 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -1,11 +1,11 @@
<template>
<div class="left-top-toolbox-panel">
<div class="specific-tools">
- <el-button @click="changeSelect" v-show="selectGroup">
+ <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-button @click="changeSelect" v-show="!selectGroup">
+ <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>
@@ -13,24 +13,34 @@
<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.iconSelecd" alt="" v-if="active === index"/>
+ <img :src="item.iconSelecd" alt="" v-if="active === index && checked === true"/>
<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.iconChoose" :title="itemT.title" v-if="Selecd === indexT"/>
+ <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 && checked === true"/>
<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>
@@ -68,6 +78,8 @@
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 distance from '@assets/images/map-pages/icon/toolbox/juli.png'
@@ -80,12 +92,11 @@
name: 'ToolBoxPanel',
data () {
return {
- selectGroup: false,
- active: -1,
- Selecd: -1,
- drawLayer: null,
- map: null,
- L: window.L,
+ checked: false,
+ checkbuuton: -1,
+ isShow: true,
+ currentBaseMapCode: 'tianditu_img',
+ basemapList: [],
menuList: [
{
icon: plot,
@@ -147,19 +158,22 @@
index: '3-1',
label: '璺濈',
icon: distance,
- title: '璺濈娴嬮噺'
+ title: '璺濈娴嬮噺',
+ iconChoose: distanceChoose
},
{
index: '3-2',
label: '闈㈢Н',
icon: mm,
- title: '闈㈢Н娴嬮噺'
+ title: '闈㈢Н娴嬮噺',
+ iconChoose: mmChoose
},
{
index: '3-3',
- label: '鍒犻櫎',
- icon: '',
- title: '鍒犻櫎'
+ label: '娓呴櫎',
+ icon: del,
+ title: '娓呴櫎娴嬮噺',
+ iconChoose: delChoose
}
]
},
@@ -227,23 +241,68 @@
}
]
}
- ]
+ ],
+ selectGroup: false,
+ drawLayer: null,
+ drawLayerArray: [],
+ map: null,
+ // 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) {
this.active = index
if (this.drawLayer == null) {
this.drawLayer = this.L.layerGroup().addTo(this.map)
}
- },
- changeSelect () {
- this.selectGroup = !this.selectGroup
+ if (this.checkbuuton === index) {
+ this.checked = !this.checked
+ } else {
+ if (this.checkbuuton === -1) {
+ this.checked = !this.checked
+ } else {
+ this.checked = true
+ }
+ }
+ this.checkbuuton = index
},
choiceItem (itemT, indexT) {
this.Selecd = indexT
- // eslint-disable-next-line no-unused-vars
- const layerGroups = []
switch (itemT.label) {
case '鐐规爣缁�':
var myIcon = this.L.icon({
@@ -252,36 +311,37 @@
iconAnchor: [13, 16],
popupAnchor: [26, -32]
})
- // eslint-disable-next-line no-case-declarations
- const drawLayer = this.map.editTools.startMarker()
- drawLayer.setIcon(myIcon)
- this.drawLayer.addLayer(drawLayer)
- this.drawLayer.addLayer(this.setLogic(drawLayer))
+ this.drawLayer = this.map.editTools.startMarker()
+ this.drawLayer.setIcon(myIcon)
+ this.drawLayerArray.push(this.drawLayer)
break
case '绾挎爣缁�':
- // eslint-disable-next-line no-case-declarations
- const drawLayerLine = this.map.editTools.startPolyline()
- this.drawLayer.addLayer(drawLayerLine)
- this.setLogic(drawLayerLine)
+ this.drawLayer = this.map.editTools.startPolyline()
+ this.drawLayerArray.push(this.drawLayer)
+ this.setLogic()
break
case '澶氳竟褰�':
- var drawLayerPolygonD = this.map.editTools.startPolygon()
- this.drawLayer.addLayer(drawLayerPolygonD)
- this.setLogic(drawLayerPolygonD)
+ this.drawLayer = this.map.editTools.startPolygon()
+ this.drawLayerArray.push(this.drawLayer)
+ this.setLogic()
break
case '鐭╁舰':
- var drawLayerPolygonJ = this.map.editTools.startRectangle()
- this.drawLayer.addLayer(drawLayerPolygonJ)
- this.setLogic(drawLayerPolygonJ)
+ this.drawLayer = this.map.editTools.startRectangle()
+ this.drawLayerArray.push(this.drawLayer)
+ this.setLogic()
break
case '鍦嗗舰':
- // eslint-disable-next-line no-case-declarations
- const drawLayerPolygonY = this.map.editTools.startCircle()
- this.drawLayer.addLayer(drawLayerPolygonY)
- this.setLogic(drawLayerPolygonY)
+ this.drawLayer = this.map.editTools.startCircle()
+ this.drawLayerArray.push(this.drawLayer)
+ this.setLogic()
break
case '鍒犻櫎':
- this.drawLayer.clearLayers()
+ 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)
@@ -319,11 +379,15 @@
break
}
},
- setLogic (layer) {
- layer.on('dblclick', this.L.DomEvent.stop).on('dblclick', layer.toggleEdit)
- layer.setStyle({
+ setLogic () {
+ this.drawLayer.on('dblclick', this.L.DomEvent.stop).on('dblclick', this.drawLayer.toggleEdit)
+ this.drawLayer.setStyle({
color: 'red'
})
+ },
+ changeSelect () {
+ this.selectGroup = !this.selectGroup
+ this.isShow = !this.isShow
}
}
}
@@ -357,6 +421,14 @@
background: @background-color-tools;
border: none;
+ .base-map-img {
+ position: absolute;
+ }
+
+ .base-map-img:hover {
+ cursor: pointer;
+ }
+
img {
width: 22px;
height: 22px;
@@ -373,7 +445,67 @@
}
}
+ .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 {
+ 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: 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;
+ top: -53px;
+ }
+ }
+ }
+
.tools-panel-choose {
border: none;
box-shadow: 0 0 0.03rem @color-shadow;
--
Gitblit v1.8.0