From de01693a063433610388fab33cd4927f2f663e60 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期一, 12 四月 2021 18:42:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/components/BaseNav/PublicBounced/PublicBounced.vue |   82 ++++++++++++++++++++---------------------
 1 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 32b73d1..18a3f0d 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,36 +1,34 @@
 <template>
-  <div class="public-bounced" v-drag v-if="flag">
-<!--    <Echarts></Echarts>-->
-        <div class="public-bounced-title">
-          <span>{{ displayContentTitle }}</span>
-          <i class="el-icon-circle-close" @click="closePopup"></i>
+  <div class="public-bounced map-background" v-drag v-if="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">
+      <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 class="public-bounced-content">
-          <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>
+      <div class="public-bounced-content-right">
+        <public-video></public-video>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
 
-// import Echarts from '@components/BaseNav/PublicBounced/GasComponents/Echarts'
-
-import '@/components/BaseNav/SolidWaste/directive/dir'
+import '@/utils/dragBoxes'
 import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
 import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
 import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
@@ -39,7 +37,7 @@
 export default {
   name: 'PublicBounced',
   components: {
-    // Echarts
+    // Echarts,
     PublicTabs,
     PublicTable,
     PublicChart,
@@ -56,8 +54,8 @@
       value: '',
       getWasteGasDetails: [],
       getWasteWaterMonitoringDetails: [],
-      getQueryOnlineMonHourData: [],
-      getQueryOnlineMonDateData: []
+      getQueryOnlineMonData: []
+      // getGasQueryOnlineMonData: []
     }
   },
   methods: {
@@ -75,10 +73,11 @@
       this.flag = true
       this.value = value
     },
-    setGasData (data, dataDetails, value) {
+    setGasData (data, dataDetails, GasHourData, value) {
       this.setWasteGasdata = data
       this.getWasteGasDetails = dataDetails
-      // console.log(dataDetails)
+      this.getQueryOnlineMonData = GasHourData
+      console.log(this.getQueryOnlineMonData)
       this.displayContentTitle = data.Name
       this.flag = true
       this.value = value
@@ -86,12 +85,9 @@
     setWaterData (dataWater, dataDetail, hourData, dateData, value) {
       this.setWasteWaterdata = dataWater
       // console.log(data)
-      this.getWasteWaterMonitoringDetails = dataDetail // 鏄庣粏琛ㄦ暟鎹�
-      // console.log(dataDetail)
-      this.getQueryOnlineMonHourData = hourData // 灏忔椂鏁版嵁
+      this.getQueryOnlineMonData = hourData
       // console.log(drawData)
-      this.getQueryOnlineMonDateData = dateData // 鏃ユ暟鎹�
-      // console.log(dateData)
+      this.getWasteWaterMonitoringDetails = dataDetail
       this.displayContentTitle = dataWater.Name
       this.flag = true
       this.value = value
@@ -102,16 +98,14 @@
 
 <style lang="less" scoped>
 .public-bounced {
-  z-index: 999;
+  z-index: 2000;
   position: absolute;
-  top: 15%;
+  top: 45%;
   left: 20%;
-  background-color: #002432;
-  border: 1px #9fc5c8 solid;
 
   .public-bounced-title {
+    cursor: move;
     height: 0.1rem;
-    border: 1px #a4c0d8 solid;
     padding: 10px 0;
     display: flex;
     align-items: center;
@@ -124,11 +118,15 @@
     }
 
     i {
-      color: white;
+      color: #C0C4CC;
       margin: 0 15px;
       font-size: 22px;
       cursor: pointer;
     }
+
+    i:hover {
+      color: #00fff6;
+    }
   }
 
   .public-bounced-content {

--
Gitblit v1.8.0