From 653c004b4f44396cdb4dce04c17152c7563e37f8 Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期五, 09 四月 2021 11:02:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/ToolBoxPanel.vue | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 850d54c..9733c83 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -41,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>
@@ -382,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
+ }
}
}
}
@@ -489,8 +492,9 @@
.special-button {
width: 0.1362rem;
height: 0.2725rem;
- color: #C0C4CC;
- border-radius: 0.03rem 50% 50% 0.03rem;
+ background:@background-color4;
+ color:@color-tool;
+ border:1px solid @color-tool;
}
.special-button:hover{
color: #00fff6;
--
Gitblit v1.8.0