From 2f3695cf0962c35021e6ad76495e7a38e7d3878d Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 25 三月 2021 17:10:40 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/views/MapTemplate.vue | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 7665bb1..59be60e 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -18,6 +18,8 @@
<!-- <el-button id="map-btn" el-icon-c-scale-to-original icon="el-icon-c-scale-to-original" circle @click="isShowHidden"></el-button>-->
<el-button type="primary" @click="ChangeState" class="solid-waste">鍥哄簾</el-button>
<SolidContent ref="SolidWastePopup"></SolidContent>
+ <el-button type="primary" @click="ChangeWaterState" class="Waste-water">搴熸按</el-button>
+ <WasteWaterContent ref="WasteWaterPopup"></WasteWaterContent>
</div>
</template>
@@ -36,9 +38,11 @@
// import MenuSpecial from '@components/panel/MenuTopic'
import LegendPanel from '@components/panel/LegendPanel'
import Enterprise from '../components/table/enterprise'
-import SolidContent from '@components/BaseNav/SolidWaste/SolidContent'
+import SolidContent from '@components/BaseNav/SolidContent'
+import WasteWaterContent from '@components/BaseNav/WasteWaterContent'
// 搴曞浘涓氬姟js閫昏緫
-import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
+import AddSolidWasteHelper from '@components/BaseNav/SolidWaste'
+import AddWasteWaterHelper from '@components/BaseNav/WasteWater'
export default {
name: 'MapTemplate',
@@ -54,7 +58,8 @@
LcServiceLayer,
Popup,
summarySheets,
- SolidContent
+ SolidContent,
+ WasteWaterContent
},
data () {
return {
@@ -81,9 +86,14 @@
AddSolidWaste.requestData()
AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.SolidWastePopup)
},
- isShowHidden () {
- this.isShowBtn = !this.isShowBtn
+ ChangeWaterState () {
+ const AddWasteWater = new AddWasteWaterHelper({ map: this.map })
+ AddWasteWater.requestData()
+ AddWasteWater.SetWasteWaterContent(this.config, this.$refs.WasteWaterPopup)
},
+ // isShowHidden () {
+ // this.isShowBtn = !this.isShowBtn
+ // },
saveMapStatus () {
window.serviceLayerHelper = this.serviceLayerHelper
this.$store.commit('setMapObj', this.map)
@@ -165,6 +175,13 @@
z-index: 999;
}
+.Waste-water {
+ position: absolute;
+ top: 88px;
+ left: 180px;
+ z-index: 999;
+}
+
.full-screen {
width: 100%;
height: 100%;
--
Gitblit v1.8.0