From 404b9d331ba10fd1683e77c916c01aaa4cba4f0b Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期四, 01 四月 2021 14:12:55 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/ToolBoxPanel.vue | 84 +++++++++++++++++++++++++-----------------
1 files changed, 50 insertions(+), 34 deletions(-)
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index b6147bc..79b4693 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -9,28 +9,30 @@
<transition name="animationChange">
<el-row v-show="selectGroup" class="specific-tools-group">
<el-popover
+ trigger="manual"
placement="bottom"
- trigger="click"
:popper-class="'tools-panel-content'"
v-for="(item,index) in menuList" :key="index"
:width="item.index === '2'?230 : 150"
+ v-model="isShow[index]"
>
- <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 && checked"/>
+ <el-button slot="reference" class="el-button"
+ :class="active === index? 'tools-panel-choose':''"
+ @click.native="changeChoose(index)">
+ <img :src="item.iconSelecd" alt="" v-if="active === index"/>
<img :src="item.icon" alt="" v-else/>
- <span v-if="active === index && checked">{{ item.label }}</span>
+ <span v-if="active === index">{{ item.label }}</span>
<span v-else class="default-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/>
+ <img :src="itemT.iconChoose" :title="itemT.title" v-if="Selecd === indexT && checkedItem" alt=""/>
+ <img :src="itemT.icon" :title="itemT.title" alt="" v-else/>
</el-button>
<div class="base-map-inner-panel" v-show="item.index==='2'">
- <div v-for="item in basemapList" :key="item.code" class="basemap-layer-item">
+ <div v-for="item in basemapHelper.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)"/>
+ @click="changeBasemap(item)" alt=""/>
<el-checkbox class="base-map-anno" name="basemap" v-model="item.conf.annotationCheck"
label="鏍囨敞" @change="changeBasemap(item)">
</el-checkbox>
@@ -83,6 +85,11 @@
import distance from '@assets/images/map-pages/icon/toolbox/juli.png'
import mm from '@assets/images/map-pages/icon/toolbox/M2.png'
+// 涓嬭浇
+import FullScreen from '@assets/images/map-pages/icon/toolbox/fullscreen.png'
+import cross from '@assets/images/map-pages/icon/toolbox/cross.png'
+import vertical from '@assets/images/map-pages/icon/toolbox/vertical.png'
+
// 娴嬮噺鐨勬柟娉�
import Measure from '@/components/plugin/MeaSure'
@@ -90,7 +97,7 @@
name: 'ToolBoxPanel',
data () {
return {
- isShow: true,
+ isShow: [],
currentBaseMapCode: 'tianditu_img',
basemapList: [],
selectGroup: false,
@@ -98,9 +105,11 @@
drawLayerArray: [],
map: null,
active: -1,
- Selecd: -1,
checked: false,
checkbutton: -1,
+ checkedItem: false,
+ Selecd: -1,
+ isSelecd: -1,
menuList: [
{
icon: plot,
@@ -228,19 +237,19 @@
{
index: '4-1',
label: '鍏ㄥ睆',
- icon: '',
+ icon: FullScreen,
title: '鍏ㄥ睆'
},
{
index: '4-2',
label: 'A4妯悜',
- icon: '',
+ icon: cross,
title: 'A4妯悜'
},
{
index: '4-3',
label: 'A4绾靛悜',
- icon: '',
+ icon: vertical,
title: 'A4绾靛悜'
}
]
@@ -253,22 +262,16 @@
return this.$store.state.map.basemapHelper
}
},
- watch: {
- basemapHelper (newVal) {
- if (newVal != null) {
- this.updateBasemapList()
- }
- }
- },
methods: {
- updateBasemapList () {
- this.basemapList = this.basemapHelper.getBasemapList()
+ init (map) {
+ this.map = map
+ this.toolBoxPanelVisible = true
},
changeBasemap (itm) {
+ this.active = -1
const code = itm.code
- this.basemapList.forEach((item) => {
+ this.basemapHelper.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)
@@ -276,7 +279,7 @@
this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, false)
}
- this.basemapHelper.getBasemapList().forEach((item) => {
+ this.basemapHelper.basemapList.forEach((item) => {
item.layer.bringToBack()
})
}
@@ -287,19 +290,28 @@
this.drawLayer = this.L.layerGroup().addTo(this.map)
}
this.active = index
- if (this.checkbutton === index) {
- this.checked = !this.checked
- } else {
- if (this.checkbutton === -1) {
- this.checked = !this.checked
- } else {
- this.checked = true
+ console.log(this.basemapList)
+ for (let i = 0; i < this.isShow.length; i++) {
+ if (i !== index) {
+ this.isShow[i] = false
}
}
- this.checkbutton = index
+ // debugger
+ this.isShow[index] = !this.isShow[index]
+ this.isShow[index] ? (this.active = index) : (this.active = '')
},
choiceItem (itemT, indexT) {
this.Selecd = indexT
+ if (this.isSelecd === indexT) {
+ this.checkedItem = !this.checkedItem
+ } else {
+ if (this.isSelecd === -1) {
+ this.checkedItem = !this.checkedItem
+ } else {
+ this.checkedItem = true
+ }
+ }
+ this.isSelecd = indexT
switch (itemT.label) {
case '鐐规爣缁�':
var myIcon = this.L.icon({
@@ -377,6 +389,7 @@
printerY.printMap('A4Portrait page', '绾靛悜')
break
}
+ this.active = -1
},
setLogic () {
this.drawLayer.on('dblclick', this.L.DomEvent.stop).on('dblclick', this.drawLayer.toggleEdit)
@@ -391,6 +404,7 @@
},
changeSelectMouse () {
this.selectGroup = true
+ this.isShow = []
}
}
}
@@ -451,6 +465,7 @@
}
.el-button-choice {
+ left: 500px;
z-index: 999;
padding: 0;
margin: 0 0.015rem;
@@ -526,6 +541,7 @@
display: block;
color: @color-shadow;
}
+
.default-span {
display: block;
color: @color-over;
--
Gitblit v1.8.0