From 32e368a87045c93f09370b6051284ab6fabc4bd0 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 18 三月 2021 17:32:50 +0800
Subject: [PATCH] Merge branch 'master' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork
---
src/components/panel/ToolBoxPanel.vue | 136 +++++++++++++++++++++++++++------------------
1 files changed, 82 insertions(+), 54 deletions(-)
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 8db22bb..bcd5466 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -1,13 +1,10 @@
<template>
<div class="left-top-toolbox-panel">
<div class="specific-tools">
- <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 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 :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">
@@ -18,18 +15,19 @@
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':''"
+ <el-button slot="reference" class="el-button" :class="active === index && checked? 'tools-panel-choose':''"
@click="changeChoose(index)">
- <img :src="item.iconSelecd" alt="" v-if="active === index && checked === true"/>
+ <img :src="item.iconSelecd" alt="" v-if="active === index && checked"/>
<img :src="item.icon" alt="" v-else/>
- <span>{{ item.label }}</span>
+ <span v-if="active === index && checked">{{ 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 && checked === true"/>
+ <img :src="itemT.iconChoose" :title="itemT.title" v-if="Selecd === indexT && checkedItem"/>
<img :src="itemT.icon" :title="itemT.title" v-else/>
</el-button>
- <div class="base-map-inner-panel" v-show="!isShow&&item.index==='2'">
+ <div class="base-map-inner-panel" v-show="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)"/>
@@ -92,11 +90,19 @@
name: 'ToolBoxPanel',
data () {
return {
- checked: false,
- checkbuuton: -1,
- isShow: true,
+ isShow: false,
currentBaseMapCode: 'tianditu_img',
basemapList: [],
+ selectGroup: false,
+ drawLayer: null,
+ drawLayerArray: [],
+ map: null,
+ active: -1,
+ checked: false,
+ checkbutton: -1,
+ checkedItem: false,
+ Selecd: -1,
+ isSelecd: -1,
menuList: [
{
icon: plot,
@@ -241,14 +247,7 @@
}
]
}
- ],
- selectGroup: false,
- drawLayer: null,
- drawLayerArray: [],
- map: null,
- // L: window.L,
- active: -1,
- Selecd: -1
+ ]
}
},
computed: {
@@ -268,6 +267,7 @@
this.basemapList = this.basemapHelper.getBasemapList()
},
changeBasemap (itm) {
+ this.active = -1
const code = itm.code
this.basemapList.forEach((item) => {
if (item.code === code) {
@@ -286,23 +286,34 @@
})
},
changeChoose (index) {
- this.active = index
if (this.drawLayer == null) {
this.drawLayer = this.L.layerGroup().addTo(this.map)
}
- if (this.checkbuuton === index) {
+ this.active = index
+ if (this.checkbutton === index) {
this.checked = !this.checked
+ this.Selecd = -1
} else {
- if (this.checkbuuton === -1) {
+ if (this.checkbutton === -1) {
this.checked = !this.checked
} else {
this.checked = true
}
}
- this.checkbuuton = index
+ this.checkbutton = index
},
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({
@@ -314,6 +325,7 @@
this.drawLayer = this.map.editTools.startMarker()
this.drawLayer.setIcon(myIcon)
this.drawLayerArray.push(this.drawLayer)
+ this.drawLayer.on('dblclick', this.L.DomEvent.stop).on('dblclick', this.drawLayer.toggleEdit)
break
case '绾挎爣缁�':
this.drawLayer = this.map.editTools.startPolyline()
@@ -352,10 +364,9 @@
case '鍏ㄥ睆':
// this.map.toggleFullscreen()
var printer = this.L.easyPrint({
- sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
- filename: 'map_image',
exportOnly: true,
- hideControlContainer: true
+ hideControlContainer: true,
+ hidden: true
}).addTo(this.map)
printer.printMap('CurrentSize', '鍏ㄥ睆')
break
@@ -364,7 +375,8 @@
sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
filename: 'map_image',
exportOnly: true,
- hideControlContainer: true
+ hideControlContainer: true,
+ hidden: true
}).addTo(this.map)
printerX.printMap('A4Landscape page', '妯悜')
break
@@ -373,11 +385,13 @@
sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
filename: 'map_image',
exportOnly: true,
- hideControlContainer: true
+ hideControlContainer: true,
+ hidden: true
}).addTo(this.map)
printerY.printMap('A4Portrait page', '绾靛悜')
break
}
+ this.active = -1
},
setLogic () {
this.drawLayer.on('dblclick', this.L.DomEvent.stop).on('dblclick', this.drawLayer.toggleEdit)
@@ -386,9 +400,12 @@
})
},
changeSelect () {
- this.selectGroup = !this.selectGroup
+ this.selectGroup = false
this.isShow = !this.isShow
- this.checked = false
+ this.active = -1
+ },
+ changeSelectMouse () {
+ this.selectGroup = true
}
}
}
@@ -419,8 +436,8 @@
margin: 0 0.015rem;
width: 45px;
height: 45px;
- background: @background-color-tools;
- border: none;
+ background: @background-color;
+ vertical-align: middle !important;
.base-map-img {
position: absolute;
@@ -435,34 +452,39 @@
height: 22px;
}
- span {
- display: block;
- color: @color-tool;
- }
-
- a {
+ .span-default {
display: block;
color: @color-shadow;
+ font-size: 11px;
+ }
+
+ span {
+ display: block;
+ color: @color-over;
+ font-size: 11px;
}
}
.el-button-choice {
+ left: 500px;
z-index: 999;
padding: 0;
margin: 0 0.015rem;
width: 45px;
height: 45px;
- background: @background-color-tools;
- border: 1px solid @color-shadow;
+ background: @background-color;
+ border: 0.00521rem 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;
@@ -479,7 +501,7 @@
position: absolute;
margin-left: 2px;
background-color: rgba(0, 0, 0, .5);
- color: white;
+ color: @color-over;
.el-checkbox__label {
padding-left: 5px !important;
@@ -518,14 +540,20 @@
span {
display: block;
+ color: @color-shadow;
+ }
+
+ .default-span {
+ display: block;
+ color: @color-over;
}
}
- }
- .special-button {
- width: 22.5px;
- height: 45px;
- color: @color-over;
+ .special-button {
+ width: 22px;
+ height: 45px;
+ color: @color-over;
+ }
}
}
}
--
Gitblit v1.8.0