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 | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 612e145..59be60e 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -11,11 +11,15 @@
<monitor-panel></monitor-panel>
<!-- <top-enterprise-panel></top-enterprise-panel>-->
<tool-box-panel ref="toolBox"></tool-box-panel>
-<!-- <menu-special></menu-special>-->
+ <!-- <menu-special></menu-special>-->
<legend-panel></legend-panel>
<summary-sheets></summary-sheets>
<enterprise></enterprise>
-<!-- <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 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>
@@ -34,6 +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/SolidContent'
+import WasteWaterContent from '@components/BaseNav/WasteWaterContent'
+// 搴曞浘涓氬姟js閫昏緫
+import AddSolidWasteHelper from '@components/BaseNav/SolidWaste'
+import AddWasteWaterHelper from '@components/BaseNav/WasteWater'
export default {
name: 'MapTemplate',
@@ -48,11 +57,12 @@
LcBasemap,
LcServiceLayer,
Popup,
- summarySheets
+ summarySheets,
+ SolidContent,
+ WasteWaterContent
},
data () {
return {
- // isShowBtn: false,
map: null,
lcServiceLayerVisible: false,
basemapHelper: {},
@@ -71,9 +81,19 @@
})
},
methods: {
- isShowHidden () {
- this.isShowBtn = !this.isShowBtn
+ ChangeState () {
+ const AddSolidWaste = new AddSolidWasteHelper({ map: this.map })
+ AddSolidWaste.requestData()
+ AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.SolidWastePopup)
},
+ 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)
@@ -97,6 +117,8 @@
this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.map) // 鍒濆鍖栧姩鎬佽绱犲浘灞傚姪鎵�
this.vectorLayerHelper.initVectorLayers(this.config)
+
+ this.ChangeState()
this.saveMapStatus()
// this.setMapObj(this.mapObj)
@@ -146,6 +168,20 @@
<style lang="less">
+.solid-waste {
+ position: absolute;
+ top: 88px;
+ left: 88px;
+ z-index: 999;
+}
+
+.Waste-water {
+ position: absolute;
+ top: 88px;
+ left: 180px;
+ z-index: 999;
+}
+
.full-screen {
width: 100%;
height: 100%;
@@ -164,11 +200,16 @@
//background-color: #0661AE;
border-top: 1px solid #0661AE;
}
+
#map-btn {
position: fixed;
top: 20px;
left: 100px;
z-index: 9999;
}
+
+ .leaflet-custom-icon {
+ background: white;
+ }
}
</style>
--
Gitblit v1.8.0