From 0ad898ff9d0f6718db2b3137665c81c46c50312d Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 14 四月 2021 10:40:22 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
index 4a92d45..7cf33e4 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
@@ -36,7 +36,9 @@
</div>
<div class="detailbtn" @click="onSubmit">鏌ヨ</div>
</div>
- <div style="width:5rem;height:2rem;" ref="echarts"></div>
+ <div style="width:5rem;height:1.5rem;" >
+ <div style="width:100%;height:100%;" ref="echarts"> </div>
+ </div>
</div>
</div>
</template>
@@ -62,7 +64,6 @@
timeEnd: ''
},
RealTimeChart: null,
- info: this.series,
JsonTimeCtarts: {
id: 'mychart_ss ',
title: '鐑熷皹',
@@ -206,8 +207,8 @@
}
},
mounted () {
- // const Day = new Date()
- // console.log(Day)
+ 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)
},
methods: {
@@ -440,7 +441,7 @@
}
}, { // 娴侀噺杞�
type: 'value',
- name: '搴熸皵娴侀噺(m3/h)',
+ name: '娴侀噺(m3/h)',
axisLabel: {
formatter: '{value}',
textStyle: {
--
Gitblit v1.8.0