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 |   36 +++++++++++++++++++-----------------
 1 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 4c186ce..b9f66ff 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" 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>
@@ -26,7 +26,6 @@
 </template>
 
 <script>
-
 import '@/components/BaseNav/SolidWaste/directive/dir'
 import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
 import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
@@ -36,6 +35,7 @@
 export default {
   name: 'PublicBounced',
   components: {
+    // Echarts
     PublicTabs,
     PublicTable,
     PublicChart,
@@ -53,9 +53,13 @@
       getWasteGasDetails: [],
       getWasteWaterMonitoringDetails: [],
       getQueryOnlineMonData: []
+      // getGasQueryOnlineMonData: []
     }
   },
   methods: {
+    drag (event) {
+      console.log(event)
+    },
     closePopup () {
       this.flag = false
     },
@@ -70,15 +74,16 @@
       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
     },
-    setWaterData (dataWater, dataDetail, hourData, value) {
+    setWaterData (dataWater, dataDetail, hourData, dateData, value) {
       this.setWasteWaterdata = dataWater
       // console.log(data)
       this.getQueryOnlineMonData = hourData
@@ -94,20 +99,16 @@
 
 <style lang="less" scoped>
 .public-bounced {
-  width: 8rem;
-  //height: 2.6rem;
-  //width: 70vw;
-  //height: 30vh;
   z-index: 999;
   position: absolute;
-  //bottom: 2rem;
-  //left: 5rem;
   top: 15%;
-  left: 15%;
+  left: 20%;
   background-color: #002432;
   border: 1px #9fc5c8 solid;
 
   .public-bounced-title {
+    //cursor: pointer;
+    cursor: move;
     height: 0.1rem;
     border: 1px #a4c0d8 solid;
     padding: 10px 0;
@@ -130,17 +131,18 @@
   }
 
   .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