From 181c63668c5d81002fa2dd4f5312318cf81f2180 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 29 三月 2021 15:50:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/views/MapTemplate.vue | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index e248cee..e0e1dc4 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>
<PublicBounced ref="PublicBounced"></PublicBounced>
+ <el-button type="primary" @click="AddGasHelper" class="flue-gas">搴熸皵</el-button>
+ <PublicBounced ref="PublicBounced"></PublicBounced>
</div>
</template>
@@ -38,9 +40,14 @@
import Enterprise from '../components/table/enterprise'
// 搴曞浘涓氬姟js閫昏緫
import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
-// 鍏叡灞曠ず鏁版嵁
+// 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'
+// import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
export default {
name: 'MapTemplate',
components: {
@@ -55,6 +62,8 @@
LcServiceLayer,
Popup,
summarySheets,
+ // SolidContent,
+ // PopupGas,
PublicBounced
},
data () {
@@ -78,6 +87,25 @@
})
},
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,
@@ -89,9 +117,6 @@
const AddSolidWaste = new AddSolidWasteHelper({ map: this.map })
AddSolidWaste.requestData(data)
AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.PublicBounced)
- },
- isShowHidden () {
- this.isShowBtn = !this.isShowBtn
},
saveMapStatus () {
window.serviceLayerHelper = this.serviceLayerHelper
@@ -118,6 +143,7 @@
this.vectorLayerHelper.initVectorLayers(this.config)
// this.ChangeState()
+ // this.AddGasHelper()
this.saveMapStatus()
// this.setMapObj(this.mapObj)
@@ -166,6 +192,12 @@
</script>
<style lang="less">
+.flue-gas {
+ position: fixed;
+ top: 88px;
+ left: 180px;
+ z-index: 500;
+}
.solid-waste {
position: absolute;
--
Gitblit v1.8.0