From 1788c96aea9247cc36ef8b82734997f1a6a92fb4 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 23 八月 2024 11:07:42 +0800
Subject: [PATCH] 新增新版本。静安区特供版

---
 src/components/monitor/FactorTrend.vue |   48 +++++++++++++++++-------------------------------
 1 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/src/components/monitor/FactorTrend.vue b/src/components/monitor/FactorTrend.vue
index f2e0e3f..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)"
@@ -74,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: {
@@ -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) {
@@ -199,7 +185,7 @@
 }
 
 .factor-name {
-  color: var(--el-color-warning);
+  color: #23dad1;
 }
 
 .factor-unit {

--
Gitblit v1.9.3