From 17ba6febdaacf7563f7688bae473a4a89e914ff5 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期一, 29 三月 2021 16:04:18 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/views/MapTemplate.vue | 97 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 84 insertions(+), 13 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 59be60e..c4a64c0 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -19,7 +19,10 @@
<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>
+ <PublicBounced ref="PublicBounced"></PublicBounced>
+<!-- <SolidContent ref="SolidWastePopup"></SolidContent>-->
+ <el-button type="primary" @click="AddGasHelper" class="flue-gas">搴熸皵</el-button>
+ <PublicBounced ref="PublicBounced"></PublicBounced>
</div>
</template>
@@ -38,12 +41,18 @@
// 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'
+import SolidContent from '@components/BaseNav/SolidWaste/SolidContent'
+// import WasteWaterContent from '@components/BaseNav/WasteWater/WasteWaterContent'
// 搴曞浘涓氬姟js閫昏緫
-import AddSolidWasteHelper from '@components/BaseNav/SolidWaste'
-import AddWasteWaterHelper from '@components/BaseNav/WasteWater'
+import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
+import AddWasteWaterHelper from '@components/BaseNav/WasteWater/WasteWater'
+// import SolidContent from '@components/SolidWaste/SolidContent'
+// 搴熸皵
+import AddGasHelper from '@components/flueGas/flueGas'
+// import PopupGas from '@/components/flueGas/popup-gas'
+// // 鍏叡灞曠ず鏁版嵁
+import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
export default {
name: 'MapTemplate',
components: {
@@ -59,10 +68,14 @@
Popup,
summarySheets,
SolidContent,
- WasteWaterContent
+ // WasteWaterContent,
+ // SolidContent,
+ // PopupGas,
+ PublicBounced
},
data () {
return {
+ // isShowBtn: false,
map: null,
lcServiceLayerVisible: false,
basemapHelper: {},
@@ -81,15 +94,55 @@
})
},
methods: {
+ AddGasHelper () {
+ const data = {
+ companyId: 3900100145,
+ id: '',
+ monType: 2,
+ userCode: 'wenchun.deng',
+ monDuration: '',
+ epName: '',
+ secdDeptId: '',
+ contrLevel: '',
+ dataStatus: '',
+ dataFlag: '',
+ runStatus: '',
+ emissTypeId: ''
+ }
+ const AddGas = new AddGasHelper({ map: this.map })
+ AddGas.requestData(data)
+ AddGas.SetPlueGasContent(this.config, this.$refs.PublicBounced)
+ },
ChangeState () {
+ const data = {
+ companyId: 3900100145,
+ userCode: 'wenchun.deng',
+ name: '',
+ marginWarr: '',
+ longDayWarr: ''
+ }
const AddSolidWaste = new AddSolidWasteHelper({ map: this.map })
- AddSolidWaste.requestData()
- AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.SolidWastePopup)
+ AddSolidWaste.requestData(data)
+ AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.PublicBounced)
},
ChangeWaterState () {
+ const data = {
+ companyId: 3900100145,
+ id: '',
+ monType: 1,
+ userCode: 'wenchun.deng',
+ monDuration: '',
+ epName: '',
+ secdDeptId: '',
+ contrLevel: '',
+ dataStatus: '',
+ dataFlag: '',
+ runStatus: '',
+ emissTypeId: ''
+ }
const AddWasteWater = new AddWasteWaterHelper({ map: this.map })
- AddWasteWater.requestData()
- AddWasteWater.SetWasteWaterContent(this.config, this.$refs.WasteWaterPopup)
+ AddWasteWater.requestData(data)
+ AddWasteWater.SetWasteWaterContent(this.config, this.$refs.PublicBounced)
},
// isShowHidden () {
// this.isShowBtn = !this.isShowBtn
@@ -118,7 +171,9 @@
this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.map) // 鍒濆鍖栧姩鎬佽绱犲浘灞傚姪鎵�
this.vectorLayerHelper.initVectorLayers(this.config)
- this.ChangeState()
+ // this.ChangeState()
+ // this.AddGasHelper()
+ // this.ChangeWaterState()
this.saveMapStatus()
// this.setMapObj(this.mapObj)
@@ -167,7 +222,12 @@
</script>
<style lang="less">
-
+.flue-gas {
+ position:fixed;
+ top: 88px;
+ left: 180px;
+ z-index: 500;
+}
.solid-waste {
position: absolute;
top: 88px;
@@ -178,7 +238,7 @@
.Waste-water {
position: absolute;
top: 88px;
- left: 180px;
+ left: 280px;
z-index: 999;
}
@@ -211,5 +271,16 @@
.leaflet-custom-icon {
background: white;
}
+
+ .leaflet-marker-icon {
+ background: none;
+ }
+
+ #migic {
+ width: 48px;
+ height: 48px;
+ margin: -18px -20px;
+ z-index: 999;
+ }
}
</style>
--
Gitblit v1.8.0