From 8f560e479082084987d3d7521a7f42df7da72eba Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 31 三月 2021 18:01:15 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/ToolBoxPanel.vue | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 36b950d..1e47999 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -17,11 +17,11 @@
v-model="isShow[index]"
>
<el-button slot="reference" class="el-button"
- :class="active === index && checked? 'tools-panel-choose':''"
+ :class="active === index? 'tools-panel-choose':''"
@click.native="changeChoose(index)">
- <img :src="item.iconSelecd" alt="" v-if="active === index && checked"/>
+ <img :src="item.iconSelecd" alt="" v-if="active === index"/>
<img :src="item.icon" alt="" v-else/>
- <span v-if="active === index && checked">{{ 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)"
@@ -297,18 +297,25 @@
this.drawLayer = this.L.layerGroup().addTo(this.map)
}
this.active = index
- this.isShow[index] = !this.isShow[index]
- if (this.checkbutton === index) {
- this.checked = !this.checked
- this.Selecd = -1
- } else {
- if (this.checkbutton === -1) {
- this.checked = !this.checked
- } else {
- this.checked = true
- }
+ // this.isShow[index] = !this.isShow[index]
+ // this.isShow[index - 1] = !this.isShow[index - 1]
+ // if (this.checkbutton === index) {
+ // this.checked = !this.checked
+ // this.Selecd = -1
+ // } else {
+ // if (this.checkbutton === -1) {
+ // this.checked = !this.checked
+ // } else {
+ // this.checked = true
+ // }
+ // }
+ // this.checkbutton = index
+ // console.log(this.isShow[index - 1])
+ console.log(this.basemapList)
+ for (let i = 0; i < this.isShow.length; i++) {
+ this.isShow[i] = false
}
- this.checkbutton = index
+ this.isShow[index] = true
},
choiceItem (itemT, indexT) {
this.Selecd = indexT
@@ -414,6 +421,7 @@
},
changeSelectMouse () {
this.selectGroup = true
+ this.isShow = []
}
}
}
--
Gitblit v1.8.0