From dbc1ed9ade5f26e77d2551dd2c79ece341b02cd8 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 12 四月 2021 11:43:44 +0800
Subject: [PATCH] 弹框问题修改

---
 src/components/BaseNav/PublicBounced/PublicBounced.vue |  120 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 98 insertions(+), 22 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 8326dfa..b9f66ff 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,36 +1,97 @@
 <template>
-  <div class="public-bounced" v-show="flag">
-    <div class="public-bounced-title">
-      <span>{{ displayContent.Name }}</span>
+  <div class="public-bounced" v-if="flag">
+    <div class="public-bounced-title" draggable="true" @dragstart="drag($event)">
+      <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 :displayContentTab="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">
+          </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 '@/components/BaseNav/SolidWaste/directive/dir'
+import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
+import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
+import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
+import PublicChart from './GasComponents/PublicChart'
+
 export default {
   name: 'PublicBounced',
+  components: {
+    // Echarts
+    PublicTabs,
+    PublicTable,
+    PublicChart,
+    PublicVideo
+  },
   data () {
     return {
-      displayContent: [],
-      flag: false
+      setWasteGasdata: '',
+      setWasteWaterdata: '',
+      displayContentTitle: '',
+      displayContentTab: '',
+      displayContentTable: '',
+      flag: false,
+      value: '',
+      getWasteGasDetails: [],
+      getWasteWaterMonitoringDetails: [],
+      getQueryOnlineMonData: []
+      // getGasQueryOnlineMonData: []
     }
   },
-  components: {
-    PopupGas
-  },
   methods: {
-    setData (data) {
-      this.displayContent = data
-      this.flag = true
+    drag (event) {
+      console.log(event)
     },
     closePopup () {
       this.flag = false
+    },
+    setData (dataBasic, dataDetailed, value) {
+      this.flag = true
+      this.value = value
+      dataBasic.forEach(item => {
+        this.displayContentTitle = item.StoragePlaceName
+      })
+      this.displayContentTab = dataBasic
+      this.displayContentTable = dataDetailed
+      this.flag = true
+      this.value = value
+    },
+    setGasData (data, dataDetails, GasHourData, value) {
+      this.setWasteGasdata = data
+      this.getWasteGasDetails = dataDetails
+      this.getQueryOnlineMonData = GasHourData
+      console.log(this.getQueryOnlineMonData)
+      this.displayContentTitle = data.Name
+      this.flag = true
+      this.value = value
+    },
+    setWaterData (dataWater, dataDetail, hourData, dateData, value) {
+      this.setWasteWaterdata = dataWater
+      // console.log(data)
+      this.getQueryOnlineMonData = hourData
+      // console.log(drawData)
+      this.getWasteWaterMonitoringDetails = dataDetail
+      this.displayContentTitle = dataWater.Name
+      this.flag = true
+      this.value = value
     }
   }
 }
@@ -38,23 +99,22 @@
 
 <style lang="less" scoped>
 .public-bounced {
-  width: 80%;
-  height: 450px;
   z-index: 999;
   position: absolute;
-  top: 25%;
-  left: 10%;
+  top: 15%;
+  left: 20%;
   background-color: #002432;
-  margin: 1% auto;
-  border: 1px #a5bfd8 solid;
+  border: 1px #9fc5c8 solid;
 
   .public-bounced-title {
-    width: 100%;
+    //cursor: pointer;
+    cursor: move;
+    height: 0.1rem;
     border: 1px #a4c0d8 solid;
+    padding: 10px 0;
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: 5px 0;
 
     span {
       color: #f4f7ff;
@@ -66,8 +126,24 @@
       color: white;
       margin: 0 15px;
       font-size: 22px;
+      cursor: pointer;
     }
   }
 
+  .public-bounced-content {
+    padding: 0.1rem;
+    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