From 93850b9aee34d3a66c2770a1eb0435ce104e772f Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 15 四月 2021 15:20:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
index 60cee1d..61a58f1 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
@@ -36,9 +36,7 @@
</div>
<div class="detailbtn" @click="onSubmit">鏌ヨ</div>
</div>
- <div style="width:5rem;height:1.5rem;" >
- <div style="width:100%;height:100%;" ref="echarts"> </div>
- </div>
+ <div style="width:5rem;height:1.5rem;" ref="echarts"> </div>
</div>
</div>
</template>
@@ -561,15 +559,17 @@
step: ''
}
},
+ updated () {
+ this.DrawEXHRealTimeDateChart()
+ },
mounted () {
this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
this.formInline.timeStart = dayjs().subtract(1, 'minute').format('YYYY-MM-DD HH:mm:ss')
- this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
// this.IntervalEXHRealTimeDate(this.JSONTimeData.id, this.JSONTimeData.unionTagCodeList, this.JSONTimeData.BBZMAPPING)
},
methods: {
onSubmit () {
- this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
+ this.DrawEXHRealTimeDateChart()
},
/**
* RTDB 鏍煎紡杞崲
@@ -591,7 +591,12 @@
// return dataArray
// },
// 1.鍧愭爣杞村疄鐜�,鐢诲疄鏃舵暟鎹�
- DrawEXHRealTimeDateChart (id, title, legend, ydatas, yname) {
+ DrawEXHRealTimeDateChart () {
+ // var id = this.JsonTimeCtarts.id
+ // var title = this.JsonTimeCtarts.title
+ var legend = this.JsonTimeCtarts.legend
+ var ydatas = this.JsonTimeCtarts.ydatas
+ var yname = this.JsonTimeCtarts.yname
this.RealTimeChart = this.$echarts.init(this.$refs.echarts)
// this.myChart.clear()
var serLists = []
@@ -806,7 +811,7 @@
}
}, { // 娴侀噺杞�
type: 'value',
- name: '娴侀噺(m3/h)',
+ name: '搴熸皵娴侀噺(m3/h)',
axisLabel: {
formatter: '{value}',
textStyle: {
@@ -1062,6 +1067,7 @@
padding: 0;
border-color:#00fff6;
text-align: center;
+ z-index: 9999;
//padding-left:20px ;
//padding: 0!important;
}
--
Gitblit v1.8.0