diff --git a/src/components/sensorFusion/meanValue.vue b/src/components/sensorFusion/meanValue.vue
index 3ab3b4f..c607423 100644
--- a/src/components/sensorFusion/meanValue.vue
+++ b/src/components/sensorFusion/meanValue.vue
@@ -79,10 +79,35 @@ export default {
this.dataList = this.dataList.slice(-10);
}
for (let i = 0; i < this.dataList.length; i++) {
- this.max.push(this.dataList[i].max);
- this.min.push(this.dataList[i].min);
- this.med.push(this.dataList[i].med);
- this.avg.push(this.dataList[i].avg);
+ if(this.dataList[i].max) {
+ this.max.push(Math.abs(this.dataList[i].max.toFixed(2)));
+ }else {
+ this.max.push(0);
+ }
+
+ if(this.dataList[i].min) {
+ this.min.push(Math.abs(this.dataList[i].min.toFixed(2)));
+ }else {
+ this.min.push(0);
+ }
+
+ if(this.dataList[i].med) {
+ this.med.push(Math.abs(this.dataList[i].med.toFixed(2)));
+ }else {
+ this.med.push(0);
+ }
+
+ if(this.dataList[i].avg) {
+ this.avg.push(Math.abs(this.dataList[i].avg.toFixed(2)));
+ }else {
+ this.avg.push(0);
+ }
+
+
+ // this.max.push(Math.abs(this.dataList[i].max.toFixed(2)));
+ // this.min.push(Math.abs(this.dataList[i].min.toFixed(2)));
+ // this.med.push(Math.abs(this.dataList[i].med.toFixed(2)));
+ // this.avg.push(Math.abs(this.dataList[i].avg.toFixed(2)));
}
let maxData = "";
let minData = "";
diff --git a/src/views/sensorFusion/index.vue b/src/views/sensorFusion/index.vue
index fe4c5c9..810a6ee 100644
--- a/src/views/sensorFusion/index.vue
+++ b/src/views/sensorFusion/index.vue
@@ -783,8 +783,8 @@
非机动车|行人
-->
-
-
+
+
占用
@@ -3355,8 +3355,8 @@ export default {
min: msgN[j].min,
name: msgN[j].name,
type: msgN[j].type,
- n_stay: msgN[j].ave_stay,
- n_queue: msgN[j].ave_queue,
+ ave_stay: msgN[j].ave_stay,
+ ave_queue: msgN[j].ave_queue,
occ: msgN[j].occ,
speed: newSpeed,
originalSpeed: msgN[j].speed