From 47a016469af7b02898ab67ec6ab1d00311f242cf Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 14 四月 2021 09:57:18 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
similarity index 96%
rename from src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
rename to src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
index 51b1e20..b0021f9 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
@@ -15,19 +15,14 @@
<div class="pickerData">
<span> 寮�濮嬫椂闂�:</span>
<span class="pickerTable">
- <el-date-picker type="datetime" v-model="formInline.timeStart">
- </el-date-picker>
- </span>
+ <el-date-picker type="datetime" v-model="formInline.timeStart"></el-date-picker>
+ </span>
</div>
<div class="pickerData">
<span >缁撴潫鏃堕棿:</span>
<span class="pickerTable">
- <el-date-picker
- type="datetime"
- v-model="formInline.timeEnd"
- >
- </el-date-picker>
- </span>
+ <el-date-picker type="datetime" v-model="formInline.timeEnd" ></el-date-picker>
+ </span>
</div>
</div>
<!-- <div>-->
@@ -43,15 +38,12 @@
<div class="detailbtn" @click="onSubmit">鏌ヨ</div>
<div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
</div>
-<!-- <div style="width: 5rem;height: 2rem">-->
-<!-- <div style="width:100%;height:100%;" id="echarts" ref="main">–>-->
-<!-- </div>-->
- <div style="width:720px;height:252px;" id="echarts" ref="main">
- </div>
+ <div style="width:5rem;height:1.5rem;" id="echarts" ref="main"></div>
</div>
<!-- 鏄庣粏寮规 -->
<el-dialog :visible.sync="dialogVisible"
:append-to-body="true"
+ :title="this.$attrs.value==='feiqi'?this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName:this.$attrs.getWasteWaterMonitoringDetails[0].OnLineMonEmissPointName"
width="68%"
center
v-dialogDrag
@@ -144,7 +136,6 @@
}
},
created () {
- // console.log(dayjs().format('YYYY-MM-DD HH:mm:ss'))
// this.$nextTick(() => {
// this.CreateChart(this.JsonCtarts.id, this.JsonCtarts.title, this.JsonCtarts.legend, this.JsonCtarts.xdata, this.JsonCtarts.ydatas, this.JsonCtarts.yname, this.JsonCtarts.id, this.JsonCtarts.datatype)
// }
@@ -155,6 +146,9 @@
this.onSubmit()
// this.CreateChart(this.JsonCtarts.id, this.JsonCtarts.title, this.JsonCtarts.legend, this.JsonCtarts.xdata, this.JsonCtarts.ydatas, this.JsonCtarts.yname, this.JsonCtarts.id, this.JsonCtarts.datatype)
},
+ updated () {
+ this.onSubmit()
+ },
methods: {
onSubmit () {
this.CreateChart()
--
Gitblit v1.8.0