From ac41dd3a9b8632c9cbda389012a85de87135ed47 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 22 四月 2021 14:56:42 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/ToolBoxPanel.vue | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index b9b89f9..cca3068 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -2,29 +2,23 @@
<div class="left-top-toolbox-panel">
<div class="specific-tools">
<el-tooltip :popper-class="'map-tooltip'" effect="dark" content="宸ュ叿" placement="left">
- <el-button :class="selectGroup === true ?'active-button':''" class="el-button-choice" @click.enter.native="changeSelectMouse">
+ <div :class='["iconBtn",selectGroup === true ? "active-button" : ""]' @click="changeSelectMouse" >
<i class="icon iconfont icongongju"></i>
- <!--<span class="span-default">宸ュ叿</span>-->
- </el-button>
+ </div>
</el-tooltip>
<transition name="animationChange">
- <el-row v-show="selectGroup" class="specific-tools-group">
+ <div v-show="selectGroup" class="specific-tools-group">
<el-popover
trigger="manual"
placement="bottom"
:popper-class="'tools-panel-content'"
v-for="(item,index) in menuList" :key="index"
:width="item.index === '2'?230 : 150"
- v-model="isShow[index]"
- >
+ v-model="isShow[index]">
<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/> -->
<i :class="'icon iconfont '+item.icon"></i>
</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 && checkedItem" alt=""/>
- <img :src="itemT.icon" :title="itemT.title" alt="" v-else/> -->
+ <el-button v-for="(itemT,indexT) in item.items" :key="indexT" @click="choiceItem(itemT,indexT)" v-show="item.index!=='2'" :class="indexT==toolActive?'hover':''" >
<i :class="'icon iconfont '+itemT.icon"></i>
</el-button>
<lc-base-map v-show="item.index==='2'"></lc-base-map>
@@ -32,7 +26,7 @@
<!-- <el-button @click="changeSelect" class="special-button">
<i class="el-icon-d-arrow-left"></i>
</el-button> -->
- </el-row>
+ </div>
</transition>
</div>
</div>
@@ -107,6 +101,7 @@
checkedItem: false,
Selecd: -1,
isSelecd: -1,
+ toolActive: -1,
menuList: [
{
icon: 'iconjuliceliang', // plot,
@@ -119,6 +114,7 @@
label: '鐐规爣缁�',
icon: 'iconlocation-full', // marker,
title: '鐐规爣缁�',
+ active: false,
iconChoose: markerChoose
},
{
@@ -126,6 +122,7 @@
label: '绾挎爣缁�',
icon: 'iconline', // line,
title: '绾挎爣缁�',
+ active: 0,
iconChoose: lineChoose
},
{
@@ -133,6 +130,7 @@
label: '澶氳竟褰�',
icon: 'iconliubianxing1', // polygonJ,
title: '澶氳竟褰�',
+ active: 0,
iconChoose: polygonJChoose
},
{
@@ -140,6 +138,7 @@
label: '鐭╁舰',
icon: 'iconcheckbox-full', // polygonS,
title: '鐭╁舰',
+ active: 0,
iconChoose: polygonSChoose
},
{
@@ -147,11 +146,13 @@
label: '鍦嗗舰',
icon: 'iconyuan', // polygonY,
title: '鍦嗗舰',
+ active: 0,
iconChoose: polygonYChoose
},
{
index: '1-4',
label: '鍒犻櫎',
+ active: -1,
icon: 'icondelete-fill', // del,
title: '鍒犻櫎鏍囩粯',
iconChoose: delChoose
@@ -169,6 +170,7 @@
label: '璺濈',
icon: 'iconjuliceliang', // distance,
title: '璺濈娴嬮噺',
+ active: 0,
iconChoose: distanceChoose
},
{
@@ -176,6 +178,7 @@
label: '闈㈢Н',
icon: 'iconmianjiceliang', // mm,
title: '闈㈢Н娴嬮噺',
+ active: 0,
iconChoose: mmChoose
},
{
@@ -183,6 +186,7 @@
label: '娓呴櫎',
icon: 'icondelete-fill', // del,
title: '娓呴櫎娴嬮噺',
+ active: -1,
iconChoose: delChoose
}
]
@@ -196,6 +200,7 @@
{
label: '褰卞儚鍥�',
index: '2-1',
+ active: 0,
items: [
{
index: '2-1-1',
@@ -206,6 +211,7 @@
{
label: '鐭㈤噺鍥�',
index: '2-2',
+ active: 0,
items: [
{
index: '2-2-1',
@@ -216,6 +222,7 @@
{
label: '鍦板舰鍥�',
index: '2-3',
+ active: 0,
items: [
{
index: '2-3-1',
@@ -235,18 +242,21 @@
index: '4-1',
label: '鍏ㄥ睆',
icon: 'icontianchongxing-', // FullScreen,
+ active: 0,
title: '鍏ㄥ睆'
},
{
index: '4-2',
label: 'A4妯悜',
icon: 'iconsaoma', // cross,
+ active: 0,
title: 'A4妯悜'
},
{
index: '4-3',
label: 'A4绾靛悜',
icon: 'iconsaoma zongs', // vertical,
+ active: 0,
title: 'A4绾靛悜'
}
]
@@ -275,6 +285,7 @@
this.drawLayer = this.L.layerGroup().addTo(this.map)
}
this.active = index
+ this.toolActive = -1
// console.log(this.basemapList)
for (let i = 0; i < this.isShow.length; i++) {
if (i !== index) {
@@ -287,6 +298,11 @@
},
choiceItem (itemT, indexT) {
this.Selecd = indexT
+ if (itemT.active !== -1) {
+ this.toolActive = indexT
+ } else {
+ this.toolActive = -1
+ }
if (this.isSelecd === indexT) {
this.checkedItem = !this.checkedItem
} else {
@@ -437,7 +453,9 @@
margin: 0 0.015rem;
width: 0.2725rem;
height: 0.2725rem;
+ color:#00fff6;
background: @background-color;
+ border: 0.00521rem solid #00fff6;
vertical-align: middle !important;
font-size: 20px;
.base-map-img {
@@ -487,9 +505,9 @@
z-index: 1;
.tools-panel-choose {
- border: none;
- box-shadow: 0 0 0.03rem @color-shadow;
-
+ border: 0.00521rem solid #fff700;
+ box-shadow: 0 0 0.03rem #fff700;
+ color:#fff700;
img {
width: 22px;
height: 22px;
--
Gitblit v1.8.0