From c2c35bfab620d688d3433ef8cd77f8f979fb5eea Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期五, 09 四月 2021 10:00:06 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 7e79e8c..e363527 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,5 +1,6 @@
<template>
- <div class="public-bounced" v-draw v-if="flag">
+ <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>
@@ -11,7 +12,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">
@@ -23,6 +27,8 @@
<script>
+// import Echarts from '@components/BaseNav/PublicBounced/GasComponents/Echarts'
+
import '@/components/BaseNav/SolidWaste/directive/dir'
import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
@@ -32,6 +38,7 @@
export default {
name: 'PublicBounced',
components: {
+ // Echarts
PublicTabs,
PublicTable,
PublicChart,
@@ -52,6 +59,9 @@
}
},
methods: {
+ closePopup () {
+ this.flag = false
+ },
setData (dataBasic, dataDetailed, value) {
this.flag = true
this.value = value
@@ -71,18 +81,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 +97,20 @@
<style lang="less" scoped>
.public-bounced {
- width: 75%;
z-index: 999;
position: absolute;
- bottom: 5%;
- left: 15%;
+ top: 15%;
+ left: 20%;
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 +122,23 @@
color: white;
margin: 0 15px;
font-size: 22px;
+ cursor: pointer;
}
}
.public-bounced-content {
- margin: 15px auto;
+ padding: 0.1rem;
display: flex;
//align-items: center;
- justify-content: space-around;
- padding: 10px;
+ //justify-content: space-around;
.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;
+ margin-left: 0.1rem;
}
}
}
--
Gitblit v1.8.0