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/EChartsHour.vue | 16 +++-------------
1 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
index 309f009..d066b60 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
@@ -25,16 +25,6 @@
</span>
</div>
</div>
-<!-- <div>-->
-<!-- 閲囨牱鐐规暟:-->
-<!-- <el-select v-model="formInline.region">-->
-<!-- <el-option label="0" value="0"></el-option>-->
-<!-- <el-option label="25" value="25"></el-option>-->
-<!-- <el-option label="50" value="50"></el-option>-->
-<!-- <el-option label="75" value="75"></el-option>-->
-<!-- <el-option label="100" value="100"></el-option>-->
-<!-- </el-select>-->
-<!-- </div>-->
<div class="detailbtn" @click="onSubmit">鏌ヨ</div>
<div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
</div>
@@ -43,7 +33,6 @@
<!-- 鏄庣粏寮规 -->
<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
@@ -138,7 +127,7 @@
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.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 () {
@@ -341,7 +330,8 @@
},
grid: { // 缃戞牸
top: '20%',
- left: '5%'
+ left: '6%',
+ bottom: '15%'
// containLabel: true
},
legend: { // 鍥句緥
--
Gitblit v1.8.0