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 | 69 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 7 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 2e804f4..540e1b9 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -17,10 +17,13 @@
<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 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>
<!-- <SolidContent ref="SolidWastePopup"></SolidContent>-->
<el-button type="primary" @click="AddGasHelper" class="flue-gas">搴熸皵</el-button>
<popup-gas ref="FlueGas"></popup-gas>
- <public-bouncedounced ref="PublicBounced"></public-bouncedounced>
+ <PublicBounced ref="PublicBounced"></PublicBounced>
</div>
</template>
@@ -39,15 +42,18 @@
// import MenuSpecial from '@components/panel/MenuTopic'
import LegendPanel from '@components/panel/LegendPanel'
import Enterprise from '../components/table/enterprise'
+import SolidContent from '@components/BaseNav/SolidWaste/SolidContent'
+import WasteWaterContent from '@components/BaseNav/WasteWater/WasteWaterContent'
// 搴曞浘涓氬姟js閫昏緫
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'
-
+import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
export default {
name: 'MapTemplate',
components: {
@@ -62,12 +68,15 @@
LcServiceLayer,
Popup,
summarySheets,
+ SolidContent,
+ WasteWaterContent
// SolidContent,
- PopupGas
- // PublicBounced
+ PopupGas,
+ PublicBounced
},
data () {
return {
+ show: true,
// isShowBtn: false,
map: null,
lcServiceLayerVisible: false,
@@ -88,9 +97,23 @@
},
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()
- AddGas.SetPlueGasContent(this.config, this.$refs.FlueGas)
+ AddGas.requestData(data)
+ AddGas.SetPlueGasContent(this.config, this.$refs.PublicBounced)
},
ChangeState () {
const data = {
@@ -101,9 +124,21 @@
longDayWarr: ''
}
const AddSolidWaste = new AddSolidWasteHelper({ map: this.map })
+ AddSolidWaste.requestData()
+ AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.SolidWastePopup)
+ },
+ ChangeWaterState () {
+ if (this.show) {
+ const AddWasteWater = new AddWasteWaterHelper({ map: this.map })
+ AddWasteWater.requestData()
+ AddWasteWater.SetWasteWaterContent(this.config, this.$refs.WasteWaterPopup)
+ }
AddSolidWaste.requestData(data)
AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.PublicBounced)
},
+ // isShowHidden () {
+ // this.isShowBtn = !this.isShowBtn
+ // },
saveMapStatus () {
window.serviceLayerHelper = this.serviceLayerHelper
this.$store.commit('setMapObj', this.map)
@@ -130,6 +165,8 @@
// this.ChangeState()
// this.AddGasHelper()
+ // this.ChangeState()
+ // this.ChangeWaterState()
this.saveMapStatus()
// this.setMapObj(this.mapObj)
@@ -191,6 +228,13 @@
z-index: 999;
}
+.Waste-water {
+ position: absolute;
+ top: 88px;
+ left: 380px;
+ z-index: 999;
+}
+
.full-screen {
width: 100%;
height: 100%;
@@ -220,5 +264,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