From 2d9a0acec2da0d6caf81083e900f5eb111623304 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 17 三月 2021 21:01:53 +0800
Subject: [PATCH] Merge branch 'master' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into master
---
src/components/panel/ToolBoxPanel.vue | 61 +++++++++++++++++++++---------
1 files changed, 42 insertions(+), 19 deletions(-)
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 37a43a2..018e8c4 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -1,10 +1,13 @@
<template>
<div class="left-top-toolbox-panel">
<div class="specific-tools">
- <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 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>
<transition name="animationChange">
<el-row v-show="selectGroup" class="specific-tools-group">
@@ -17,13 +20,13 @@
>
<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)"
v-show="item.index!=='2'">
- <img :src="itemT.iconChoose" :title="itemT.title" v-if="Selecd === indexT"/>
+ <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'">
@@ -89,6 +92,8 @@
name: 'ToolBoxPanel',
data () {
return {
+ checked: false,
+ checkbuuton: -1,
isShow: true,
currentBaseMapCode: 'tianditu_img',
basemapList: [],
@@ -281,10 +286,23 @@
})
},
changeChoose (index) {
- if (this.active === index) {
- console.log('鍙栨秷褰撳墠閫変腑鐘舵��')
+ if (this.drawLayer == null) {
+ this.drawLayer = this.L.layerGroup().addTo(this.map)
}
this.active = index
+ if (this.drawLayer == null) {
+ this.drawLayer = this.L.layerGroup().addTo(this.map)
+ }
+ 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
@@ -299,6 +317,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()
@@ -337,10 +356,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
@@ -349,7 +367,8 @@
sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
filename: 'map_image',
exportOnly: true,
- hideControlContainer: true
+ hideControlContainer: true,
+ hidden: true
}).addTo(this.map)
printerX.printMap('A4Landscape page', '妯悜')
break
@@ -358,7 +377,8 @@
sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
filename: 'map_image',
exportOnly: true,
- hideControlContainer: true
+ hideControlContainer: true,
+ hidden: true
}).addTo(this.map)
printerY.printMap('A4Portrait page', '绾靛悜')
break
@@ -373,6 +393,7 @@
changeSelect () {
this.selectGroup = false
this.isShow = !this.isShow
+ this.active = -1
},
changeSelectMouse () {
this.selectGroup = true
@@ -407,7 +428,6 @@
width: 45px;
height: 45px;
background: @background-color;
- //border: 1px solid @color-shadow;
vertical-align: middle !important;
.base-map-img {
@@ -426,11 +446,13 @@
.span-default {
display: block;
color: @color-shadow;
+ font-size: 11px;
}
span {
display: block;
color: @color-over;
+ font-size: 11px;
}
}
@@ -441,7 +463,7 @@
width: 45px;
height: 45px;
background: @background-color;
- border: 1px solid @color-shadow;
+ border: 0.00521rem solid @color-shadow;
}
.active-button {
@@ -451,11 +473,8 @@
.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;
@@ -513,6 +532,10 @@
display: block;
color: @color-shadow;
}
+ a {
+ display: block;
+ color: @color-over;
+ }
}
.special-button {
--
Gitblit v1.8.0