From 188abb2598a9253b19762d0cf4c4b36db64bfe8b Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期一, 12 四月 2021 18:54:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/ToolBoxPanel.vue | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 850d54c..585dba3 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>
@@ -95,6 +95,9 @@
// 娴嬮噺鐨勬柟娉�
import Measure from '@/components/plugin/MeaSure'
+
+//
+import bus from '@/eventBus'
export default {
name: 'ToolBoxPanel',
@@ -263,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
@@ -273,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
@@ -382,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)
}
}
}
@@ -489,8 +511,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