From de01693a063433610388fab33cd4927f2f663e60 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期一, 12 四月 2021 18:42:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/ToolBoxPanel.vue | 53 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index ec5b7d2..585dba3 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -1,10 +1,12 @@
<template>
<div class="left-top-toolbox-panel">
<div class="specific-tools">
- <el-button :class="selectGroup === true ?'active-button':''" class="el-button-choice" @click.enter.native="changeSelectMouse">
+ <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">
<img src="@assets/images/map-pages/icon/toolbox/Selecd/tool.png" alt="" class="icon" />
<!--<span class="span-default">宸ュ叿</span>-->
- </el-button>
+ </el-button>
+ </el-tooltip>
<transition name="animationChange">
<el-row v-show="selectGroup" class="specific-tools-group">
<el-popover
@@ -20,8 +22,8 @@
@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">{{ item.label }}</span>
- <span v-else class="default-span">{{ 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'">
@@ -39,9 +41,9 @@
<!-- </div>-->
<lc-base-map v-show="item.index==='2'"></lc-base-map>
</el-popover>
- <el-button @click="changeSelect" class="special-button">
+ <!-- <el-button @click="changeSelect" class="special-button">
<i class="el-icon-d-arrow-left"></i>
- </el-button>
+ </el-button> -->
</el-row>
</transition>
</div>
@@ -93,6 +95,9 @@
// 娴嬮噺鐨勬柟娉�
import Measure from '@/components/plugin/MeaSure'
+
+//
+import bus from '@/eventBus'
export default {
name: 'ToolBoxPanel',
@@ -261,6 +266,17 @@
]
}
},
+ mounted () {
+ /* import bus from '@/eventBus' */
+ const that = this
+ bus.$on('changeState', function (state) {
+ if (state.num !== 1 && state.type) {
+ that.selectGroup = false
+ that.isShow = []
+ that.active = -1
+ }
+ })
+ },
methods: {
init (map) {
this.map = map
@@ -271,7 +287,7 @@
this.drawLayer = this.L.layerGroup().addTo(this.map)
}
this.active = index
- console.log(this.basemapList)
+ // console.log(this.basemapList)
for (let i = 0; i < this.isShow.length; i++) {
if (i !== index) {
this.isShow[i] = false
@@ -380,12 +396,20 @@
},
changeSelect () {
this.selectGroup = false
- this.isShow = !this.isShow
- this.active = -1
},
changeSelectMouse () {
- this.selectGroup = true
- this.isShow = []
+ this.selectGroup = !this.selectGroup
+ if (this.selectGroup) {
+ this.isShow = []
+ } else {
+ this.isShow = !this.isShow
+ this.active = -1
+ }
+ const state = {
+ type: this.selectGroup,
+ num: 1
+ }
+ bus.$emit('changeState', state)
}
}
}
@@ -487,7 +511,12 @@
.special-button {
width: 0.1362rem;
height: 0.2725rem;
- color: @color-over;
+ background:@background-color4;
+ color:@color-tool;
+ border:1px solid @color-tool;
+ }
+ .special-button:hover{
+ color: #00fff6;
}
}
}
--
Gitblit v1.8.0