From b41c6ca44111844bb96f3daffe2e61a0e9824f60 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期一, 29 三月 2021 16:02:35 +0800
Subject: [PATCH] 废水弹框内容加载

---
 src/views/MapTemplate.vue |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 540e1b9..dcbaf77 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -19,7 +19,7 @@
     <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>
     <popup-gas ref="FlueGas"></popup-gas>
@@ -43,7 +43,7 @@
 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'
+// import WasteWaterContent from '@components/BaseNav/WasteWater/WasteWaterContent'
 // 搴曞浘涓氬姟js閫昏緫
 import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
 import AddWasteWaterHelper from '@components/BaseNav/WasteWater/WasteWater'
@@ -69,7 +69,7 @@
     Popup,
     summarySheets,
     SolidContent,
-    WasteWaterContent
+    // WasteWaterContent,
     // SolidContent,
     PopupGas,
     PublicBounced
@@ -124,17 +124,27 @@
         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)
+    },
+    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(data)
+      AddWasteWater.SetWasteWaterContent(this.config, this.$refs.PublicBounced)
     },
     // isShowHidden () {
     //   this.isShowBtn = !this.isShowBtn
@@ -231,7 +241,7 @@
 .Waste-water {
   position: absolute;
   top: 88px;
-  left: 380px;
+  left: 280px;
   z-index: 999;
 }
 

--
Gitblit v1.8.0