From d0391dba3708d3f32bcd94e1881d1b598a0d9ef0 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 15 四月 2021 17:21:10 +0800
Subject: [PATCH] 修改图表问题
---
src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue | 53 +++++++++++++++++++++++------------------------------
1 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
index 094e032..4bd8a25 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
@@ -27,22 +27,11 @@
</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>
- <div class="boxChart" style="height: 260px">
- <div style="width: 100%;height: 100%;" id="popChart" ref="main">
- </div>
+ <div class="boxChart">
+ <div style="width: 5rem;height:1.5rem;" id="echarts" ref="main"></div>
</div>
</div>
<!-- 鏄庣粏寮规 -->
@@ -53,7 +42,7 @@
center
v-dialogDrag
>
- <div class="el-dialog-div" style="height: 260px">
+ <div class="el-dialog-div" style="height: 500px">
<public-detailed-list v-bind="$attrs"></public-detailed-list>
</div>
</el-dialog>
@@ -62,6 +51,7 @@
<script>
import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
+// import dayjs from 'dayjs'
export default {
name: 'ECharts',
@@ -70,16 +60,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,6 +126,12 @@
},
mounted () {
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()
},
methods: {
onSubmit () {
@@ -157,9 +151,9 @@
this.myChart.clear()
var dataUnit = ''
if (datatype === 1) {
- dataUnit = '娴侀噺(m鲁/d)'
+ dataUnit = '搴熸按娴侀噺(m鲁/d)'
} else {
- dataUnit = '娴侀噺(m鲁/h)'
+ dataUnit = '搴熸按娴侀噺(m鲁/h)'
}
var serLists = []
@@ -290,12 +284,12 @@
var seriesName = params[i].seriesName
// 鍊�
var value = params[i].value
- var valueFliter
- if (value === 'NaN') {
- valueFliter = ''
- } else {
- // valueFliter = formatter(value)
- }
+ // var valueFliter
+ // if (value === 'NaN') {
+ // valueFliter = ''
+ // } else {
+ // // valueFliter = formatter(value)
+ // }
var maker = params[i].marker
if (seriesName === 'COD') {
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#fff21c;"></span>'
@@ -308,7 +302,7 @@
} else {
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#9ACD32;"></span>'
}
- s += maker + seriesName + ':' + valueFliter + '<br />'
+ s += maker + seriesName + ':' + value + '<br />'
}
return s
}
@@ -322,7 +316,8 @@
grid: { // 缃戞牸
top: '20%',
left: '7%',
- bottom: '10%'
+ bottom: '10%',
+ right: '5%'
},
legend: {
data: legend,
@@ -683,9 +678,7 @@
}
}
.el-dialog-div {
- //height: 50vh!important;
overflow: auto;
- //overflow: hidden;
}
#echarts {
--
Gitblit v1.8.0