From e723b7220b3fcda8c1633557f44f0afc1f0d2301 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 14 四月 2021 18:40:29 +0800
Subject: [PATCH] 修改默认显示图表
---
src/components/BaseNav/PublicBounced/common/PublicChart.vue | 4 ++--
src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue | 3 ++-
src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue | 2 +-
src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue | 5 +++--
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/PublicChart.vue b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
index 282bb30..f9e26bd 100644
--- a/src/components/BaseNav/PublicBounced/common/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
@@ -53,9 +53,11 @@
},
mounted () {
this.$refs.Echatrs.CreateChart()
+ this.$refs.Echatrs.effChartShow()
},
updated () {
this.$refs.Echats.CreateChart()
+ this.$refs.Echats.effChartShow()
},
data () {
return {
@@ -72,10 +74,8 @@
current (currentTab) {
if (this.$attrs.value === 'feishui') {
currentTab = 'EChartsHourWasteWater'
- console.log(currentTab)
} else {
currentTab = 'EChartsHour'
- console.log(currentTab)
}
return currentTab
}
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
index 6e35fdc..f771149 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
@@ -140,7 +140,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()
},
updated () {
this.onSubmit()
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
index 16b0a78..be91bb6 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
@@ -414,7 +414,8 @@
grid: { // 缃戞牸
top: '20%',
left: '7%',
- bottom: '10%'
+ bottom: '10%',
+ right: '5%'
},
legend: {
data: legend
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue
index 9fe3512..eb0006d 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue
@@ -6,13 +6,14 @@
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
- <div style="width: 766px">
+ <div style="width: 755px">
<el-table
:data="tableData"
- max-height="260px"
+ max-height="255px"
style="width: 100%;height: 100%">
<el-table-column
prop="date"
+ width="130"
label="妫�娴嬫椂闂�">
</el-table-column>
<el-table-column
--
Gitblit v1.8.0