From 6a5c681cfad3b2fb1d5d52b7646f0baec6afabc5 Mon Sep 17 00:00:00 2001 From: wangqi <magical1908@outlook.com> Date: 星期四, 08 四月 2021 17:31:28 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/components/panel/ToolBoxPanel.vue | 32 +++++++++++++++++++++----------- 1 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue index ec5b7d2..9733c83 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> @@ -380,12 +382,15 @@ }, 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 + } } } } @@ -487,7 +492,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