diff --git a/Backend/appsettings.Development.json b/Backend/appsettings.Development.json
index e02e024..4dca5d7 100644
--- a/Backend/appsettings.Development.json
+++ b/Backend/appsettings.Development.json
@@ -16,8 +16,8 @@
     "MySqlDBConfig": {
       "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201
       "Port": "js2LutKe+rdjzdxMPQUrvQ==",
-      "Database": "VJB2XC+lAtzuHObDGMVOAA==", //30  
-      //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
+      //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30  
+      "Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
       "Root": "SzdxEgaJJ7tcTCrUl2zKsA==",
       "Password": "FVAPxztxpY4gJJKQ/se4bQ=="
     }
diff --git a/Backend/wwwroot/forgeDemo.html b/Backend/wwwroot/forgeDemo.html
index e9ee919..cf42e23 100644
--- a/Backend/wwwroot/forgeDemo.html
+++ b/Backend/wwwroot/forgeDemo.html
@@ -273,10 +273,10 @@
             //launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dmVnb29nemNhdmNia2l0aHl2bHJzdnJjdGg2dHR3eWgtMjAyMzAyX2libXMvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDJUU5JTlCJTk5JUU2JUE4JUExJUU1JUJDJThGK01FUCVFNiU4QiU4NiVFNyVCMyVCQiVFNyVCNSVCMV8lRTklOUIlQkIlRTYlQTIlQUYlRTclQjQlQjAlRTclQUYlODAlRTclODklODhfMDIyMi5ud2Q")
 
             // 0224 電梯 30
-            launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dmVnb29nemNhdmNia2l0aHl2bHJzdnJjdGg2dHR3eWgtMjAyMzAyX2libXMvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDJUU5JTlCJTk5JUU2JUE4JUExJUU1JUJDJThGK01FUCVFNiU4QiU4NiVFNyVCMyVCQiVFNyVCNSVCMV8lRTklOUIlQkIlRTYlQTIlQUYlRTclQjQlQjAlRTclQUYlODAlRTclODklODhfMDIyNC5ud2Q")
+            //launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dmVnb29nemNhdmNia2l0aHl2bHJzdnJjdGg2dHR3eWgtMjAyMzAyX2libXMvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDJUU5JTlCJTk5JUU2JUE4JUExJUU1JUJDJThGK01FUCVFNiU4QiU4NiVFNyVCMyVCQiVFNyVCNSVCMV8lRTklOUIlQkIlRTYlQTIlQUYlRTclQjQlQjAlRTclQUYlODAlRTclODklODhfMDIyNC5ud2Q")
 
             // 0221 WSP
-            //launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dmVnb29nemNhdmNia2l0aHl2bHJzdnJjdGg2dHR3eWgtMjAyMzAyX2libXMvQmFucWlhbyUyMFRhaXBlaSUyME1haW4lMjBPZmZpY2UtQUxMXzAyMjEubndk")
+            launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dmVnb29nemNhdmNia2l0aHl2bHJzdnJjdGg2dHR3eWgtMjAyMzAyX2libXMvQmFucWlhbyUyMFRhaXBlaSUyME1haW4lMjBPZmZpY2UtQUxMXzAyMjEubndk")
 
         });
         function move1Floor() {
@@ -408,8 +408,7 @@
         }
 
         function importDevCor() {
-
-            //console.log(tagIdDevList)
+            console.log("所有設備資料",tagIdDevList)
             ImportDevForCor();
             ImportForgeRoom();
         }
diff --git a/Frontend/_alert.html b/Frontend/_alert.html
index 934a073..a67c353 100644
--- a/Frontend/_alert.html
+++ b/Frontend/_alert.html
@@ -5,14 +5,26 @@
 			<div class="row bg-dark p-2">
 				<div class="col-auto">
 					<div class="btn-group">
-						<button id="returnFalse" onclick="setReturn(false)" type="button" class="btn btn-secondary waves-effect waves-themed">未復歸</button>
-						<button id="returnTrue" onclick="setReturn(true)" type="button" class="btn btn-secondary waves-effect waves-themed">已復歸</button>
+						<button id="returnFalse" onclick="setReturn(false)" type="button"
+								class="btn btn-secondary waves-effect waves-themed">
+							未復歸
+						</button>
+						<button id="returnTrue" onclick="setReturn(true)" type="button"
+								class="btn btn-secondary waves-effect waves-themed">
+							已復歸
+						</button>
 					</div>
 				</div>
 				<div class="col-auto">
 					<div class="btn-group">
-						<button id="unconfirmed" onclick="setConfirm(false)" type="button" class="btn btn-secondary waves-effect waves-themed">未確認</button>
-						<button id="confirmed" onclick="setConfirm(true)" type="button" class="btn btn-secondary waves-effect waves-themed">已確認</button>
+						<button id="unconfirmed" onclick="setConfirm(false)" type="button"
+								class="btn btn-secondary waves-effect waves-themed">
+							未確認
+						</button>
+						<button id="confirmed" onclick="setConfirm(true)" type="button"
+								class="btn btn-secondary waves-effect waves-themed">
+							已確認
+						</button>
 					</div>
 				</div>
 				<div class="col-auto">
@@ -20,12 +32,14 @@
 				</div>
 				<div class="col-auto">
 					<div class="form-group">
-						<input class="form-control" id="alr_startdate" data-val="" type="date" name="alr_startdate" value="" style="cursor: pointer">
+						<input class="form-control" id="alr_startdate" data-val="" type="date" name="alr_startdate" value=""
+							   style="cursor: pointer">
 					</div>
 				</div>
 				<div class="col-auto">
 					<div class="form-group">
