From 404b9d331ba10fd1683e77c916c01aaa4cba4f0b Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期四, 01 四月 2021 14:12:55 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/ToolBoxPanel.vue | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 2a9bf26..79b4693 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -30,7 +30,7 @@
<img :src="itemT.icon" :title="itemT.title" alt="" v-else/>
</el-button>
<div class="base-map-inner-panel" v-show="item.index==='2'">
- <div v-for="item in basemapList" :key="item.code" class="basemap-layer-item">
+ <div v-for="item in basemapHelper.basemapList" :key="item.code" class="basemap-layer-item">
<img class="base-map-img" width="50" height="50" :src="item.conf.icon_actived" :title="item.name"
@click="changeBasemap(item)" alt=""/>
<el-checkbox class="base-map-anno" name="basemap" v-model="item.conf.annotationCheck"
@@ -262,23 +262,16 @@
return this.$store.state.map.basemapHelper
}
},
- watch: {
- basemapHelper (newVal) {
- if (newVal != null) {
- this.updateBasemapList()
- }
- }
- },
methods: {
- updateBasemapList () {
- this.basemapList = this.basemapHelper.getBasemapList()
+ init (map) {
+ this.map = map
+ this.toolBoxPanelVisible = true
},
changeBasemap (itm) {
this.active = -1
const code = itm.code
- this.basemapList.forEach((item) => {
+ this.basemapHelper.basemapList.forEach((item) => {
if (item.code === code) {
- console.log(this.currentBaseMapCode)
if (this.currentBaseMapCode == null || this.currentBaseMapCode !== code) {
this.currentBaseMapCode = code
this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, true)
@@ -286,7 +279,7 @@
this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, false)
}
- this.basemapHelper.getBasemapList().forEach((item) => {
+ this.basemapHelper.basemapList.forEach((item) => {
item.layer.bringToBack()
})
}
@@ -297,6 +290,7 @@
this.drawLayer = this.L.layerGroup().addTo(this.map)
}
this.active = index
+ console.log(this.basemapList)
for (let i = 0; i < this.isShow.length; i++) {
if (i !== index) {
this.isShow[i] = false
@@ -304,6 +298,7 @@
}
// debugger
this.isShow[index] = !this.isShow[index]
+ this.isShow[index] ? (this.active = index) : (this.active = '')
},
choiceItem (itemT, indexT) {
this.Selecd = indexT
--
Gitblit v1.8.0