From fe0ee7d8da7d7e28ff2ccbcb17ce54ecdb2b5d09 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 14 四月 2021 13:59:36 +0800
Subject: [PATCH] 修改废水废气弹框样式。

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

diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 4c186ce..9fca234 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="public-bounced" v-drag v-if="flag">
-    <div class="public-bounced-title">
+  <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>
@@ -14,11 +14,14 @@
           <public-chart v-else :getWasteGasDetails="getWasteGasDetails"
                         :value="value"
                         :getQueryOnlineMonData="getQueryOnlineMonData"
-                        :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails">
+                        :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
+                        :ManualData="ManualData"
+                        ref="PublicChart"
+          >
           </public-chart>
         </div>
       </div>
-      <div class="public-bounced-content-right">
+      <div class="public-bounced-content-right" >
         <public-video></public-video>
       </div>
     </div>
@@ -27,11 +30,11 @@
 
 <script>
 
-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'
+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',
@@ -52,8 +55,16 @@
       value: '',
       getWasteGasDetails: [],
       getWasteWaterMonitoringDetails: [],
-      getQueryOnlineMonData: []
+      getQueryOnlineMonData: [],
+      ManualData: []
+      // getGasQueryOnlineMonData: []
     }
+  },
+  mounted () {
+    // this.$nextTick(() => {
+    // console.log(this.$refs.publicBounced)
+    console.log(this.$refs.PublicChart)
+    // })
   },
   methods: {
     closePopup () {
@@ -70,15 +81,18 @@
       this.flag = true
       this.value = value
     },
-    setGasData (data, dataDetails, value) {
+    setGasData (data, dataDetails, GasHourData, ManualData, value) {
+      // console.log(this.$refs)
       this.setWasteGasdata = data
       this.getWasteGasDetails = dataDetails
-      // console.log(dataDetails)
+      this.getQueryOnlineMonData = GasHourData
+      this.ManualData = ManualData
+      // console.log(this.getQueryOnlineMonData)
       this.displayContentTitle = data.Name
       this.flag = true
       this.value = value
     },
-    setWaterData (dataWater, dataDetail, hourData, value) {
+    setWaterData (dataWater, dataDetail, hourData, dateData, value) {
       this.setWasteWaterdata = dataWater
       // console.log(data)
       this.getQueryOnlineMonData = hourData
@@ -94,22 +108,14 @@
 
 <style lang="less" scoped>
 .public-bounced {
-  width: 8rem;
-  //height: 2.6rem;
-  //width: 70vw;
-  //height: 30vh;
-  z-index: 999;
+  z-index: 2000;
   position: absolute;
-  //bottom: 2rem;
-  //left: 5rem;
   top: 15%;
-  left: 15%;
-  background-color: #002432;
-  border: 1px #9fc5c8 solid;
+  left: 20%;
 
   .public-bounced-title {
+    cursor: move;
     height: 0.1rem;
-    border: 1px #a4c0d8 solid;
     padding: 10px 0;
     display: flex;
     align-items: center;
@@ -122,25 +128,30 @@
     }
 
     i {
-      color: white;
+      color: #C0C4CC;
       margin: 0 15px;
       font-size: 22px;
       cursor: pointer;
     }
+
+    i:hover {
+      color: #00fff6;
+    }
   }
 
   .public-bounced-content {
-    margin: 0.2rem auto !important;
+    padding: 0.1rem;
     display: flex;
     //align-items: center;
-    justify-content: space-around;
+    //justify-content: space-around;
 
     .public-bounced-content-left {
-      width: 4.8rem;
+      //width: 4.8rem;
     }
 
     .public-bounced-content-right {
-      width: 3rem;
+      //width: 3rem;
+      margin-left: 0.1rem;
     }
   }
 }

--
Gitblit v1.8.0