-						<input class="form-control" id="alr_enddate" data-val="" type="date" name="alr_enddate" value="" style="cursor: pointer">
+						<input class="form-control" id="alr_enddate" data-val="" type="date" name="alr_enddate" value=""
+							   style="cursor: pointer">
 					</div>
 				</div>
 				<hr>
@@ -48,9 +62,9 @@
 				</div>
 			</div>
 			<!--<div class="row bg-dark p-2 align-items-center" id="alr_mainList">
-			</div>
-			<div class="row bg-dark p-2 mb-5 align-items-center" id="alr_subList">
-			</div>-->
+					</div>
+					<div class="row bg-dark p-2 mb-5 align-items-center" id="alr_subList">
+					</div>-->
 
 			<div>
 				<div class="frame-wrap">
@@ -63,7 +77,8 @@
 </main>
 
 <!-- Modal center 保養/維修 -->
-<div class="modal fade" id="alr_opeRecModal" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static" data-keyboard="false">
+<div class="modal fade" id="alr_opeRecModal" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static"
+	 data-keyboard="false">
 	<div class="modal-dialog modal-dialog-centered" role="document">
 		<div class="modal-content">
 			<div class="modal-header">
@@ -156,7 +171,8 @@
 						<div class="col-md-12">
 							<div class="form-group">
 								<label class="form-label" for="inpDescription">結果描述</label>
-								<textarea class="form-control" type="text" id="inpDescription" name="inpDescription" rows="7"></textarea>
+								<textarea class="form-control" type="text" id="inpDescription" name="inpDescription"
+										  rows="7"></textarea>
 							</div>
 						</div>
 						<div class="col-md-12">
@@ -226,11 +242,12 @@
 			pageAct.SysType = null;
 		});
 
-		$('input[type=checkbox][data-type=sub]').on('click', function () {
+		$('input[type=checkbox][data-type=sub]').on('click', function (e) {
 			if (!pageAct.selAllSysSub) {
 				// console.log(this);
 				pageAct.selAllSysSub = true;
 
+
 				$.each($('input[type=checkbox][data-type=sub]:checked'), function (i, v) {
 					$(v).click();
 				});
@@ -559,6 +576,10 @@
 					}
 				});
 			});
+			subStrHtml += `<div class="custom-control custom-checkbox custom-control-inline" data-main="other">
+									<input type="checkbox" class="custom-control-input" data-type="sub" id="other">
+									<label class="custom-control-label" for="other">其他</label>
+								</div>`
 			if (pageAct.mainStatus) {
 				$('#alr_mainList').html(mainStrHtml);
 				$('#alr_subList').html(subStrHtml);
@@ -616,6 +637,11 @@
 		}
 		else {
 			let elem = $('input[type=checkbox][data-type=sub]:checked');
+			if (elem[0]?.id === "other") {
+				console.log(elem[0]?.id)
+				getOtherAlarmByBaja(new Date(pageAct.alr_startdate).getTime(), enddate, pageAct.return, pageAct.confirm, callBackFromAllDeviceAlert);
+				return
+			}
 			pageAct.selSysMain = $(elem).parent().data('main');
 			pageAct.selSysSub = $(elem).prop('id');
 			getAlarmByBaja(new Date(pageAct.alr_startdate).getTime(), enddate, pageAct.return, pageAct.confirm, pageAct.selSysMain + "_" + pageAct.selSysSub + "_AlarmClass", callBackFromOneDeviceAlert);
diff --git a/Frontend/_dashboard.html b/Frontend/_dashboard.html
index ad91f37..f50eb2b 100644
--- a/Frontend/_dashboard.html
+++ b/Frontend/_dashboard.html
@@ -2,10 +2,10 @@
     <div class="row">
         <div class="col-sm-12 col-xl-4 poisition-relative">
             <!-- <img src="img/clouds.png" class="img-fluid" style="min-height: 520px;"> -->
-            <!-- <div id="forgeViewer" class="position-absolute" style="width:96%;height:96%;"></div> -->
-            <video playsInline autoPlay muted>
+            <div id="forgeViewer" class="position-absolute" style="width:96%;height:96%;"></div>
+            <!-- <video playsInline autoPlay muted>
                 <source src="./media/video/TEST_RENDER.mp4" type="video/mp4" />
-            </video>
+            </video> -->
 
         </div>
         <div class="col-sm-12 col-xl-4">
@@ -302,7 +302,7 @@
                             <button name="topFunBtn" data-page="alert" type="button" class="btn btn-secondary col-4 d-flex jusity-content-center">
                                 <img src="${iconObj.iconClass}" class="w-100"></img>
                                 </button>
-                            <button id="sysSubCardBtn${obj.subSys}" type="button" class="btn btn-secondary" data-id="${obj.subSys}" style="font-size: 24px">${obj.text}</button>
+                            <button id="sysSubCardBtn${obj.subSys}" type="button" class="btn btn-secondary" data-id="${obj.subSys}" style="font-size: 20px">${obj.text}</button>
                         </div>`;
                 $("#sysSubBtnList").append(strHtml);
             }
@@ -333,7 +333,7 @@
                             <button name="topFunBtn" data-page="alert" type="button" class="btn btn-secondary col-4">
                                 <img src="${iconClass}" class="w-100 "></img>
                                 </button>
-                            <button id="sysSubCardBtn${subSysObj.sub_system_tag}" type="button" class="btn btn-secondary" data-id="${subSysObj.sub_system_tag}"  style="font-size: 24px">${subSysObj.full_name}</button>
+                            <button id="sysSubCardBtn${subSysObj.sub_system_tag}" type="button" class="btn btn-secondary" data-id="${subSysObj.sub_system_tag}"  style="font-size: 20px">${subSysObj.full_name}</button>
                         </div>`;
                     })
                 })
