From 7b4d8a5ee0cae50a5f473e3765ba84f28fe8ba4b Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期一, 29 三月 2021 11:27:54 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/views/MapTemplate.vue | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index be50061..540e1b9 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -20,6 +20,10 @@
<SolidContent ref="SolidWastePopup"></SolidContent>
<el-button type="primary" @click="ChangeWaterState" class="Waste-water">搴熸按</el-button>
<WasteWaterContent ref="WasteWaterPopup"></WasteWaterContent>
+<!-- <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>
@@ -44,6 +48,12 @@
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: {
@@ -60,10 +70,14 @@
summarySheets,
SolidContent,
WasteWaterContent
+ // SolidContent,
+ PopupGas,
+ PublicBounced
},
data () {
return {
show: true,
+ // isShowBtn: false,
map: null,
lcServiceLayerVisible: false,
basemapHelper: {},
@@ -82,7 +96,33 @@
})
},
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)
@@ -93,6 +133,8 @@
AddWasteWater.requestData()
AddWasteWater.SetWasteWaterContent(this.config, this.$refs.WasteWaterPopup)
}
+ AddSolidWaste.requestData(data)
+ AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.PublicBounced)
},
// isShowHidden () {
// this.isShowBtn = !this.isShowBtn
@@ -121,6 +163,8 @@
this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.map) // 鍒濆鍖栧姩鎬佽绱犲浘灞傚姪鎵�
this.vectorLayerHelper.initVectorLayers(this.config)
+ // this.ChangeState()
+ // this.AddGasHelper()
// this.ChangeState()
// this.ChangeWaterState()
@@ -171,7 +215,12 @@
</script>
<style lang="less">
-
+.flue-gas {
+ position:fixed;
+ top: 88px;
+ left: 180px;
+ z-index: 500;
+}
.solid-waste {
position: absolute;
top: 88px;
@@ -182,7 +231,7 @@
.Waste-water {
position: absolute;
top: 88px;
- left: 180px;
+ left: 380px;
z-index: 999;
}
--
Gitblit v1.8.0