From 62278995e5dea51951f483b65c2cea0554109d1d Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 15 四月 2021 09:31:29 +0800
Subject: [PATCH] 更新
---
src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue | 2
src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue | 7 +--
src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue | 2
src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue | 103 +++++++++++++++++++++++++--------------------------
4 files changed, 55 insertions(+), 59 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
index 1ba24a5..325d981 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
@@ -319,7 +319,7 @@
grid: { // 缃戞牸
top: '20%',
left: '7%',
- bottom: '10%',
+ bottom: '11%',
right: '5%'
},
legend: {
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
index f771149..896d123 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
@@ -41,8 +41,7 @@
<div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
</div>
<div class="boxChart">
- <div style="width: 5rem;height:1.5rem;" id="popChart" ref="main">
- </div>
+ <div style="width: 5rem;height:1.5rem;" id="echarts" ref="main"></div>
</div>
</div>
<!-- 鏄庣粏寮规 -->
@@ -71,8 +70,6 @@
},
data () {
return {
- value1: '',
- value2: '',
watchData: [],
dialogVisible: false,
myChar: null,
@@ -140,7 +137,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/EChartsWasteWaterTable.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue
index eb0006d..50f0622 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue
@@ -126,168 +126,168 @@
return {
tableData: [{
date: '2016-05-03 12:00:00',
- codWatch: '1',
+ codWatch: '7.23',
codTime: '-',
- phWatch: '1',
- phTime: '2',
- bod5Watch: '1',
+ phWatch: '0.43',
+ phTime: '9.21',
+ bod5Watch: '7.12',
bod5Time: '-',
- adWatch: '1',
+ adWatch: '0.23',
adTime: '-'
},
{
date: '2016-05-03 12:00:15',
codWatch: '-',
- codTime: '2',
+ codTime: '5.32',
phWatch: '-',
- phTime: '2',
+ phTime: '0.23',
bod5Watch: '1',
- bod5Time: '2',
- adWatch: '1',
+ bod5Time: '9.88',
+ adWatch: '1.76',
adTime: '-'
},
{
date: '2016-05-03 12:00:30',
- codWatch: '1',
- codTime: '2',
+ codWatch: '-',
+ codTime: '0.92',
phWatch: '-',
- phTime: '2',
- bod5Watch: '1',
+ phTime: '8.71',
+ bod5Watch: '0.72',
bod5Time: '-',
- adWatch: '1',
- adTime: '2'
+ adWatch: '6.23',
+ adTime: '0.86'
},
{
date: '2016-05-03 12:01:15',
- codWatch: '1',
+ codWatch: '10.22',
codTime: '-',
phWatch: '-',
- phTime: '2',
- bod5Watch: '1',
+ phTime: '0.92',
+ bod5Watch: '0.82',
bod5Time: '-',
- adWatch: '1',
+ adWatch: '23.82',
adTime: '-'
},
{
date: '2016-05-03 12:01:30',
- codWatch: '1',
+ codWatch: '0.31',
codTime: '-',
phWatch: '-',
- phTime: '2',
- bod5Watch: '1',
+ phTime: '6.12',
+ bod5Watch: '0.31',
bod5Time: '-',
- adWatch: '1',
- adTime: '2'
+ adWatch: '0.21',
+ adTime: '-'
},
{
date: '2016-05-03 12:02:15',
- codWatch: '1',
+ codWatch: '9.22',
codTime: '-',
phWatch: '-',
phTime: '-',
bod5Watch: '-',
- bod5Time: '1',
+ bod5Time: '0.72',
adWatch: '-',
- adTime: '2'
+ adTime: '17.23'
},
{
date: '2016-05-03 12:02:30',
codWatch: '-',
codTime: '-',
- phWatch: '2',
+ phWatch: '0.83',
phTime: '-',
- bod5Watch: '1',
+ bod5Watch: '23.22',
bod5Time: '-',
adWatch: '-',
adTime: '-'
},
{
date: '2016-05-03 12:03:15',
- codWatch: '1',
+ codWatch: '8.74',
codTime: '-',
phWatch: '-',
- phTime: '-',
+ phTime: '13.22',
bod5Watch: '-',
- bod5Time: '1',
+ bod5Time: '0.23',
adWatch: '-',
adTime: '-'
},
{
date: '2016-05-03 12:03:30',
- codWatch: '1',
+ codWatch: '0.82',
codTime: '-',
phWatch: '-',
phTime: '-',
bod5Watch: '-',
- bod5Time: '1',
+ bod5Time: '32.42',
adWatch: '-',
- adTime: '1'
+ adTime: '0.88'
},
{
date: '2016-05-03 12:04:15',
codWatch: '-',
codTime: '-',
- phWatch: '1',
+ phWatch: '0.71',
phTime: '-',
bod5Watch: '-',
- bod5Time: '1',
+ bod5Time: '15.83',
adWatch: '-',
- adTime: '2'
+ adTime: '24.82'
},
{
date: '2016-05-03 12:04:30',
codWatch: '-',
- codTime: '1',
- phWatch: '2',
+ codTime: '19.65',
+ phWatch: '29.22',
phTime: '-',
- bod5Watch: '1',
+ bod5Watch: '0.98',
bod5Time: '-',
adWatch: '-',
adTime: '-'
},
{
date: '2016-05-03 12:05:15',
- codWatch: '1',
+ codWatch: '19.32',
codTime: '-',
phWatch: '-',
phTime: '-',
bod5Watch: '-',
- bod5Time: '1',
+ bod5Time: '12.21',
adWatch: '-',
adTime: '-'
},
{
date: '2016-05-03 12:05:30',
- codWatch: '1',
+ codWatch: '10.53',
codTime: '-',
phWatch: '-',
phTime: '-',
bod5Watch: '-',
- bod5Time: '1',
+ bod5Time: '23.71',
adWatch: '-',
- adTime: '1'
+ adTime: '10.55'
},
{
date: '2016-05-03 12:06:15',
- codWatch: '1',
+ codWatch: '31.63',
codTime: '-',
phWatch: '-',
phTime: '-',
bod5Watch: '-',
- bod5Time: '1',
+ bod5Time: '0.56',
adWatch: '-',
adTime: '-'
},
{
date: '2016-05-03 12:06:30',
- codWatch: '1',
+ codWatch: '19.53',
codTime: '-',
phWatch: '-',
phTime: '-',
bod5Watch: '-',
- bod5Time: '1',
+ bod5Time: '0.28',
adWatch: '-',
- adTime: '1'
+ adTime: '0.75'
}]
}
},
@@ -305,5 +305,4 @@
</script>
<style scoped>
-
</style>
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue b/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue
index 2a3d35f..11f39fd 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue
@@ -1,6 +1,6 @@
<template>
<div class="PublicDetailedList">
- <el-table :data="tableData" max-height="500px" border>
+ <el-table :data="tableData" max-height="400px" border>
<el-scrollbar style="height: 50vh">
<el-table-column prop="OnLineMonEmissPointName" label="鎺掓斁鐐�"></el-table-column>
<el-table-column prop="MonTimeStr" label="鐩戞祴鏃堕棿"></el-table-column>
--
Gitblit v1.8.0