From c7a16ca1b6fbcb0b82a4a09c2e75014624082e37 Mon Sep 17 00:00:00 2001
From: Riku <risaku@163.com>
Date: 星期四, 27 三月 2025 22:45:48 +0800
Subject: [PATCH] 修复走航融合功能bug
---
src/components/monitor/FactorTrend.vue | 58 +++++++++++++++++++++++++---------------------------------
1 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/src/components/monitor/FactorTrend.vue b/src/components/monitor/FactorTrend.vue
index 7c25179..eddadbb 100644
--- a/src/components/monitor/FactorTrend.vue
+++ b/src/components/monitor/FactorTrend.vue
@@ -2,18 +2,6 @@
<BaseCard size="medium" direction="left">
<template #content>
<el-scrollbar height="calc(98vh - var(--bevel-length-2))">
- <!-- <div v-for="item in factorTypes" :key="item">
- <el-row>
- <div>{{ allSeries.get(item.value).name }}</div>
- <div>{{ allSeries.get(item.value).currentData }}</div>
- <div>{{ allSeries.get(item.value).min }}</div>
- <div>{{ allSeries.get(item.value).max }}</div>
- <RealTimeLineChart
- v-show="selectFactorType.includes(item.value)"
- :model-value="series(item.value)"
- ></RealTimeLineChart>
- </el-row>
- </div> -->
<div v-for="item in seriesList" :key="item.key">
<el-row
v-show="selectFactorType.includes(item.series.key)"
@@ -22,7 +10,9 @@
>
<div class="flex-col">
<div class="factor-name">{{ item.series.name }}</div>
- <div class="factor-value">{{ item.series.currentData }}</div>
+ <div class="factor-value">
+ {{ item.series.currentData }}
+ </div>
<div class="factor-unit">
{{ getUnit(item.series.label) }}
</div>
@@ -72,18 +62,8 @@
};
},
computed: {
- factorTypes() {
- return checkboxOptions(this.deviceType);
- }
- // seriesList() {
- // const list = [];
- // for (const iterator of this.allSeries) {
- // list.push({
- // xAxis: this.xAxis,
- // series: iterator[1]
- // });
- // }
- // return list;
+ // factorTypes() {
+ // return checkboxOptions(this.deviceType);
// }
},
watch: {
@@ -163,16 +143,28 @@
},
toList() {
const list = [];
- for (const iterator of this.allSeries) {
- list.push({
- xAxis: this.xAxis,
- series: iterator[1]
- });
- }
+ // for (const iterator of this.allSeries) {
+ // list.push({
+ // xAxis: this.xAxis,
+ // series: iterator[1]
+ // });
+ // }
+ checkboxOptions(this.deviceType).forEach((t) => {
+ if (this.allSeries.has(t.value)) {
+ list.push({
+ xAxis: this.xAxis,
+ series: this.allSeries.get(t.value)
+ });
+ }
+ });
this.seriesList = list;
},
+ // getScaleValue(label, value) {
+ // return (factorUnit[label].scale * value).toFixed();
+ // },
getUnit(label) {
- return factorUnit[label];
+ // fixeme 2024.5.15 淇CO灞曠ず鍗曚綅鍜屽師濮嬫暟鎹笉涓�鑷撮棶棰�
+ return label == 'CO' ? '渭g/m鲁' : factorUnit[label].unit;
}
}
};
@@ -193,7 +185,7 @@
}
.factor-name {
- color: var(--el-color-warning);
+ color: #23dad1;
}
.factor-unit {
--
Gitblit v1.9.3