From f185acd8bce9156ca9848b1a77f9b64d7df43361 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 13 四月 2021 11:24:22 +0800
Subject: [PATCH] 弹框问题修改
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 4c186ce..cbf0693 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,7 +14,8 @@
<public-chart v-else :getWasteGasDetails="getWasteGasDetails"
:value="value"
:getQueryOnlineMonData="getQueryOnlineMonData"
- :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails">
+ :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
+ >
</public-chart>
</div>
</div>
@@ -27,7 +28,7 @@
<script>
-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'
@@ -53,6 +54,7 @@
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
getQueryOnlineMonData: []
+ // getGasQueryOnlineMonData: []
}
},
methods: {
@@ -70,15 +72,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,22 +97,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;
+ top: 45%;
+ left: 20%;
.public-bounced-title {
+ cursor: move;
height: 0.1rem;
- border: 1px #a4c0d8 solid;
padding: 10px 0;
display: flex;
align-items: center;
@@ -122,25 +117,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