From 98240a8e15dec2d2fb88b2c6eb1be684c7543e5e Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期四, 15 四月 2021 11:03:30 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
index a5de8ba..fecb54d 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
@@ -1,4 +1,4 @@
-<!-- 灏忔椂鏁版嵁 -->
+git<!-- 灏忔椂鏁版嵁 -->
<template>
<div id="Tab">
<div class="infomation">
@@ -41,8 +41,7 @@
<div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
</div>
<div class="boxChart">
- <div style="width: 5rem;height:1.5rem;" id="popChart" ref="main">
- </div>
+ <div style="width: 5rem;height:1.5rem;" id="echarts" ref="main"></div>
</div>
</div>
<!-- 鏄庣粏寮规 -->
@@ -62,7 +61,7 @@
<script>
import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
-import dayjs from 'dayjs'
+// import dayjs from 'dayjs'
export default {
name: 'ECharts',
@@ -71,16 +70,14 @@
},
data () {
return {
- value1: '',
- value2: '',
watchData: [],
dialogVisible: false,
myChar: null,
value: '',
formInline: {
region: '',
- timeStart: '2021-04-12 17:00:00',
- timeEnd: '2021-04-13 16:00:00'
+ timeStart: '2021-04-12 10:00:00',
+ timeEnd: '2021-04-13 09:00:00'
},
myChart: null,
JsonHourWater: {
@@ -138,9 +135,10 @@
}
},
mounted () {
- this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
- this.formInline.timeStart = dayjs().subtract(12, 'hour').format('YYYY-MM-DD HH:mm:ss')
this.onSubmit()
+ // this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
+ // this.formInline.timeStart = dayjs().subtract(12, 'hour').format('YYYY-MM-DD HH:mm:ss')
+ // this.onSubmit()
},
updated () {
this.onSubmit()
--
Gitblit v1.8.0