@@ -461,10 +461,10 @@
                     }
                 }).then(res => res.json())
                 .then(data => {
-                    console.log(data.data)
+                    console.log(allAlarmCount)
                     const { finish, notfinish } = data.data
                     chartWorOrdFin([finish, notfinish]); // 已完成 未完成
-                    chartWorOrdErr([finish + notfinish, allAlarmCount - (finish + notfinish)]);
+                    chartWorOrdErr([allAlarmCount - (finish + notfinish), finish + notfinish]);
                 })
 
         })
diff --git a/Frontend/gif/B_white.gif b/Frontend/gif/B_white.gif
new file mode 100644
index 0000000..160ff28
Binary files /dev/null and b/Frontend/gif/B_white.gif differ
diff --git a/Frontend/gif/B_white.png b/Frontend/gif/B_white.png
new file mode 100644
index 0000000..dc7a822
Binary files /dev/null and b/Frontend/gif/B_white.png differ
diff --git a/Frontend/gif/CA_white.gif b/Frontend/gif/CA_white.gif
new file mode 100644
index 0000000..a3c4a08
Binary files /dev/null and b/Frontend/gif/CA_white.gif differ
diff --git a/Frontend/gif/CA_white.png b/Frontend/gif/CA_white.png
new file mode 100644
index 0000000..ef37f92
Binary files /dev/null and b/Frontend/gif/CA_white.png differ
diff --git a/Frontend/gif/C_white.gif b/Frontend/gif/C_white.gif
new file mode 100644
index 0000000..c7f8b72
Binary files /dev/null and b/Frontend/gif/C_white.gif differ
diff --git a/Frontend/gif/C_white.png b/Frontend/gif/C_white.png
new file mode 100644
index 0000000..aa07fec
Binary files /dev/null and b/Frontend/gif/C_white.png differ
diff --git a/Frontend/gif/E1_white.gif b/Frontend/gif/E1_white.gif
new file mode 100644
index 0000000..3a2cab2
Binary files /dev/null and b/Frontend/gif/E1_white.gif differ
diff --git a/Frontend/gif/E1_white.png b/Frontend/gif/E1_white.png
new file mode 100644
index 0000000..d434aa5
Binary files /dev/null and b/Frontend/gif/E1_white.png differ
diff --git a/Frontend/gif/E2_white.gif b/Frontend/gif/E2_white.gif
new file mode 100644
index 0000000..b5316b3
Binary files /dev/null and b/Frontend/gif/E2_white.gif differ
diff --git a/Frontend/gif/E2_white.png b/Frontend/gif/E2_white.png
new file mode 100644
index 0000000..edf9ee6
Binary files /dev/null and b/Frontend/gif/E2_white.png differ
diff --git a/Frontend/gif/E3_white.gif b/Frontend/gif/E3_white.gif
new file mode 100644
index 0000000..d1b4949
Binary files /dev/null and b/Frontend/gif/E3_white.gif differ
diff --git a/Frontend/gif/E3_white.png b/Frontend/gif/E3_white.png
new file mode 100644
index 0000000..70dcf6d
Binary files /dev/null and b/Frontend/gif/E3_white.png differ
diff --git a/Frontend/gif/E4-1_white.gif b/Frontend/gif/E4-1_white.gif
new file mode 100644
index 0000000..4eb78c2
Binary files /dev/null and b/Frontend/gif/E4-1_white.gif differ
diff --git a/Frontend/gif/E4-1_white.png b/Frontend/gif/E4-1_white.png
new file mode 100644
index 0000000..5dc30f7
Binary files /dev/null and b/Frontend/gif/E4-1_white.png differ
diff --git a/Frontend/gif/E4-2_white.gif b/Frontend/gif/E4-2_white.gif
new file mode 100644
index 0000000..cb67d5d
Binary files /dev/null and b/Frontend/gif/E4-2_white.gif differ
diff --git a/Frontend/gif/E4-2_white.png b/Frontend/gif/E4-2_white.png
new file mode 100644
index 0000000..a8e9ed2
Binary files /dev/null and b/Frontend/gif/E4-2_white.png differ
diff --git a/Frontend/gif/E5_white.gif b/Frontend/gif/E5_white.gif
new file mode 100644
index 0000000..0a41a9c
Binary files /dev/null and b/Frontend/gif/E5_white.gif differ
diff --git a/Frontend/gif/E5_white.png b/Frontend/gif/E5_white.png
new file mode 100644
index 0000000..c73a7c6
Binary files /dev/null and b/Frontend/gif/E5_white.png differ
diff --git a/Frontend/gif/EL_white.gif b/Frontend/gif/EL_white.gif
new file mode 100644
index 0000000..8d805ab
Binary files /dev/null and b/Frontend/gif/EL_white.gif differ
diff --git a/Frontend/gif/EL_white.png b/Frontend/gif/EL_white.png
new file mode 100644
index 0000000..accba6c
Binary files /dev/null and b/Frontend/gif/EL_white.png differ
diff --git a/Frontend/gif/ES_white.gif b/Frontend/gif/ES_white.gif
new file mode 100644
index 0000000..aed0ee8
Binary files /dev/null and b/Frontend/gif/ES_white.gif differ
diff --git a/Frontend/gif/ES_white.png b/Frontend/gif/ES_white.png
new file mode 100644
index 0000000..b2fb438
Binary files /dev/null and b/Frontend/gif/ES_white.png differ
diff --git a/Frontend/gif/F1_white.gif b/Frontend/gif/F1_white.gif
new file mode 100644
index 0000000..d199fe5
Binary files /dev/null and b/Frontend/gif/F1_white.gif differ
diff --git a/Frontend/gif/F1_white.png b/Frontend/gif/F1_white.png
new file mode 100644
index 0000000..58877ce
Binary files /dev/null and b/Frontend/gif/F1_white.png differ
diff --git a/Frontend/gif/F3_white.gif b/Frontend/gif/F3_white.gif
new file mode 100644
index 0000000..0db48ed
Binary files /dev/null and b/Frontend/gif/F3_white.gif differ
diff --git a/Frontend/gif/F3_white.png b/Frontend/gif/F3_white.png
new file mode 100644
index 0000000..15f1fc3
Binary files /dev/null and b/Frontend/gif/F3_white.png differ
diff --git a/Frontend/gif/F4_white.gif b/Frontend/gif/F4_white.gif
new file mode 100644
index 0000000..869d191
Binary files /dev/null and b/Frontend/gif/F4_white.gif differ
diff --git a/Frontend/gif/F4_white.png b/Frontend/gif/F4_white.png
new file mode 100644
index 0000000..deeb68d
Binary files /dev/null and b/Frontend/gif/F4_white.png differ
diff --git a/Frontend/gif/IC_white.gif b/Frontend/gif/IC_white.gif
new file mode 100644
index 0000000..3a406a0
Binary files /dev/null and b/Frontend/gif/IC_white.gif differ
diff --git a/Frontend/gif/IC_white.png b/Frontend/gif/IC_white.png
new file mode 100644
index 0000000..168bfea
Binary files /dev/null and b/Frontend/gif/IC_white.png differ
diff --git a/Frontend/gif/IR_white.gif b/Frontend/gif/IR_white.gif
new file mode 100644
index 0000000..e071032
Binary files /dev/null and b/Frontend/gif/IR_white.gif differ
diff --git a/Frontend/gif/IR_white.png b/Frontend/gif/IR_white.png
new file mode 100644
index 0000000..b3a9c8d
Binary files /dev/null and b/Frontend/gif/IR_white.png differ
diff --git a/Frontend/gif/L1_white.gif b/Frontend/gif/L1_white.gif
new file mode 100644
index 0000000..06bd63c
Binary files /dev/null and b/Frontend/gif/L1_white.gif differ
diff --git a/Frontend/gif/L1_white.png b/Frontend/gif/L1_white.png
new file mode 100644
index 0000000..c94f5ab
Binary files /dev/null and b/Frontend/gif/L1_white.png differ
diff --git a/Frontend/gif/L2_white.gif b/Frontend/gif/L2_white.gif
new file mode 100644
index 0000000..51974b5
Binary files /dev/null and b/Frontend/gif/L2_white.gif differ
diff --git a/Frontend/gif/L2_white.png b/Frontend/gif/L2_white.png
new file mode 100644
index 0000000..82884af
Binary files /dev/null and b/Frontend/gif/L2_white.png differ
diff --git a/Frontend/gif/M10_white.gif b/Frontend/gif/M10_white.gif
new file mode 100644
index 0000000..761cd30
Binary files /dev/null and b/Frontend/gif/M10_white.gif differ
diff --git a/Frontend/gif/M10_white.png b/Frontend/gif/M10_white.png
new file mode 100644
index 0000000..4c5c799
Binary files /dev/null and b/Frontend/gif/M10_white.png differ
diff --git a/Frontend/gif/M11_white.gif b/Frontend/gif/M11_white.gif
new file mode 100644
index 0000000..11ece4e
Binary files /dev/null and b/Frontend/gif/M11_white.gif differ
diff --git a/Frontend/gif/M11_white.png b/Frontend/gif/M11_white.png
new file mode 100644
index 0000000..a8d264f
Binary files /dev/null and b/Frontend/gif/M11_white.png differ
diff --git a/Frontend/gif/M12_white.gif b/Frontend/gif/M12_white.gif
new file mode 100644
index 0000000..59cf1af
Binary files /dev/null and b/Frontend/gif/M12_white.gif differ
diff --git a/Frontend/gif/M12_white.png b/Frontend/gif/M12_white.png
new file mode 100644
index 0000000..7cc50d4
Binary files /dev/null and b/Frontend/gif/M12_white.png differ
diff --git a/Frontend/gif/M13_white.gif b/Frontend/gif/M13_white.gif
new file mode 100644
index 0000000..4dde53a
Binary files /dev/null and b/Frontend/gif/M13_white.gif differ
diff --git a/Frontend/gif/M13_white.png b/Frontend/gif/M13_white.png
new file mode 100644
index 0000000..94cb2ac
Binary files /dev/null and b/Frontend/gif/M13_white.png differ
diff --git a/Frontend/gif/M1_White.gif b/Frontend/gif/M1_White.gif
new file mode 100644
index 0000000..070c0a8
Binary files /dev/null and b/Frontend/gif/M1_White.gif differ
diff --git a/Frontend/gif/M1_White.png b/Frontend/gif/M1_White.png
new file mode 100644
index 0000000..4f6cf25
Binary files /dev/null and b/Frontend/gif/M1_White.png differ
diff --git a/Frontend/gif/M2_white.gif b/Frontend/gif/M2_white.gif
new file mode 100644
index 0000000..982f236
Binary files /dev/null and b/Frontend/gif/M2_white.gif differ
diff --git a/Frontend/gif/M2_white.png b/Frontend/gif/M2_white.png
new file mode 100644
index 0000000..fbb674c
Binary files /dev/null and b/Frontend/gif/M2_white.png differ
diff --git a/Frontend/gif/M5-1_white.gif b/Frontend/gif/M5-1_white.gif
new file mode 100644
index 0000000..d26bf9d
Binary files /dev/null and b/Frontend/gif/M5-1_white.gif differ
diff --git a/Frontend/gif/M5-1_white.png b/Frontend/gif/M5-1_white.png
new file mode 100644
index 0000000..f8561cc
Binary files /dev/null and b/Frontend/gif/M5-1_white.png differ
diff --git a/Frontend/gif/M5-2_white.gif b/Frontend/gif/M5-2_white.gif
new file mode 100644
index 0000000..e3f5d3b
Binary files /dev/null and b/Frontend/gif/M5-2_white.gif differ
diff --git a/Frontend/gif/M5-2_white.png b/Frontend/gif/M5-2_white.png
new file mode 100644
index 0000000..736489d
Binary files /dev/null and b/Frontend/gif/M5-2_white.png differ
diff --git a/Frontend/gif/M8_white.gif b/Frontend/gif/M8_white.gif
new file mode 100644
index 0000000..6a2e7a9
Binary files /dev/null and b/Frontend/gif/M8_white.gif differ
diff --git a/Frontend/gif/M8_white.png b/Frontend/gif/M8_white.png
new file mode 100644
index 0000000..f509702
Binary files /dev/null and b/Frontend/gif/M8_white.png differ
diff --git a/Frontend/gif/P1_white.gif b/Frontend/gif/P1_white.gif
new file mode 100644
index 0000000..07b4e4d
Binary files /dev/null and b/Frontend/gif/P1_white.gif differ
diff --git a/Frontend/gif/P1_white.png b/Frontend/gif/P1_white.png
new file mode 100644
index 0000000..b56f53d
Binary files /dev/null and b/Frontend/gif/P1_white.png differ
diff --git a/Frontend/gif/PF_white.png b/Frontend/gif/PF_white.png
new file mode 100644
index 0000000..1ae7758
Binary files /dev/null and b/Frontend/gif/PF_white.png differ
diff --git a/Frontend/gif/PIC_white.png b/Frontend/gif/PIC_white.png
new file mode 100644
index 0000000..776ad70
Binary files /dev/null and b/Frontend/gif/PIC_white.png differ
diff --git a/Frontend/gif/PSC_gray.gif b/Frontend/gif/PSC_gray.gif
new file mode 100644
index 0000000..fdb2daf
Binary files /dev/null and b/Frontend/gif/PSC_gray.gif differ
diff --git a/Frontend/gif/PSC_white.gif b/Frontend/gif/PSC_white.gif
new file mode 100644
index 0000000..5abfa01
Binary files /dev/null and b/Frontend/gif/PSC_white.gif differ
diff --git a/Frontend/gif/PSC_white.png b/Frontend/gif/PSC_white.png
new file mode 100644
index 0000000..85d0c31
Binary files /dev/null and b/Frontend/gif/PSC_white.png differ
diff --git a/Frontend/gif/P_white.gif b/Frontend/gif/P_white.gif
new file mode 100644
index 0000000..148ec00
Binary files /dev/null and b/Frontend/gif/P_white.gif differ
diff --git a/Frontend/gif/P_white.png b/Frontend/gif/P_white.png
new file mode 100644
index 0000000..7905866
Binary files /dev/null and b/Frontend/gif/P_white.png differ
diff --git a/Frontend/gif/R_white.png b/Frontend/gif/R_white.png
new file mode 100644
index 0000000..91c66e5
Binary files /dev/null and b/Frontend/gif/R_white.png differ
diff --git a/Frontend/gif/Red_gif/B_white.gif b/Frontend/gif/Red_gif/B_white.gif
new file mode 100644
index 0000000..160ff28
Binary files /dev/null and b/Frontend/gif/Red_gif/B_white.gif differ
diff --git a/Frontend/gif/Red_gif/CA_white.gif b/Frontend/gif/Red_gif/CA_white.gif
new file mode 100644
index 0000000..a3c4a08
Binary files /dev/null and b/Frontend/gif/Red_gif/CA_white.gif differ
diff --git a/Frontend/gif/Red_gif/C_white.gif b/Frontend/gif/Red_gif/C_white.gif
new file mode 100644
index 0000000..c7f8b72
Binary files /dev/null and b/Frontend/gif/Red_gif/C_white.gif differ
diff --git a/Frontend/gif/Red_gif/E1_white.gif b/Frontend/gif/Red_gif/E1_white.gif
new file mode 100644
index 0000000..3a2cab2
Binary files /dev/null and b/Frontend/gif/Red_gif/E1_white.gif differ
diff --git a/Frontend/gif/Red_gif/E2_white.gif b/Frontend/gif/Red_gif/E2_white.gif
new file mode 100644
index 0000000..b5316b3
Binary files /dev/null and b/Frontend/gif/Red_gif/E2_white.gif differ
diff --git a/Frontend/gif/Red_gif/E3_white.gif b/Frontend/gif/Red_gif/E3_white.gif
new file mode 100644
index 0000000..d1b4949
Binary files /dev/null and b/Frontend/gif/Red_gif/E3_white.gif differ
diff --git a/Frontend/gif/Red_gif/E4-1_white.gif b/Frontend/gif/Red_gif/E4-1_white.gif
new file mode 100644
index 0000000..4eb78c2
Binary files /dev/null and b/Frontend/gif/Red_gif/E4-1_white.gif differ
diff --git a/Frontend/gif/Red_gif/E4-2_white.gif b/Frontend/gif/Red_gif/E4-2_white.gif
new file mode 100644
index 0000000..cb67d5d
Binary files /dev/null and b/Frontend/gif/Red_gif/E4-2_white.gif differ
diff --git a/Frontend/gif/Red_gif/E5_white.gif b/Frontend/gif/Red_gif/E5_white.gif
new file mode 100644
index 0000000..0a41a9c
Binary files /dev/null and b/Frontend/gif/Red_gif/E5_white.gif differ
diff --git a/Frontend/gif/Red_gif/EL_white.gif b/Frontend/gif/Red_gif/EL_white.gif
new file mode 100644
index 0000000..8d805ab
Binary files /dev/null and b/Frontend/gif/Red_gif/EL_white.gif differ
diff --git a/Frontend/gif/Red_gif/ES_white.gif b/Frontend/gif/Red_gif/ES_white.gif
new file mode 100644
index 0000000..aed0ee8
Binary files /dev/null and b/Frontend/gif/Red_gif/ES_white.gif differ
diff --git a/Frontend/gif/Red_gif/F1_white.gif b/Frontend/gif/Red_gif/F1_white.gif
new file mode 100644
index 0000000..d199fe5
Binary files /dev/null and b/Frontend/gif/Red_gif/F1_white.gif differ
diff --git a/Frontend/gif/Red_gif/F3_white.gif b/Frontend/gif/Red_gif/F3_white.gif
new file mode 100644
index 0000000..0db48ed
Binary files /dev/null and b/Frontend/gif/Red_gif/F3_white.gif differ
diff --git a/Frontend/gif/Red_gif/F4_white.gif b/Frontend/gif/Red_gif/F4_white.gif
new file mode 100644
index 0000000..869d191
Binary files /dev/null and b/Frontend/gif/Red_gif/F4_white.gif differ
diff --git a/Frontend/gif/Red_gif/IC_white.gif b/Frontend/gif/Red_gif/IC_white.gif
new file mode 100644
index 0000000..3a406a0
Binary files /dev/null and b/Frontend/gif/Red_gif/IC_white.gif differ
diff --git a/Frontend/gif/Red_gif/IR_white.gif b/Frontend/gif/Red_gif/IR_white.gif
new file mode 100644
index 0000000..e071032
Binary files /dev/null and b/Frontend/gif/Red_gif/IR_white.gif differ
diff --git a/Frontend/gif/Red_gif/L1_white.gif b/Frontend/gif/Red_gif/L1_white.gif
new file mode 100644
index 0000000..06bd63c
Binary files /dev/null and b/Frontend/gif/Red_gif/L1_white.gif differ
diff --git a/Frontend/gif/Red_gif/L2_white.gif b/Frontend/gif/Red_gif/L2_white.gif
new file mode 100644
index 0000000..51974b5
Binary files /dev/null and b/Frontend/gif/Red_gif/L2_white.gif differ
diff --git a/Frontend/gif/Red_gif/M10_white.gif b/Frontend/gif/Red_gif/M10_white.gif
new file mode 100644
index 0000000..761cd30
Binary files /dev/null and b/Frontend/gif/Red_gif/M10_white.gif differ
diff --git a/Frontend/gif/Red_gif/M11_white.gif b/Frontend/gif/Red_gif/M11_white.gif
new file mode 100644
index 0000000..11ece4e
Binary files /dev/null and b/Frontend/gif/Red_gif/M11_white.gif differ
diff --git a/Frontend/gif/Red_gif/M12_white.gif b/Frontend/gif/Red_gif/M12_white.gif
new file mode 100644
index 0000000..59cf1af
Binary files /dev/null and b/Frontend/gif/Red_gif/M12_white.gif differ
diff --git a/Frontend/gif/Red_gif/M13_white.gif b/Frontend/gif/Red_gif/M13_white.gif
new file mode 100644
index 0000000..4dde53a
Binary files /dev/null and b/Frontend/gif/Red_gif/M13_white.gif differ
diff --git a/Frontend/gif/Red_gif/M1_White.gif b/Frontend/gif/Red_gif/M1_White.gif
new file mode 100644
index 0000000..070c0a8
Binary files /dev/null and b/Frontend/gif/Red_gif/M1_White.gif differ
diff --git a/Frontend/gif/Red_gif/M2_white.gif b/Frontend/gif/Red_gif/M2_white.gif
new file mode 100644
index 0000000..982f236
Binary files /dev/null and b/Frontend/gif/Red_gif/M2_white.gif differ
diff --git a/Frontend/gif/Red_gif/M5-1_white.gif b/Frontend/gif/Red_gif/M5-1_white.gif
new file mode 100644
index 0000000..d26bf9d
Binary files /dev/null and b/Frontend/gif/Red_gif/M5-1_white.gif differ
diff --git a/Frontend/gif/Red_gif/M5-2_white.gif b/Frontend/gif/Red_gif/M5-2_white.gif
new file mode 100644
index 0000000..e3f5d3b
Binary files /dev/null and b/Frontend/gif/Red_gif/M5-2_white.gif differ
diff --git a/Frontend/gif/Red_gif/M8_white.gif b/Frontend/gif/Red_gif/M8_white.gif
new file mode 100644
index 0000000..6a2e7a9
Binary files /dev/null and b/Frontend/gif/Red_gif/M8_white.gif differ
diff --git a/Frontend/gif/Red_gif/P1_white.gif b/Frontend/gif/Red_gif/P1_white.gif
new file mode 100644
index 0000000..07b4e4d
Binary files /dev/null and b/Frontend/gif/Red_gif/P1_white.gif differ
diff --git a/Frontend/gif/Red_gif/PSC_gray.gif b/Frontend/gif/Red_gif/PSC_gray.gif
new file mode 100644
index 0000000..fdb2daf
Binary files /dev/null and b/Frontend/gif/Red_gif/PSC_gray.gif differ
diff --git a/Frontend/gif/Red_gif/PSC_white.gif b/Frontend/gif/Red_gif/PSC_white.gif
new file mode 100644
index 0000000..5abfa01
Binary files /dev/null and b/Frontend/gif/Red_gif/PSC_white.gif differ
diff --git a/Frontend/gif/Red_gif/P_white.gif b/Frontend/gif/Red_gif/P_white.gif
new file mode 100644
index 0000000..148ec00
Binary files /dev/null and b/Frontend/gif/Red_gif/P_white.gif differ
diff --git a/Frontend/gif/Red_gif/W2.gif b/Frontend/gif/Red_gif/W2.gif
new file mode 100644
index 0000000..0f840b5
Binary files /dev/null and b/Frontend/gif/Red_gif/W2.gif differ
diff --git a/Frontend/gif/Red_gif/key-card_white.gif b/Frontend/gif/Red_gif/key-card_white.gif
new file mode 100644
index 0000000..ef02bc4
Binary files /dev/null and b/Frontend/gif/Red_gif/key-card_white.gif differ
diff --git a/Frontend/gif/Red_gif/solar-panel_white.gif b/Frontend/gif/Red_gif/solar-panel_white.gif
new file mode 100644
index 0000000..3b763f6
Binary files /dev/null and b/Frontend/gif/Red_gif/solar-panel_white.gif differ
diff --git a/Frontend/gif/Red_gif/sos_white.gif b/Frontend/gif/Red_gif/sos_white.gif
new file mode 100644
index 0000000..cac972a
Binary files /dev/null and b/Frontend/gif/Red_gif/sos_white.gif differ
diff --git a/Frontend/gif/SE_white.png b/Frontend/gif/SE_white.png
new file mode 100644
index 0000000..2185ae5
Binary files /dev/null and b/Frontend/gif/SE_white.png differ
diff --git a/Frontend/gif/W1_white.png b/Frontend/gif/W1_white.png
new file mode 100644
index 0000000..390fc40
Binary files /dev/null and b/Frontend/gif/W1_white.png differ
diff --git a/Frontend/gif/W2.gif b/Frontend/gif/W2.gif
new file mode 100644
index 0000000..0f840b5
Binary files /dev/null and b/Frontend/gif/W2.gif differ
diff --git a/Frontend/gif/W2_white.png b/Frontend/gif/W2_white.png
new file mode 100644
index 0000000..66930ba
Binary files /dev/null and b/Frontend/gif/W2_white.png differ
diff --git a/Frontend/gif/W3_white.png b/Frontend/gif/W3_white.png
new file mode 100644
index 0000000..c10f720
Binary files /dev/null and b/Frontend/gif/W3_white.png differ
diff --git a/Frontend/gif/W4_white.png b/Frontend/gif/W4_white.png
new file mode 100644
index 0000000..f208ee2
Binary files /dev/null and b/Frontend/gif/W4_white.png differ
diff --git a/Frontend/gif/W5_white.png b/Frontend/gif/W5_white.png
new file mode 100644
index 0000000..d862476
Binary files /dev/null and b/Frontend/gif/W5_white.png differ
diff --git a/Frontend/gif/key-card_white.gif b/Frontend/gif/key-card_white.gif
new file mode 100644
index 0000000..ef02bc4
Binary files /dev/null and b/Frontend/gif/key-card_white.gif differ
diff --git a/Frontend/gif/solar-panel_white.gif b/Frontend/gif/solar-panel_white.gif
new file mode 100644
index 0000000..3b763f6
Binary files /dev/null and b/Frontend/gif/solar-panel_white.gif differ
diff --git a/Frontend/gif/solar-panel_white.png b/Frontend/gif/solar-panel_white.png
new file mode 100644
index 0000000..05f97e5
Binary files /dev/null and b/Frontend/gif/solar-panel_white.png differ
diff --git a/Frontend/gif/sos_white.gif b/Frontend/gif/sos_white.gif
new file mode 100644
index 0000000..cac972a
Binary files /dev/null and b/Frontend/gif/sos_white.gif differ
diff --git a/Frontend/index.html b/Frontend/index.html
index 35ccd39..59e003a 100644
--- a/Frontend/index.html
+++ b/Frontend/index.html
@@ -803,8 +803,8 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
                         /*"lib/jquery-validation/dist/additional-methods.min",*/  /* 會影響 messages_zh_TW 文字呈現 */
                         "lib/jquery-validation/dist/localization/messages_zh_TW",
                         "lib/jquery-ui/jquery-ui.min",
