From 4f35a8b56c12315c82fd5bd136f32da2dcadc5e2 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期二, 27 四月 2021 09:27:22 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/BaseNav/PublicBounced/PublicBounced.vue |  129 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 103 insertions(+), 26 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 8326dfa..2ab8d04 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,36 +1,98 @@
 <template>
-  <div class="public-bounced" v-show="flag">
-    <div class="public-bounced-title">
-      <span>{{ displayContent.Name }}</span>
+  <div class="public-bounced map-background" v-drag v-show="flag">
+    <div class="public-bounced-title panel-title" ref="publicBounced">
+      <span>{{ displayContentTitle }}</span>
       <i class="el-icon-circle-close" @click="closePopup"></i>
     </div>
     <div class="public-bounced-content">
-<!--      <span>鍐呭</span>-->
-      <popup-gas></popup-gas>
+      <div class="public-bounced-content-left">
+        <public-tabs :setSolidWaste="displayContentTab" :value="value"
+                     :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>
+        <div class="public-bounced-content-left-bottom">
+          <public-table v-if="value === 'gufei'"
+                        :displayContentTable="displayContentTable"></public-table>
+          <public-chart v-else :getWasteGasDetails="getWasteGasDetails"
+                        :value="value"
+                        :getQueryOnlineMonData="getQueryOnlineMonData"
+                        :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
+                        :ManualData="ManualData"
+                        ref="PublicChart"
+          >
+          </public-chart>
+        </div>
+      </div>
+      <div class="public-bounced-content-right">
+        <public-video></public-video>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
-import PopupGas from '@components/flueGas/popup-gas'
+
+import '@/utils/dragBoxes'
+import PublicTabs from '@components/BaseNav/PublicBounced/common/PublicTabs'
+import PublicTable from '@components/BaseNav/PublicBounced/common/PublicTable'
+import PublicVideo from '@components/BaseNav/PublicBounced/common/PublicVideo'
+import PublicChart from './common/PublicChart'
+
 export default {
   name: 'PublicBounced',
+  components: {
+    PublicTabs,
+    PublicTable,
+    PublicChart,
+    PublicVideo
+  },
   data () {
     return {
-      displayContent: [],
-      flag: false
+      displayContentTitle: '',
+      displayContentTab: '',
+      displayContentTable: '',
+      flag: false,
+      value: '',
+      setWasteGasdata: '',
+      setWasteWaterdata: '',
+      getWasteGasDetails: [],
+      getWasteWaterMonitoringDetails: [],
+      getQueryOnlineMonData: [],
+      ManualData: []
     }
   },
-  components: {
-    PopupGas
+  destoryed () {
+    this.$refs.PublicChart.$refs.Echats.DrawEXHRealTimeDateChart()
+    this.$refs.PublicChart.$refs.Echats.DrawRealTimeDateChart()
   },
   methods: {
-    setData (data) {
-      this.displayContent = data
-      this.flag = true
-    },
     closePopup () {
       this.flag = false
+    },
+    // 鍥哄簾鐩稿叧淇℃伅璁剧疆
+    setData (title, dataBasic, dataDetailed, value) {
+      this.flag = true
+      this.value = value
+      this.displayContentTitle = title
+      this.displayContentTab = dataBasic[0]
+      this.displayContentTable = dataDetailed[0]
+    },
+    setGasData (data, dataDetails, GasHourData, ManualData, value) {
+      // console.log(data, dataDetails, GasHourData, ManualData, value)
+      this.setWasteGasdata = data
+      this.displayContentTitle = data.Name
+      this.getWasteGasDetails = dataDetails
+      this.getQueryOnlineMonData = GasHourData
+      this.ManualData = ManualData
+      // console.log(this.getQueryOnlineMonData)
+      this.flag = true
+      this.value = value
+    },
+    setWaterData (dataWater, detailData, hourData, dateData, value) {
+      this.setWasteWaterdata = dataWater
+      this.getQueryOnlineMonData = hourData
+      this.getWasteWaterMonitoringDetails = detailData
+      this.displayContentTitle = dataWater.Name
+      this.flag = true
+      this.value = value
     }
   }
 }
@@ -38,23 +100,18 @@
 
 <style lang="less" scoped>
 .public-bounced {
-  width: 80%;
-  height: 450px;
-  z-index: 999;
+  z-index: 2000;
   position: absolute;
-  top: 25%;
-  left: 10%;
-  background-color: #002432;
-  margin: 1% auto;
-  border: 1px #a5bfd8 solid;
+  top: 35%;
+  left: 20%;
 
   .public-bounced-title {
-    width: 100%;
-    border: 1px #a4c0d8 solid;
+    cursor: move;
+    height: 0.1rem;
+    padding: 10px 0;
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: 5px 0;
 
     span {
       color: #f4f7ff;
@@ -63,11 +120,31 @@
     }
 
     i {
-      color: white;
+      color: #C0C4CC;
       margin: 0 15px;
       font-size: 22px;
+      cursor: pointer;
+    }
+
+    i:hover {
+      color: #00fff6;
     }
   }
 
+  .public-bounced-content {
+    padding: 0.05rem;
+    display: flex;
+    //align-items: center;
+    //justify-content: space-around;
+
+    .public-bounced-content-left {
+      //width: 4.8rem;
+    }
+
+    .public-bounced-content-right {
+      //width: 3rem;
+      margin-left: 0.1rem;
+    }
+  }
 }
 </style>

--
Gitblit v1.8.0