From 0007f809089ec1c0395abc2a4a28e2b8868760ff Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 31 三月 2021 17:59:56 +0800
Subject: [PATCH] 工具栏问题修改
---
src/assets/images/map-pages/icon/toolbox/fullscreen.png | 0
src/components/panel/ToolBoxPanel.vue | 36 ++++++++++++++++++++++--------------
src/views/MapTemplate.vue | 14 +-------------
src/assets/images/map-pages/icon/toolbox/vertical.png | 0
src/assets/images/map-pages/icon/toolbox/cross.png | 0
5 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/src/assets/images/map-pages/icon/toolbox/cross.png b/src/assets/images/map-pages/icon/toolbox/cross.png
index a045597..a7e8175 100644
--- a/src/assets/images/map-pages/icon/toolbox/cross.png
+++ b/src/assets/images/map-pages/icon/toolbox/cross.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/fullscreen.png b/src/assets/images/map-pages/icon/toolbox/fullscreen.png
index 6dc19a9..bf6d1e0 100644
--- a/src/assets/images/map-pages/icon/toolbox/fullscreen.png
+++ b/src/assets/images/map-pages/icon/toolbox/fullscreen.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/vertical.png b/src/assets/images/map-pages/icon/toolbox/vertical.png
index 37850c9..7eb3be5 100644
--- a/src/assets/images/map-pages/icon/toolbox/vertical.png
+++ b/src/assets/images/map-pages/icon/toolbox/vertical.png
Binary files differ
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 = []
}
}
}
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index e3e491d..c3a06ce 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -39,7 +39,7 @@
import LegendPanel from '@components/panel/LegendPanel'
import Enterprise from '../components/table/enterprise'
// 搴曞浘涓氬姟js閫昏緫
-import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
+
import AddWasteWaterHelper from '@components/BaseNav/WasteWater/WasteWater'
import AddGasHelper from '@components/BaseNav/flueGas/flueGas'
// // 鍏叡灞曠ず鏁版嵁
@@ -82,18 +82,6 @@
})
},
methods: {
- ChangeState () {
- const data = {
- companyId: 3900100145,
- userCode: 'wenchun.deng',
- name: '',
- marginWarr: '',
- longDayWarr: ''
- }
- const AddSolidWaste = new AddSolidWasteHelper({ map: this.map })
- AddSolidWaste.requestData(data)
- AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.PublicBounced)
- },
AddGasHelper () {
const data = {
companyId: 3900100145,
--
Gitblit v1.8.0