From b4db0f19aff35d6ae1a86fae7463266920a09882 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 08 四月 2021 14:51:27 +0800
Subject: [PATCH] 企业popup
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 7e79e8c..5a47938 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,5 +1,5 @@
<template>
- <div class="public-bounced" v-draw v-if="flag">
+ <div class="public-bounced" v-drag v-if="flag">
<div class="public-bounced-title">
<span>{{ displayContentTitle }}</span>
<i class="el-icon-circle-close" @click="closePopup"></i>
@@ -11,7 +11,10 @@
<div class="public-bounced-content-left-bottom">
<public-table v-if="value === 'gufei'"
:displayContentTable="displayContentTable"></public-table>
- <public-chart v-else :getWasteWaterMonitoring="getWasteWaterMonitoring"></public-chart>
+ <public-chart v-else :getWasteGasDetails="getWasteGasDetails"
+ :value="value"
+ :getWasteWaterMonitoring="getWasteWaterMonitoring"
+ :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails"></public-chart>
</div>
</div>
<div class="public-bounced-content-right">
@@ -52,6 +55,9 @@
}
},
methods: {
+ closePopup () {
+ this.flag = false
+ },
setData (dataBasic, dataDetailed, value) {
this.flag = true
this.value = value
@@ -71,18 +77,15 @@
this.flag = true
this.value = value
},
- setWaterData (data, dataDetail, drawData, value) {
- this.setWasteWaterdata = data
+ setWaterData (dataWater, dataDetail, drawData, value) {
+ this.setWasteWaterdata = dataWater
// console.log(data)
this.getWasteWaterMonitoring = drawData
- console.log(drawData)
+ // console.log(drawData)
this.getWasteWaterMonitoringDetails = dataDetail
- this.displayContentTitle = data.Name
+ this.displayContentTitle = dataWater.Name
this.flag = true
this.value = value
- },
- closePopup () {
- this.flag = false
}
}
}
@@ -90,20 +93,26 @@
<style lang="less" scoped>
.public-bounced {
- width: 75%;
+ width: 8rem;
+ //height: 2.6rem;
+ //width: 70vw;
+ //height: 30vh;
z-index: 999;
position: absolute;
- bottom: 5%;
+ //bottom: 2rem;
+ //left: 5rem;
+ top: 15%;
left: 15%;
background-color: #002432;
border: 1px #9fc5c8 solid;
.public-bounced-title {
+ 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;
@@ -115,26 +124,22 @@
color: white;
margin: 0 15px;
font-size: 22px;
+ cursor: pointer;
}
}
.public-bounced-content {
- margin: 15px auto;
+ margin: 0.2rem auto !important;
display: flex;
//align-items: center;
justify-content: space-around;
- padding: 10px;
.public-bounced-content-left {
- flex: 3;
- height: 100%;
- margin-right: 10px;
+ width: 4.8rem;
}
.public-bounced-content-right {
- flex: 2;
- //width: 48%;
- height: 100%;
+ width: 3rem;
}
}
}
--
Gitblit v1.8.0