From 09c4a4cdb8f9710b93a9daff83575d05c0f9be6b Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期三, 07 四月 2021 15:11:40 +0800
Subject: [PATCH] 增加图例默认图标
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 41a96c1..1aaf67c 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -7,11 +7,11 @@
<div class="public-bounced-content">
<div class="public-bounced-content-left">
<public-tabs :displayContentTab="displayContentTab" :value="value"
- :setWasteGasdata="setWasteGasdata"></public-tabs>
+ :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>
<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" :getWasteWaterMonitoring="getWasteWaterMonitoring" ></public-chart>
</div>
</div>
<div class="public-bounced-content-right">
@@ -40,11 +40,15 @@
data () {
return {
setWasteGasdata: '',
+ setWasteWaterdata: '',
displayContentTitle: '',
displayContentTab: '',
displayContentTable: '',
flag: false,
- value: ''
+ value: '',
+ getWasteGasDetails: [],
+ getWasteWaterMonitoringDetails: [],
+ getWasteWaterMonitoring: []
}
},
methods: {
@@ -56,10 +60,24 @@
})
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
+ },
+ setWaterData (dataWater, dataDetail, drawData, value) {
+ this.setWasteWaterdata = dataWater
+ // console.log(data)
+ this.getWasteWaterMonitoring = drawData
+ console.log(drawData)
+ this.getWasteWaterMonitoringDetails = dataDetail
+ this.displayContentTitle = dataWater.Name
this.flag = true
this.value = value
},
@@ -103,22 +121,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