[前台] 系統監控卡片原點無法正常轉換 | 全局警告卡片 bql 語法修正

2023-06-02 15:25:45 +08:00 · 2023-06-02 15:25:45 +08:00 · 31aa51985f
commit 31aa51985f
parent 099945f533
3 changed files with 3063 additions and 2796 deletions
--- a/Frontend/_sysMonAll.html
+++ b/Frontend/_sysMonAll.html
@ -198,7 +198,7 @@

      if (
        data.point_name == norDevPoiName &&
-                data.value == matchDevice.device_normal_point_value &&
+        (data.value == matchDevice.device_normal_point_value || norDevPoiName === errDevPoiName) &&
        !deviceNormalArr.some(
          ({ device_number }) => device_number === matchDevice.device_number
        )
--- a/Frontend/_sysMonFloor.html
+++ b/Frontend/_sysMonFloor.html
@ -624,7 +624,7 @@

      if (
        data.point_name == norDevPoiName &&
-                data.value == matchDevice.device_normal_point_value &&
+        (data.value == matchDevice.device_normal_point_value || norDevPoiName === errDevPoiName) &&
        !deviceScatterNormalArr.some(
          ({ device_number }) => data.device_number_full === device_number
        )
--- a/Frontend/js/n4js/alarmbaja.js
+++ b/Frontend/js/n4js/alarmbaja.js