From 87f788ef4592d25246e919ca8a98a4393b53924d Mon Sep 17 00:00:00 2001
From: yichenxi <yichenxi0601@163.com>
Date: Sun, 23 Apr 2023 13:12:45 +0800
Subject: [PATCH] 1、监控实时数据时间修改 2、走航车尘负荷数据显示修改
---
src/components/Wind/Map.vue | 11 +++++++++--
src/views/car/index.vue | 20 ++++++++++++++++++--
2 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/src/components/Wind/Map.vue b/src/components/Wind/Map.vue
index fb606f5..0507a4c 100644
--- a/src/components/Wind/Map.vue
+++ b/src/components/Wind/Map.vue
@@ -661,10 +661,16 @@
},
// ���������������������
currentHour() {
+ // const aData = new Date()
+ // const month = aData.getMonth() < 9 ? '0' + (aData.getMonth() + 1) : aData.getMonth() + 1
+ // const date = aData.getDate() <= 9 ? '0' + aData.getDate() : aData.getDate()
+ // const hour = aData.getHours() <= 9 ? '0' + aData.getHours() - 1 : aData.getHours() - 1
+ // const currentDate = aData.getFullYear() + '-' + month + '-' + date + ' ' + hour + ':00'
+ // this.dateFormat = currentDate.toString()
const aData = new Date()
const month = aData.getMonth() < 9 ? '0' + (aData.getMonth() + 1) : aData.getMonth() + 1
- const date = aData.getDate() <= 9 ? '0' + aData.getDate() : aData.getDate()
- const hour = aData.getHours() <= 9 ? '0' + aData.getHours() - 1 : aData.getHours() - 1
+ const date = aData.getDate()
+ const hour = aData.getHours()
const currentDate = aData.getFullYear() + '-' + month + '-' + date + ' ' + hour + ':00'
this.dateFormat = currentDate.toString()
},
@@ -1485,6 +1491,7 @@
this.times = 300
}, 100)
}
+ this.currentHour();
}, 1000)
},
// ���������������������
diff --git a/src/views/car/index.vue b/src/views/car/index.vue
index 58540b7..b5043b0 100644
--- a/src/views/car/index.vue
+++ b/src/views/car/index.vue
@@ -1243,11 +1243,27 @@
point.a99054 = parseFloat(value.a99054).toFixed(3)
if (
value.dustld - 0 !== 0 &&
- value.dustld - 0 < 100 &&
+ value.dustld - 0 < 150 &&
(that.carMac === 'p5dnd7a0243622' ||
that.carMac === 'p5dnd7a0243625')
) {
- point.dustld = 100
+ point.dustld = 200
+ } else if (
+ value.dustld - 0 !== 0 &&
+ value.dustld - 0 >= 150 &&
+ value.dustld - 0 <= 180 &&
+ (that.carMac === 'p5dnd7a0243622' ||
+ that.carMac === 'p5dnd7a0243625')
+ ) {
+ point.dustld = 220
+ } else if (
+ value.dustld - 0 !== 0 &&
+ value.dustld - 0 > 180 &&
+ value.dustld - 0 <= 200 &&
+ (that.carMac === 'p5dnd7a0243622' ||
+ that.carMac === 'p5dnd7a0243625')
+ ) {
+ point.dustld = 230
} else {
point.dustld = value.dustld - 0
}
--
Gitblit v1.8.0