-                        //"lib/chart.js_4.1.2/chart.umd",
-                        "lib/chart.js/chart.min",
+                        //"lib/chart.js_4.1.2/chart.umd", // B4
+                        "lib/chart.js/chart.min", // 本機
                         "lib/dropzone/dropzone-min",
                         "lib/jstree-master/jstree.min",
                         "lib/notifications/sweetalert2/sweetalert2.bundle",
diff --git a/Frontend/js/init.js b/Frontend/js/init.js
index 3f0b180..fff4e71 100644
--- a/Frontend/js/init.js
+++ b/Frontend/js/init.js
@@ -32,7 +32,7 @@ var common = {
 var objSendData = { Data: null };
 // Mitsubishi
 var initAreaTag = "TPE";
-var n4Sup = "Mitsubishi_Sup";
+var n4Sup = "Mitsubishi_JACE8000";
 // WSP
 //var initAreaTag = "NTPC";
 //var n4Sup = "Banqiao";
diff --git a/Frontend/js/n4js/alarmbaja.js b/Frontend/js/n4js/alarmbaja.js
index e8c49cd..a8b4bcb 100644
--- a/Frontend/js/n4js/alarmbaja.js
+++ b/Frontend/js/n4js/alarmbaja.js
@@ -366,7 +366,7 @@ function getCheckedAckedCountByBaja(callback) {
     var _index = 0;
 
     require(['baja!'], function (baja) {
-        baja.Ord.make("local:|foxs:|alarm:|bql:select ackState from openAlarms where ackState ='acked'").get()
+        baja.Ord.make("local:|foxs:|alarm:|bql:select ackState where ackState ='acked'").get()
             .then(function (table) {
                 return table.cursor({
                     each: function (record) {
@@ -394,7 +394,7 @@ function getUnCheckedAckedCountByBaja(callback) {
     var _index = 0;
 
     require(['baja!'], function (baja) {
-        baja.Ord.make("local:|foxs:|alarm:|bql:select ackState from openAlarms where ackState ='unacked'").get()
+        baja.Ord.make("local:|foxs:|alarm:|bql:select ackState where ackState ='unacked'").get()
             .then(function (table) {
                 return table.cursor({
                     each: function (record) {
@@ -532,8 +532,8 @@ function getOneDeviceAlarmByBaja(devicePath, callback) {
     var _index = 0;
 
     require(['baja!'], function (baja) {
-        /*    console.log("local:|foxs:|alarm:|bql:select timestamp, ackState, alarmClass, alarmClassDisplayName, alarmValue, alarmData, alarmData.sourceName, uuid, alarmData.msgText, alarmData.numericValue, alarmData.presentValue, alarmData.status, alarmData.toState, normalTime from openAlarms where alarmData.sourceName like '%" + devicePath + "%' order by timestamp desc");*/
-        baja.Ord.make("local:|foxs:|alarm:|bql:select timestamp, ackState, alarmClass, alarmClassDisplayName, alarmValue, alarmData, alarmData.sourceName, uuid, alarmData.msgText, alarmData.numericValue, alarmData.presentValue, alarmData.status, alarmData.toState, normalTime from openAlarms where alarmData.sourceName like '%" + devicePath + "%' order by timestamp desc").get()
+            console.log("local:|foxs:|alarm:|bql:select timestamp, ackState, alarmClass, alarmClassDisplayName, alarmValue, alarmData, alarmData.sourceName, uuid, alarmData.msgText, alarmData.numericValue, alarmData.presentValue, alarmData.status, alarmData.toState, normalTime where alarmData.sourceName like '%" + devicePath + "%' order by timestamp desc");
+        baja.Ord.make("local:|foxs:|alarm:|bql:select timestamp, ackState, alarmClass, alarmClassDisplayName, alarmValue, alarmData, alarmData.sourceName, uuid, alarmData.msgText, alarmData.numericValue, alarmData.presentValue, alarmData.status, alarmData.toState, normalTime where alarmData.sourceName like '%" + devicePath + "%' order by timestamp desc").get()
             .then(function (table) {
                 return table.cursor({
                     each: function (record) {
@@ -569,7 +569,7 @@ function getAllDeviceAlarmByBaja(startDate_millisecond, endDate_millisecond, isR
     if (startDate_millisecond) {
         startUrl = "timestamp.millis >= " + startDate_millisecond + " and ";
     }
-    //console.log("告警", "local:|foxs:|alarm:|bql:select timestamp, ackTime, priority ,ackState, alarmClass, alarmClassDisplayName, alarmValue, alarmData, alarmData.sourceName, uuid, alarmData.msgText, alarmData.numericValue, alarmData.presentValue, alarmData.status, alarmData.toState, normalTime where " + startUrl + "timestamp.millis <= " + endDate_millisecond + " and normalTime " + _recoverState + " and ackState " + _ackState + " order by timestamp desc");
+    console.log("告警", "local:|foxs:|alarm:|bql:select timestamp, ackTime, priority ,ackState, alarmClass, alarmClassDisplayName, alarmValue, alarmData, alarmData.sourceName, uuid, alarmData.msgText, alarmData.numericValue, alarmData.presentValue, alarmData.status, alarmData.toState, normalTime where " + startUrl + "timestamp.millis <= " + endDate_millisecond + " and normalTime " + _recoverState + " and ackState " + _ackState + " order by timestamp desc");
     require(['baja!'], function (baja) {
 
         baja.Ord.make("local:|foxs:|alarm:|bql:select timestamp, ackTime, priority ,ackState, alarmClass, alarmClassDisplayName, alarmValue, alarmData, alarmData.sourceName, uuid, alarmData.msgText, alarmData.numericValue, alarmData.presentValue, alarmData.status, alarmData.toState, normalTime where " + startUrl + "timestamp.millis <= " + endDate_millisecond + " and normalTime " + _recoverState + " and ackState " + _ackState + " order by timestamp desc").get()
@@ -690,7 +690,7 @@ function getAlarmForChartDataByBaja(callback) {
     var _index = 0;
 
     require(['baja!'], function (baja) {
-        baja.Ord.make("local:|foxs:|alarm:|bql:select alarmClass, ackState, normalTime where isAlarm").get()
+        baja.Ord.make("local:|foxs:|alarm:|bql:select *").get()
             .then(function (table) {
                 return table.cursor({
                     each: function (record) {
@@ -701,11 +701,11 @@ function getAlarmForChartDataByBaja(callback) {
                         _index++;
                     },
                     after: function () {
-                        _result += '{' + '"count": ' + _index + ', "data":[';
-                        _result += _ss;
-                        _result += ']}';
+                        //_result += '{' + '"count": ' + _index + ', "data":[';
+                        //_result += _ss;
+                        //_result += ']}';
                         if (typeof callback === 'function') {
-                            callback(_result);
+                            callback(_index);
                         }
                     },
                     limit: -1,