From c23ac06446a9a1edc41cc13723e5d0b8eabdfd63 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 16 七月 2025 17:30:50 +0800
Subject: [PATCH] 2025.7.16 动态溯源新增合并异常
---
src/components/monitor/FactorTrend.vue | 67 +++++++++++++++------------------
1 files changed, 31 insertions(+), 36 deletions(-)
diff --git a/src/components/monitor/FactorTrend.vue b/src/components/monitor/FactorTrend.vue
index f2e0e3f..babe6f1 100644
--- a/src/components/monitor/FactorTrend.vue
+++ b/src/components/monitor/FactorTrend.vue
@@ -1,26 +1,15 @@
<template>
<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> -->
+ <DashBoard ref="dashBoardRef" :factor-datas="factorDatas"></DashBoard>
+ <el-scrollbar :height="height" always>
<div v-for="item in seriesList" :key="item.key">
<el-row
v-show="selectFactorType.includes(item.series.key)"
justify="space-between"
class="wrap"
>
- <div class="flex-col">
+ <div class="flex-col m-r-4">
<div class="factor-name">{{ item.series.name }}</div>
<div class="factor-value">
{{ item.series.currentData }}
@@ -46,8 +35,10 @@
import { checkboxOptions } from '@/constant/checkbox-options';
import { factorName } from '@/constant/factor-name';
import { factorUnit } from '@/constant/factor-unit';
+import DashBoard from '@/views/realtimemode/component/DashBoard.vue';
export default {
+ components: { DashBoard },
props: {
loading: Boolean,
factorDatas: FactorDatas,
@@ -68,26 +59,13 @@
},
data() {
return {
+ height: 'calc(99vh - var(--bevel-length-2))',
xAxis: [],
allSeries: new Map(),
seriesList: []
};
},
- 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;
- // }
- },
+ computed: {},
watch: {
factorDatas: {
handler() {
@@ -165,12 +143,20 @@
},
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) {
@@ -179,7 +165,16 @@
getUnit(label) {
// fixeme 2024.5.15 淇CO灞曠ず鍗曚綅鍜屽師濮嬫暟鎹笉涓�鑷撮棶棰�
return label == 'CO' ? '渭g/m鲁' : factorUnit[label].unit;
+ },
+ calcHeight() {
+ const h1 = this.$refs.dashBoardRef
+ ? this.$refs.dashBoardRef.$el.offsetHeight
+ : 0;
+ this.height = `calc(98vh - var(--bevel-length-2) - ${h1}px)`;
}
+ },
+ mounted() {
+ this.calcHeight();
}
};
</script>
@@ -199,7 +194,7 @@
}
.factor-name {
- color: var(--el-color-warning);
+ color: #23dad1;
}
.factor-unit {
--
Gitblit v1.9.3