火灾指标-更新提交

src/views/vent/monitorManager/alarmMonitor/common/warnFire-brt.vue

@@ -17,6 +17,7 @@
 </template>
 <script setup lang="ts">
 import { ref, reactive, watch } from 'vue'
+import { useGlobSetting } from '/@/hooks/setting';
 import warnZb from './warnZb.vue'
 let props = defineProps({
     tableList: {
@@ -73,51 +74,13 @@ let columns = reactive([
 ])
 
 watch(() => props.tableList, (newV, oldV) => {
-    // if (newV.length != 0) {
-        tableData.value=  [
+    let { sysOrgCode } = useGlobSetting();
+    if (sysOrgCode == 'A02A02') {
+        tableData.value = [
             {
                 "alarmType": "fireWarn",
                 "alarmdes": "<79.1,<0.12,",
                 "level": "绿色预警",
-                "sublist": [
-                    {
-                        "alarmdes": "<79.1,<0.12,",
-                        "level": "绿色预警",
-                        "temperature": "0-120℃",
-                        "rules": [
-                            {
-                                "fMax": 79.100000,
-                                "fMin": null,
-                                "sysId": "1793103774786904066",
-                                "alarmId": "1811650465072791911",
-                                "orderNum": null,
-                                "alarmName": null,
-                                "valuename": "一氧化碳",
-                                "id": "1811629159141905793",
-                                "realId": "null",
-                                "valuecode": "coval",
-                                "value": null,
-                                "deviceId": "1699689104726626309"
-                            },
-                            {
-                                "fMax": 0.118000,
-                                "fMin": null,
-                                "sysId": "1793103774786904066",
-                                "alarmId": "1811650465072791911",
-                                "orderNum": null,
-                                "alarmName": null,
-                                "valuename": "一氧化碳/二氧化碳",
-                                "id": "1811629354212515842",
-                                "realId": "1811629159141905793",
-                                "valuecode": "coCo2",
-                                "value": null,
-                                "deviceId": "1699689104726626309"
-                            }
-                        ],
-                        "alarmInfo": "一氧化碳,一氧化碳/二氧化碳,",
-                        "alarmcode": "coval,coCo2,"
-                    }
-                ],
                 "temperature": "0-120℃",
                 "alarmName": "缓慢氧化阶段（潜伏期）",
                 "id": "1811650465072791911",
@@ -128,59 +91,6 @@ watch(() => props.tableList, (newV, oldV) => {
                 "alarmType": "fireWarn",
                 "alarmdes": "79.1-1653.6,0.12-0.46,<2.4,",
                 "level": "黄色预警",
-                "sublist": [
-                    {
-                        "alarmdes": "79.1-1653.6,0.12-0.46,<2.4,",
-                        "level": "黄色预警",
-                        "temperature": "120-200℃",
-                        "rules": [
-                            {
-                                "fMax": 1653.600000,
-                                "fMin": 79.100000,
-                                "sysId": "1793103774786904066",
-                                "alarmId": "1811650534094258912",
-                                "orderNum": null,
-                                "alarmName": null,
-                                "valuename": "一氧化碳",
-                                "id": "1811629946089295874",
-                                "realId": "null",
-                                "valuecode": "coval",
-                                "value": null,
-                                "deviceId": "1699689104726626309"
-                            },
-                            {
-                                "fMax": 0.459000,
-                                "fMin": 0.118000,
-                                "sysId": "1793103774786904066",
-                                "alarmId": "1811650534094258912",
-                                "orderNum": null,
-                                "alarmName": null,
-                                "valuename": "一氧化碳/二氧化碳",
-                                "id": "1811629105481236481",
-                                "realId": "1811629946089295874",
-                                "valuecode": "coCo2",
-                                "value": null,
-                                "deviceId": "1699689104726626309"
-                            },
-                            {
-                                "fMax": 2.400000,
-                                "fMin": null,
-                                "sysId": "1793103774786904066",
-                                "alarmId": "1811650534094258912",
-                                "orderNum": null,
-                                "alarmName": null,
-                                "valuename": "乙烯",
-                                "id": "1811629237106884609",
-                                "realId": "1811629946089295874",
-                                "valuecode": "ch2val",
-                                "value": null,
-                                "deviceId": "1699689104726626309"
-                            }
-                        ],
-                        "alarmInfo": "一氧化碳,一氧化碳/二氧化碳,乙烯,",
-                        "alarmcode": "coval,coCo2,ch2val,"
-                    }
-                ],
                 "temperature": "120-200℃",
                 "alarmName": "加速氧化阶段（自热期）",
                 "id": "1811650534094258912",
@@ -191,73 +101,6 @@ watch(() => props.tableList, (newV, oldV) => {
                 "alarmType": "fireWarn",
                 "alarmdes": ">1653.6,>0.46,>2.4,>0.0,",
                 "level": "红色预警",
-                "sublist": [
-                    {
-                        "alarmdes": ">1653.6,>0.46,>2.4,>0.0,",
-                        "level": "红色预警",
-                        "temperature": ">200℃",
-                        "rules": [
-                            {
-                                "fMax": null,
-                                "fMin": 1653.600000,
-                                "sysId": "1793103774786904066",
-                                "alarmId": "1811650769583423913",
-                                "orderNum": null,
-                                "alarmName": null,
-                                "valuename": "一氧化碳",
-                                "id": "1811629553701339138",
-                                "realId": "null",
-                                "valuecode": "coval",
-                                "value": null,
-                                "deviceId": "1699689104726626309"
-                            },
-                            {
-                                "fMax": null,
-                                "fMin": 0.459000,
-                                "sysId": "1793103774786904066",
-                                "alarmId": "1811650769583423913",
-                                "orderNum": null,
-                                "alarmName": null,
-                                "valuename": "一氧化碳/二氧化碳",
-                                "id": "1811629668478468098",
-                                "realId": "1811629553701339138",
-                                "valuecode": "coCo2",
-                                "value": null,
-                                "deviceId": "1699689104726626309"
-                            },
-                            {
-                                "fMax": null,
-                                "fMin": 2.400000,
-                                "sysId": "1793103774786904066",
-                                "alarmId": "1811650769583423913",
-                                "orderNum": null,
-                                "alarmName": null,
-                                "valuename": "乙烯",
-                                "id": "1811629806986969090",
-                                "realId": "1811629553701339138",
-                                "valuecode": "ch2val",
-                                "value": null,
-                                "deviceId": "1699689104726626309"
-                            },
-                            {
-                                "fMax": null,
-                                "fMin": 0.000000,
-                                "sysId": "1793103774786904066",
-                                "alarmId": "1811650769583423913",
-                                "orderNum": null,
-                                "alarmName": null,
-                                "valuename": "乙炔",
-                                "id": "1811629900318621697",
-                                "realId": "1811629553701339138",
-                                "valuecode": "chval",
-                                "value": null,
-                                "deviceId": "1699689104726626309"
-                            }
-                        ],
-                        "alarmInfo": "一氧化碳,一氧化碳/二氧化碳,乙烯,乙炔,",
-                        "alarmcode": "coval,coCo2,ch2val,chval,"
-                    }
-                ],
                 "temperature": ">200℃",
                 "alarmName": "剧烈氧化阶段（燃烧期）",
                 "id": "1811650769583423913",
@@ -265,8 +108,9 @@ watch(() => props.tableList, (newV, oldV) => {
                 "alarmcode": "coval,coCo2,ch2val,chval,"
             }
         ]
-        // tableData.value = newV
-    // }
+    } else {
+        tableData.value = newV
+    }
 }, { immediate: true, deep: true })
 
 </script>

src/views/vent/monitorManager/alarmMonitor/warn/fireWarn.vue

@@ -186,21 +186,6 @@
   }
   //加载预警指标组件
   function loadZb() {
-    // menuList1.info.forEach((el) => {
-    //     if (el.list.length != 0) {
-    //         el.list.forEach(v => {
-    //             if (v.alarmName == '缓慢氧化阶段（吸氧蓄热期）') {
-    //                 v.warnGrade = '绿色预警'
-    //             } else if (v.alarmName == '加速氧化阶段（自热期）') {
-    //                 v.warnGrade = '黄色预警'
-    //             } else if (v.alarmName == '剧烈氧化阶段（燃烧期）') {
-    //                 v.warnGrade = '红色预警'
-    //             }
-    //         })
-    //     } else {
-    //         tableLists.value.length = 0
-    //     }
-    // });
     tableLists.value = menuList1.info[0].list;
     const { sysOrgCode } = useGlobSetting();
     switch (sysOrgCode) {