From 8e0aedecb2e53a8ff25fdc4db8f1718e116e759b Mon Sep 17 00:00:00 2001
From: guoshipeng <3194674006@qq.com>
Date: Wed, 23 Aug 2023 15:50:59 +0800
Subject: [PATCH] fix:修改六参和接口
---
src/views/reportForm/sensorday.vue | 68 +++++++++++++++++++++++++++++-----
src/components/Wind/Map.vue | 10 ++++-
2 files changed, 66 insertions(+), 12 deletions(-)
diff --git a/src/components/Wind/Map.vue b/src/components/Wind/Map.vue
index d6f260c..a479499 100644
--- a/src/components/Wind/Map.vue
+++ b/src/components/Wind/Map.vue
@@ -479,7 +479,13 @@
},
mounted() {
this.currentHour()
- this.$Bus.$on('alarmTableVisible', (res) => (this.alarmTableVisible = res))
+ this.$Bus.$on(
+ 'alarmTableVisible',
+ (res) => (
+ (this.alarmTableVisible = res),
+ this.alertData(this.PageSize, this.currentPage)
+ )
+ )
// ���������������������
this.initMap()
@@ -496,7 +502,7 @@
this.getParamsData()
this.windDir()
this.newDate()
- this.alertData(this.PageSize, this.currentPage)
+ // this.alertData(this.PageSize, this.currentPage)
},
beforeDestroy() {
if (this.timer) {
diff --git a/src/views/reportForm/sensorday.vue b/src/views/reportForm/sensorday.vue
index 2d339b4..ec79d3d 100644
--- a/src/views/reportForm/sensorday.vue
+++ b/src/views/reportForm/sensorday.vue
@@ -55,7 +55,7 @@
<el-table-column
prop="name"
label="������������"
- width="240"
+ width="218"
align="center"
>
</el-table-column>
@@ -63,13 +63,13 @@
<el-table-column
prop="composite"
label="������"
- width="180"
+ width="90"
align="center"
>
</el-table-column>
<el-table-column
label="������"
- width="180"
+ width="90"
align="center"
prop="compositeNum"
sortable
@@ -77,23 +77,71 @@
</el-table-column>
</el-table-column>
<el-table-column label="PM2.5" align="center">
- <el-table-column prop="pm25" label="������" width="180" align="center">
+ <el-table-column prop="pm25" label="������" width="90" align="center">
</el-table-column>
<el-table-column
label="������"
- width="180"
+ width="90"
align="center"
prop="pm25Num"
sortable
>
</el-table-column>
</el-table-column>
- <el-table-column label="������" align="center">
- <el-table-column prop="o3" label="������" width="180" align="center">
+ <el-table-column label="PM10" align="center">
+ <el-table-column prop="pm10" label="������" width="90" align="center">
</el-table-column>
<el-table-column
label="������"
- width="180"
+ width="90"
+ align="center"
+ prop="pm10Num"
+ sortable
+ >
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="SO2" align="center">
+ <el-table-column prop="so2" label="������" width="90" align="center">
+ </el-table-column>
+ <el-table-column
+ label="������"
+ width="90"
+ align="center"
+ prop="so2Num"
+ sortable
+ >
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="NO2" align="center">
+ <el-table-column prop="no2" label="������" width="90" align="center">
+ </el-table-column>
+ <el-table-column
+ label="������"
+ width="90"
+ align="center"
+ prop="no2Num"
+ sortable
+ >
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="CO" align="center">
+ <el-table-column prop="co" label="������" width="90" align="center">
+ </el-table-column>
+ <el-table-column
+ label="������"
+ width="90"
+ align="center"
+ prop="conum"
+ sortable
+ >
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="O3" align="center">
+ <el-table-column prop="o3" label="������" width="90" align="center">
+ </el-table-column>
+ <el-table-column
+ label="������"
+ width="100"
align="center"
prop="o3Num"
sortable
@@ -101,11 +149,11 @@
</el-table-column>
</el-table-column>
<el-table-column label="TVOC" align="center">
- <el-table-column prop="tovc" label="������" width="180" align="center">
+ <el-table-column prop="tovc" label="������" width="90" align="center">
</el-table-column>
<el-table-column
label="������"
- width="180"
+ width="100"
align="center"
prop="tovcnum"
sortable
--
Gitblit v1.8.0