Merge branch 'dev' of gitlab.suntrayoa.com:geqilin/zhxf_vue into dev

src/pages/ol/kanban/index.vue

@@ -481,6 +481,9 @@ export default {
                 if (element.id === e.resource_id) {
                   element.children.forEach((el) => {
                     el.value = e.water_pressure + 'MPa'
+                    if (e.is_alarm === 2) {
+                      el.type = el.type + 'h'
+                    }
                   })
                 }
               })
@@ -495,12 +498,24 @@ export default {
                   element.children.forEach((el) => {
                     if (el.rightName === '温度') {
                       el.value = e.temperature + '°C'
+                      if (e.tp_is_alarm === 2) {
+                        el.type = el.type + 'h'
+                      }
                     } else if (el.rightName === '湿度') {
                       el.value = e.humidity + '%RH'
+                      if (e.hm_is_alarm === 2) {
+                        el.type = el.type + 'h'
+                      }
                     } else if (el.rightName === '一氧化碳') {
                       el.value = e.carbon_monoxide + 'PPM'
+                      if (e.cm_is_alarm === 2) {
+                        el.type = el.type + 'h'
+                      }
                     } else if (el.rightName === '二氧化碳') {
                       el.value = e.carbon_dioxide + 'PPM'
+                      if (e.cd_is_alarm === 2) {
+                        el.type = el.type + 'h'
+                      }
                     }
                   })
                 }
@@ -515,6 +530,9 @@ export default {
                 if (element.id === e.resource_id) {
                   element.children.forEach((el) => {
                     el.value = e.flow_rate + 'm3/h'
+                    if (e.fr_is_alarm === 2) {
+                      el.type = el.type + 'h'
+                    }
                   })
                 }
               })
@@ -528,6 +546,9 @@ export default {
                 if (element.id === e.resource_id) {
                   element.children.forEach((el) => {
                     el.value = e.gauge_height + 'cm'
+                    if (e.gh_is_alarm === 2) {
+                      el.type = el.type + 'h'
+                    }
                   })
                 }
               })
@@ -541,6 +562,9 @@ export default {
                 if (element.id === e.resource_id) {
                   element.children.forEach((el) => {
                     el.value = e.wind_speed + 'm/s'
+                    if (e.ws_is_alarm === 2) {
+                      el.type = el.type + 'h'
+                    }
                   })
                 }
               })
@@ -554,6 +578,9 @@ export default {
                 if (element.id === e.resource_id) {
                   element.children.forEach((el) => {
                     el.value = e.wind_pressure + 'pa'
+                    if (e.wp_is_alarm === 2) {
+                      el.type = el.type + 'h'
+                    }
                   })
                 }
               })