From c3f7ab6bbaf26298d2d53f5422b8281a335752b7 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 07 四月 2021 11:38:41 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 41a96c1..7726783 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -11,7 +11,7 @@
<div class="public-bounced-content-left-bottom">
<public-table v-if="value === 'gufei'"
:displayContentTable="displayContentTable"></public-table>
- <public-chart v-else></public-chart>
+ <public-chart v-else :getWasteGasDetails="getWasteGasDetails"></public-chart>
</div>
</div>
<div class="public-bounced-content-right">
@@ -44,7 +44,8 @@
displayContentTab: '',
displayContentTable: '',
flag: false,
- value: ''
+ value: '',
+ getWasteGasDetails: []
}
},
methods: {
@@ -56,9 +57,13 @@
})
this.displayContentTab = dataBasic
this.displayContentTable = dataDetailed
+ this.flag = true
+ this.value = value
},
- setGasData (data, value) {
+ setGasData (data, dataDetails, value) {
this.setWasteGasdata = data
+ this.getWasteGasDetails = dataDetails
+ // console.log(dataDetails)
this.displayContentTitle = data.Name
this.flag = true
this.value = value
@@ -103,22 +108,20 @@
.public-bounced-content {
margin: 15px auto;
display: flex;
- align-items: center;
+ //align-items: center;
justify-content: space-around;
padding: 10px;
.public-bounced-content-left {
flex: 3;
- //width: 64%;
- //height: 100%;
- //margin-right: 10px;
+ height: 100%;
+ margin-right: 10px;
}
.public-bounced-content-right {
flex: 2;
- margin-left: 10px;
- //width: 34%;
- //height: 100%;
+ //width: 48%;
+ height: 100%;
}
}
}
--
Gitblit v1.8.0