From 49bff5f78b39042eab48e2864221e8891bdbe48c Mon Sep 17 00:00:00 2001
From: Celeste <aafree2014@gmail.com>
Date: Mon, 5 Jun 2023 13:36:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=B3=E6=99=82=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Frontend/js/n4js/alarmbaja.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Frontend/js/n4js/alarmbaja.js b/Frontend/js/n4js/alarmbaja.js
index b49054a..988f8da 100644
--- a/Frontend/js/n4js/alarmbaja.js
+++ b/Frontend/js/n4js/alarmbaja.js
@@ -820,10 +820,10 @@ function getOtherAlarmByBaja(
             main.ackedTime = record.get("ackTime").$cEncStr;
             main.ackState = record.get("ackState").$ordinal;
             if (_sourceTmp.includes("undefined")) {
-              main.buildingFloorName_zh = "無";
-              main.alarmClass = "系統/設備異常";
-              main.sourceTmp = "無";
-              main.msgText = "";
+              main.buildingFloorName_zh = "";
+              //main.alarmClass = "系統異常";
+              main.sourceTmp = "";
+              //main.msgText = "";
               _result.data.push(main);
             }
 
@@ -901,10 +901,10 @@ function getAllDeviceAlarmByBaja(
             main.ackState = record.get("ackState").$ordinal;
             if (_sourceTmp.includes("undefined")) {
               // console.log(main.ackState)
-              main.buildingFloorName_zh = "無";
-              main.alarmClass = "系統/設備異常";
-              main.sourceTmp = "無";
-              main.msgText = "";
+              main.buildingFloorName_zh = "";
+              //main.alarmClass = "系統異常";
+              main.sourceTmp = "";
+              //main.msgText = "";
             }
             _result.data.push(main);
             _index++;

From fd12f921a1c443d0465351a02d9b6c2c8ff3ad57 Mon Sep 17 00:00:00 2001
From: Celeste <aafree2014@gmail.com>
Date: Tue, 6 Jun 2023 10:35:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E5=89=8D=E5=8F=B0]=20=E5=8F=8A=E6=99=82?=
 =?UTF-8?q?=E5=91=8A=E8=AD=A6=E9=96=83=E7=88=8D=E9=8C=AF=E8=AA=A4=20|=20al?=
 =?UTF-8?q?armbaja=20=E8=AA=9E=E6=B3=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Frontend/index.html           | 2 +-
 Frontend/js/n4js/alarmbaja.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Frontend/index.html b/Frontend/index.html
index d7b3724..9b47826 100644
--- a/Frontend/index.html
+++ b/Frontend/index.html
@@ -1152,7 +1152,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
                             getAlarmSub(data);
                         }
 
-                        alarmIconBlink();
+                      alarmIconBlink(data);
                     });
                     getAlarm();
                 });
diff --git a/Frontend/js/n4js/alarmbaja.js b/Frontend/js/n4js/alarmbaja.js
index 988f8da..8095336 100644
--- a/Frontend/js/n4js/alarmbaja.js
+++ b/Frontend/js/n4js/alarmbaja.js
@@ -780,7 +780,7 @@ function getOtherAlarmByBaja(
       startUrl +
       "timestamp.millis <= " +
       endDate_millisecond +
-      " and normalTime " +
+      " and sourceState " +
       _recoverState +
       " and ackState " +
       _ackState +