From 2e0c26ba23e3b8ebdaed0b38e87526cce94bf215 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 14 四月 2021 19:39:20 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
index b59c45b..be91bb6 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
@@ -249,16 +249,18 @@
}
},
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.JsonRealWasteWater.id, this.JsonRealWasteWater.title, this.JsonRealWasteWater.legend, this.JsonRealWasteWater.ydatas, this.JsonRealWasteWater.yname)
+ 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')
+ // console.log(this.formInline.timeStart)
+ console.log(this.JsonRealWasteWater.ydatas[0].data[0].value[0])
+ this.DrawRealTimeDateChart(this.JsonRealWasteWater.id, this.JsonRealWasteWater.title, this.JsonRealWasteWater.legend, this.JsonRealWasteWater.ydatas, this.JsonRealWasteWater.yname)
},
methods: {
onSubmit () {
this.DrawRealTimeDateChart(this.JsonRealWasteWater.id, this.JsonRealWasteWater.title, this.JsonRealWasteWater.legend, this.JsonRealWasteWater.ydatas, this.JsonRealWasteWater.yname)
},
DrawRealTimeDateChart (id, title, legend, ydatas, yname) {
- this.RealTimeChart = this.$echarts.init(this.$refs.echarts)
+ this.RealTimeChart = this.$echarts.init(this.$refs.main)
var serLists = []
for (var i = 0; i < ydatas.length; i++) {
// var zdcbcolor = ydatas[i].zdcbcolor
@@ -412,7 +414,8 @@
grid: { // 缃戞牸
top: '20%',
left: '7%',
- bottom: '10%'
+ bottom: '10%',
+ right: '5%'
},
legend: {
data: legend
@@ -489,7 +492,7 @@
}
}, {
type: 'value',
- name: '娴侀噺(m鲁/h)',
+ name: '娴侀噺(m鲁/d)',
axisLabel: {
formatter: '{value}',
textStyle: {
--
Gitblit v1.8.0