From 78b643de0b8690d566146858cd781be98d01777d Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期一, 29 三月 2021 10:00:50 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/views/MapTemplate.vue | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 5 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 612e145..9e972be 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -11,11 +11,16 @@
<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="AddGasHelper" class="flue-gas">搴熸皵</el-button>
+ <popup-gas ref="FlueGas"></popup-gas>
+ <PublicBounced ref="PublicBounced"></PublicBounced>
</div>
</template>
@@ -34,6 +39,14 @@
// import MenuSpecial from '@components/panel/MenuTopic'
import LegendPanel from '@components/panel/LegendPanel'
import Enterprise from '../components/table/enterprise'
+// 搴曞浘涓氬姟js閫昏緫
+import AddSolidWasteHelper from '@components/BaseNav/SolidWaste'
+// 搴熸皵
+import AddGasHelper from '@components/flueGas/flueGas'
+import PopupGas from '@/components/flueGas/popup-gas'
+import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
+// 鍏叡灞曠ず鏁版嵁
+import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
export default {
name: 'MapTemplate',
@@ -48,7 +61,9 @@
LcBasemap,
LcServiceLayer,
Popup,
- summarySheets
+ summarySheets,
+ SolidContent,
+ PopupGas
},
data () {
return {
@@ -71,8 +86,22 @@
})
},
methods: {
- isShowHidden () {
- this.isShowBtn = !this.isShowBtn
+ AddGasHelper () {
+ const AddGas = new AddGasHelper({ map: this.map })
+ AddGas.requestData()
+ AddGas.SetPlueGasContent(this.config, this.$refs.FlueGas)
+ },
+ 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)
},
saveMapStatus () {
window.serviceLayerHelper = this.serviceLayerHelper
@@ -97,6 +126,9 @@
this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.map) // 鍒濆鍖栧姩鎬佽绱犲浘灞傚姪鎵�
this.vectorLayerHelper.initVectorLayers(this.config)
+
+ // this.ChangeState()
+ // this.AddGasHelper()
this.saveMapStatus()
// this.setMapObj(this.mapObj)
@@ -145,6 +177,18 @@
</script>
<style lang="less">
+.flue-gas {
+ position:fixed;
+ top: 88px;
+ left: 180px;
+ z-index: 500;
+}
+.solid-waste {
+ position: absolute;
+ top: 88px;
+ left: 88px;
+ z-index: 999;
+}
.full-screen {
width: 100%;
@@ -164,11 +208,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