Ver Fonte

[Mod 0000]修改塔山火灾预警页面字段显示及下拉框选项内容

wangkeyi há 4 dias atrás
pai
commit
a5620c7b05

+ 2 - 2
src/views/vent/home/configurable/configurable.data.tashan.ts

@@ -586,7 +586,7 @@ export const testConfigTSFire: Config[] = [
             { name: '氮气', prop: 'readData.n2val' },
             { name: '二氧化碳', prop: 'readData.co2val' },
             { name: '一氧化碳', prop: 'readData.coval' },
-            { name: '瓦斯', prop: 'readData.gasval' },
+            { name: '甲烷', prop: 'readData.gasval' },
             { name: '氧气', prop: 'readData.o2val' },
             { name: '报警等级', prop: 'syswarnLevel_str' },
           ],
@@ -648,7 +648,7 @@ export const testConfigTSFire: Config[] = [
             { name: '氮气', prop: 'readData.n2val' },
             { name: '二氧化碳', prop: 'readData.co2val' },
             { name: '一氧化碳', prop: 'readData.coval' },
-            { name: '瓦斯', prop: 'readData.gasval' },
+            { name: '甲烷', prop: 'readData.gasval' },
             { name: '氧气', prop: 'readData.o2val' },
             { name: '报警等级', prop: 'syswarnLevel_str' },
           ],

+ 23 - 14
src/views/vent/home/configurable/fireTS.vue

@@ -175,9 +175,9 @@
           label: device.strinstallpos, // 选项标签:设备
         })),
       };
-      const targetIndicators: Array<keyof Pick<BundletubeHistoryItem, 'ch2val' | 'chval' | 'co2val' | 'coval' | 'gasval' | 'o2val'>> = [
-        'ch2val',
-        'chval',
+      const targetIndicators: Array<keyof Pick<BundletubeHistoryItem, 'temperature' | 'n2val' | 'co2val' | 'coval' | 'gasval' | 'o2val'>> = [
+        'temperature',
+        'n2val',
         'co2val',
         'coval',
         'gasval',
@@ -220,11 +220,11 @@
   };
   interface BundletubeHistoryItem {
     time: string; // 时间戳(如"2025-08-23 07:56:35")
-    ch2val: string | number; // 甲烷2
-    chval: string | number; // 甲烷
+    temperature: string | number; // 温度
+    n2val: string | number; // 氮气
     co2val: string | number; // 二氧化碳值
     coval: string | number; // 一氧化碳值
-    gasval: string | number; // 瓦斯
+    gasval: string | number; // 甲烷
     o2val: string | number; // 氧气值
   }
   // 定义chartData中seriesData的单个元素类型
@@ -234,7 +234,7 @@
   }
   interface ChartDataItem {
     deviceID: string; // 设备id
-    sensorId: 'ch2val' | 'chval' | 'co2val' | 'coval' | 'gasval' | 'o2val'; // 指标ID(固定6个)
+    sensorId: 'temperature' | 'n2val' | 'co2val' | 'coval' | 'gasval' | 'o2val'; // 指标ID(固定6个)
     seriesData: SeriesDataItem[]; // 时间+数值数组
   }
   // 处理selectorConfig1:遍历datalist,提取deviceID和strinstallpos
@@ -249,12 +249,12 @@
   // 处理selectorConfig2:固定6个指标ID及对应中文标签
   const selectorConfig2 = {
     options: [
-      { value: 'o2val', label: '氧气' },
-      { value: 'coval', label: '一氧化碳' },
+      { value: 'temperature', label: '温度' },
+      { value: 'n2val', label: '氮气' },
       { value: 'co2val', label: '二氧化碳' },
-      { value: 'chval', label: '甲烷' },
-      { value: 'ch2val', label: '乙烷' },
-      { value: 'gasval', label: '瓦斯' },
+      { value: 'coval', label: '一氧化碳' },
+      { value: 'gasval', label: '甲烷' },
+      { value: 'o2val', label: '氧气' },
     ],
   };
   // 最终生成的图表数据
@@ -269,9 +269,18 @@
 
   @font-face {
     font-family: 'douyuFont';
-    src: url('../../../../assets/font/douyuFont.otf');
+    src: url('/@/assets/font/douyuFont.otf');
+  }
+  @{theme-green} {
+    .company-home {
+      --image-fire-title: url(/@/assets/images/themify/green/vent/vent-header2.png);
+    }
+  }
+  @{theme-deepblue} {
+    .company-home {
+      --image-fire-title: url(/@/assets/images/vent/vent-header1.png);
+    }
   }
-
   .company-home {
     --image-fire-title: url(/@/assets/images/vent/vent-header1.png);
     --image-common-border1: url('/@/assets/images/home-container/configurable/minehome/common-border1.png');