From 6f256a8be5c330cbf4d852f7dc4a1a6614f0419d Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 14 四月 2021 10:11:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
index 89a4517..4ead4bd 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
@@ -38,7 +38,7 @@
<div class="detailbtn" @click="onSubmit">鏌ヨ</div>
<div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
</div>
- <div style="width:6rem;height:2rem;" id="echarts" ref="main">
+ <div style="width:5rem;height:1.5rem;" id="echarts" ref="main">
</div>
</div>
<!-- 鏄庣粏寮规 -->
@@ -58,6 +58,7 @@
<script>
import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
+import dayjs from 'dayjs'
export default {
name: 'ECharts',
@@ -140,9 +141,14 @@
}
},
mounted () {
+ this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
+ this.formInline.timeStart = dayjs().subtract(1, 'month').format('YYYY-MM-DD HH:mm:ss')
this.onSubmit()
// this.CreateChart(this.JsonDayCharts.id, this.JsonDayCharts.title, this.JsonDayCharts.legend, this.JsonDayCharts.xdata, this.JsonDayCharts.ydatas, this.JsonDayCharts.yname, this.JsonDayCharts.id, this.JsonDayCharts.datatype)
},
+ updated () {
+ this.onSubmit()
+ },
methods: {
onSubmit () {
console.log('submit!')
--
Gitblit v1.8.0