From a5a58426a84b5ee8da48d7d4875f5871d08bfe45 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 14 四月 2021 16:18:57 +0800
Subject: [PATCH] 修改明细表弹窗问题
---
src/components/BaseNav/PublicBounced/common/PublicChart.vue | 2 ++
src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue | 2 +-
src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue | 7 +------
src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue | 13 +++++++++----
src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue | 3 ++-
5 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/PublicChart.vue b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
index 0ea49c3..0e5fe9f 100644
--- a/src/components/BaseNav/PublicBounced/common/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
@@ -70,8 +70,10 @@
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/EChartsDateWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
index 05af4e3..bebdeb0 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
@@ -319,7 +319,8 @@
grid: { // 缃戞牸
top: '20%',
left: '7%',
- bottom: '10%'
+ bottom: '10%',
+ right: '5%'
},
legend: {
data: legend
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
index c7d73cf..309f009 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
@@ -135,11 +135,6 @@
}
}
},
- created () {
- // 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)
- // }
- },
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')
@@ -462,7 +457,7 @@
}],
series: serLists
}
- console.log(option)
+ // console.log(option)
this.myChart.setOption(option)
/*
this.myChart.on('legendselectchanged', function (params) {
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
index c224353..a5de8ba 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
@@ -53,7 +53,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 +62,7 @@
<script>
import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
+import dayjs from 'dayjs'
export default {
name: 'ECharts',
@@ -137,6 +138,11 @@
}
},
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()
+ },
+ updated () {
this.onSubmit()
},
methods: {
@@ -322,7 +328,8 @@
grid: { // 缃戞牸
top: '20%',
left: '7%',
- bottom: '10%'
+ bottom: '10%',
+ right: '5%'
},
legend: {
data: legend,
@@ -683,9 +690,7 @@
}
}
.el-dialog-div {
- //height: 50vh!important;
overflow: auto;
- //overflow: hidden;
}
#echarts {
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue b/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue
index 0ca567b..2a3d35f 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue
@@ -39,7 +39,7 @@
}
},
mounted () {
- console.log(this.$attrs.value)
+ // console.log(this.$attrs.value)
if (this.$attrs.value === 'feiqi') {
this.tableData = this.$attrs.getWasteGasDetails
// console.log(this.$attrs.getWasteGasDetails)
--
Gitblit v1.8.0