From 097581b136c5889c71c07fb6f17d2f2885ce5a78 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 13 五月 2021 16:02:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 787f244..2ab8d04 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -21,7 +21,7 @@
</public-chart>
</div>
</div>
- <div class="public-bounced-content-right" >
+ <div class="public-bounced-content-right">
<public-video></public-video>
</div>
</div>
@@ -59,9 +59,9 @@
ManualData: []
}
},
- beforeUpdate () {
- this.$refs.PublicChart.$refs.Echats.CreateChart()
- this.$refs.PublicChart.$refs.Echats.effChartShow()
+ destoryed () {
+ this.$refs.PublicChart.$refs.Echats.DrawEXHRealTimeDateChart()
+ this.$refs.PublicChart.$refs.Echats.DrawRealTimeDateChart()
},
methods: {
closePopup () {
@@ -76,13 +76,13 @@
this.displayContentTable = dataDetailed[0]
},
setGasData (data, dataDetails, GasHourData, ManualData, value) {
- // console.log(this.$refs)
+ // console.log(data, dataDetails, GasHourData, ManualData, value)
this.setWasteGasdata = data
+ this.displayContentTitle = data.Name
this.getWasteGasDetails = dataDetails
this.getQueryOnlineMonData = GasHourData
this.ManualData = ManualData
// console.log(this.getQueryOnlineMonData)
- this.displayContentTitle = data.Name
this.flag = true
this.value = value
},
@@ -102,7 +102,7 @@
.public-bounced {
z-index: 2000;
position: absolute;
- top: 15%;
+ top: 35%;
left: 20%;
.public-bounced-title {
@@ -132,7 +132,7 @@
}
.public-bounced-content {
- padding: 0.1rem;
+ padding: 0.05rem;
display: flex;
//align-items: center;
//justify-content: space-around;
--
Gitblit v1.8.0