From 6ace815c16170b0a7fc68bf280f63bffe96612e6 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 14 四月 2021 18:24:30 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
index 05f8f76..16b0a78 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
@@ -39,9 +39,8 @@
</div>
<div class="detailbtn" @click="onSubmit">鏌ヨ</div>
</div>
- <div class="boxChart" style="height: 260px">
- <div style="width: 100%;height: 100%;" id="popChart" ref="main">
- </div>
+ <div class="boxChart">
+ <div style="width: 5rem;height: 1.5rem;" id="popChart" ref="main"></div>
</div>
</div>
</div>
@@ -250,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
@@ -367,8 +368,8 @@
label: {
color: '#1a4245'
}
- },
- formatter: function (params) {
+ }
+ /* formatter: function (params) {
var s = params[0].name + '<br />'
for (var i = 0; i < params.length; i++) {
// var name = params[i].name
@@ -402,7 +403,7 @@
s += maker + seriesName + ':' + valueFliter + '<br />'
}
return s
- }
+ } */
},
toolbox: { // 鎵撳嵃绛夊伐鍏�
show: false,
@@ -490,7 +491,7 @@
}
}, {
type: 'value',
- name: '娴侀噺(m鲁/h)',
+ name: '娴侀噺(m鲁/d)',
axisLabel: {
formatter: '{value}',
textStyle: {
--
Gitblit v1.8.0