diff --git a/Backend/Startup.cs b/Backend/Startup.cs
index a85040b..b5b000e 100644
--- a/Backend/Startup.cs
+++ b/Backend/Startup.cs
@@ -170,12 +170,12 @@ namespace Backend
             );
             #endregion
 
-            #region 定時取得氣象API
-            services.AddSingleton<WeatherAPIJob>();
-            services.AddSingleton(
-            new JobSchedule(jobType: typeof(WeatherAPIJob), cronExpression: Configuration.GetValue<string>("BackgroundServiceCron:WeatherAPIJob"))
-            );
-            #endregion
+            //#region 定時取得氣象API
+            //services.AddSingleton<WeatherAPIJob>();
+            //services.AddSingleton(
+            //new JobSchedule(jobType: typeof(WeatherAPIJob), cronExpression: Configuration.GetValue<string>("BackgroundServiceCron:WeatherAPIJob"))
+            //);
+            //#endregion
 
             double loginExpireMinute = this.Configuration.GetValue<double>("LoginExpireMinute");
             services.AddSession(options =>
diff --git a/Frontend/_alert.html b/Frontend/_alert.html
index 7ca1713..1938618 100644
--- a/Frontend/_alert.html
+++ b/Frontend/_alert.html
@@ -89,7 +89,7 @@
 					<span aria-hidden="true"><i class="fal fa-times"></i></span>
 				</button>
 			</div>
-			<form id="opeRecForm">
+			<form id="alr_opeRecForm">
 				<div class="modal-body">
 					<div class="row">
 						<div class="col-md-6">
@@ -200,8 +200,8 @@
 					</div>
 				</div>
 				<div class="modal-footer">
-					<button type="button" class="btn btn-secondary" id="OpeRecCanBtn" data-dismiss="modal">������</button>
-					<button type="button" class="btn btn-primary" id="OpeRecSendBtn" e-prevent>��脣��</button>
+					<button type="button" class="btn btn-secondary" id="alr_OpeRecCanBtn" data-dismiss="modal">������</button>
+					<button type="button" class="btn btn-primary" id="alr_OpeRecSendBtn" e-prevent>��脣��</button>
 				</div>
 			</form>
 		</div>
@@ -218,7 +218,7 @@
 	pageAct.alrSelSysSub = [];
 	pageAct.selAllSysSub = false;
 	first = true;
-	let dataAlarm = [];
+	// let dataAlarm = [];
 	var historyTable = null;
 	var elemIndex = 0;
 	var index = 0;
@@ -386,8 +386,8 @@
 			$('#inpFixDoCode').val(alr_fixDoCode);
 		});
 
-		onEvent('click', '#OpeRecSendBtn', function () {
-			let form = $("#opeRecForm");
+		onEvent('click', '#alr_OpeRecSendBtn', function () {
+			let form = $("#alr_opeRecForm");
 			$(form).validate({
 				rules: {
 					inpWorTyp: { required: true },
@@ -441,7 +441,7 @@
 						} else {
 							//toast_ok(common.AddSuc);
 							//$("#opeFirmModal").modal("hide");
-							$("#OpeRecCanBtn").click();
+							$("#alr_OpeRecCanBtn").click();
 							getData();
 						}
 					}
diff --git a/Frontend/_graphManagement.html b/Frontend/_graphManagement.html
index 7207b36..ddbe838 100644
--- a/Frontend/_graphManagement.html
+++ b/Frontend/_graphManagement.html
@@ -144,6 +144,7 @@
     var uploadFiles = {};
     var curActGraid = 0;
     var cookies = new YourTeam.Utility.Cookie();
+    
     var token = cookies.get("JWT-Authorization");
     $(function () {
         initList();
@@ -335,17 +336,17 @@
         //uploader["graMyAsBuilt"][0].dropzone.removeAllFiles(true);
         //$("#graMyAsBuilt .dz-preview").remove();
     })
-
+    
     function getGraCatList(callback) {
-		let url = baseApiUrl + "/GraphManage/GraphManageTreeList";
+        let url = baseApiUrl + "/GraphManage/GraphManageTreeList";
 
         ytAjax = new YourTeam.Ajax(url, null, function (res) {
             if (!res || res.code != "0000" || !res.data) {
 
             } else {
-                res.data.forEach(x => x.parent = x.system_parent_id);
-                res.data.forEach(x => x.text = x.system_key);
-                res.data.forEach(x => x.parent = x.parent);
+                res.data.forEach(x => x.parent = x.parent_id);
+                res.data.forEach(x => x.text = x.name);
+                // res.data.forEach(x => x.parent = x.parent);
                 callback ? callback(res.data) : "";
             }
         }, null, "POST").send();
@@ -454,12 +455,12 @@
         })
         $("#graTree").on('create_node.jstree', function (e, data) {
             let main = {};
-            main.system_key = data.node.text;
-            main.system_parent_id = parseInt(data.node.parent);
+            main.name = data.node.text;
+            main.parent_id = parseInt(data.node.parent);
 
             objSendData.Data = main;
 
-            ytAjax = new YourTeam.Ajax(baseApiUrl + "/GraphManage/SaveVar", objSendData, function (res) {
+            ytAjax = new YourTeam.Ajax(baseApiUrl + "/GraphManage/SaveGraphManageTree", objSendData, function (res) {
                 if (!res || res.code != "0000") {
                     data.instance.delete_node(data.node);
                     toast_error(res.msg || common.SysErr);
@@ -475,10 +476,10 @@
             let main = {}
 
             main.id = parseInt(data.node.id);
-            main.system_key = data.node.text;
+            main.name = data.node.text;
 
             objSendData.Data = main;
-            ytAjax = new YourTeam.Ajax(baseApiUrl + "/GraphManage/EditVar", objSendData, function (res) {
+            ytAjax = new YourTeam.Ajax(baseApiUrl + "/GraphManage/EditGraphManageTree", objSendData, function (res) {
                 if (!res || res.code != "0000" || !res.data) {
                     toast_error(res.msg || common.SysErr);
                 } else {
@@ -495,7 +496,7 @@
             if (!isNaN(parseInt(data.node.id))) {
                 main.id = parseInt(data.node.id);
                 objSendData.Data = main;
-                ytAjax = new YourTeam.Ajax(baseApiUrl + "/GraphManage/DelVar", objSendData, function (res) {
+                ytAjax = new YourTeam.Ajax(baseApiUrl + "/GraphManage/DelGraphManageTree", objSendData, function (res) {
                     if (!res || res.code != "0000" || !res.data) {
                         toast_error(res.msg || common.SysErr);
                     } else {
diff --git a/Frontend/_sysMonAll.html b/Frontend/_sysMonAll.html
index dafebe2..24ce87e 100644
--- a/Frontend/_sysMonAll.html
+++ b/Frontend/_sysMonAll.html
@@ -1,8 +1,8 @@
 嚜�<style></style>
 
 <div class="row">
-    <div id="leftDiv" class="col-sm-12 col-xl-6"></div>
-    <div id="rightDiv" class="col-sm-12 col-xl-6"></div>
+  <div id="leftDiv" class="col-sm-12 col-xl-6"></div>
+  <div id="rightDiv" class="col-sm-12 col-xl-6"></div>
 </div>
 
 <!-- Modal center Add -->
@@ -13,906 +13,906 @@
      aria-hidden="true"
      data-backdrop="static"
      data-keyboard="false">
-    <div class="modal-dialog modal-dialog-centered"
-         role="document"
-         style="min-width: 60%">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title">�����扳��蝔�</h4>
-                <button type="button"
-                        class="close"
-                        data-dismiss="modal"
-                        aria-label="Close">
-                    <span aria-hidden="true"><i class="fal fa-times"></i></span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <!--<table id="lightSchTable" class="table table-bordered table-striped text-center m-0 w-100">
-                </table>-->
-                <div id="lightSchBlock" style="height: 60vh"></div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">
-                    ������
-                </button>
-                <button type="button" id="lightSchSavBtn" class="btn btn-primary">
-                    ��脣��
-                </button>
-            </div>
-        </div>
+  <div class="modal-dialog modal-dialog-centered"
+       role="document"
+       style="min-width: 60%">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">�����扳��蝔�</h4>
+        <button type="button"
+                class="close"
+                data-dismiss="modal"
+                aria-label="Close">
+          <span aria-hidden="true"><i class="fal fa-times"></i></span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <!--<table id="lightSchTable" class="table table-bordered table-striped text-center m-0 w-100">
+        </table>-->
+        <div id="lightSchBlock" style="height: 60vh"></div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">
+          ������
+        </button>
+        <button type="button" id="lightSchSavBtn" class="btn btn-primary">
+          ��脣��
+        </button>
+      </div>
     </div>
+  </div>
 </div>
 
 <script>
-    var allDevList = []; //��刻身���皜����
-    var alarmDbIdList = []; // 蝝������啣虜 forge ���暺�嚗���踹��暺���������啣虜憿���脰��蝒�
-    var subDeviceData = [];
-    var heatMap = null;
-    var buildMenuData = {};
-    var forgeInvType = null;
-    var forgeInvTypeDef = null;
+  var allDevList = []; //��刻身���皜����
+  var alarmDbIdList = []; // 蝝������啣虜 forge ���暺�嚗���踹��暺���������啣虜憿���脰��蝒�
+  var subDeviceData = [];
+  var heatMap = null;
+  var buildMenuData = {};
+  var forgeInvType = null;
+  var forgeInvTypeDef = null;
 
-    $(function () {
-        $(loadEle).Loading("start");
-        getBuildMenu((arr, data) => {
-            buildMenuData = data;
-            if (arr.indexOf(4) != -1) {
-                getFloDevList(arr[0] == 4 ? "left" : "right");
-                setLightColor();
-            }
-            if (arr.indexOf(3) != -1) {
-                getHotspotPoint(() => {
-                    show3DModel(data.urn_3D);
-                    getInviForge();
-                });
-            }
+  $(function () {
+    $(loadEle).Loading("start");
+    getBuildMenu((arr, data) => {
+      buildMenuData = data;
+      if (arr.indexOf(4) != -1) {
+        getFloDevList(arr[0] == 4 ? "left" : "right");
+        setLightColor();
+      }
+      if (arr.indexOf(3) != -1) {
+        getHotspotPoint(() => {
+          show3DModel(data.urn_3D);
+          getInviForge();
         });
+      }
     });
+  });
 
-    // 靘���� drawing type 瘙箏�������曄�恍��
-    function getHtmlByType(type = 0, data = {}) {
-        let strHtml = ``;
-        switch (type) {
-            case 2:
-                strHtml = `<div style="height:85vh">
+  // 靘���� drawing type 瘙箏�������曄�恍��
+  function getHtmlByType(type = 0, data = {}) {
+    let strHtml = ``;
+    switch (type) {
+      case 2:
+        strHtml = `<div style="height:85vh">
                                 <iframe src="${data.system_url}" width="100%" height="100%"></iframe>
                            </div>`;
-                break;
-            case 4:
-                strHtml = `<div class="d-flex mb-4" style="gap:15px">
+        break;
+      case 4:
+        strHtml = `<div class="d-flex mb-4" style="gap:15px">
                                 ${setTopLight()}
                             </div>
 
                             <div class="col-12 p-0" id="floDevList">
 
                             </div>`;
-                break;
-            case 3:
-                strHtml = `<div class="d-flex mb-4" style="position: relative; gap:15px">
+        break;
+      case 3:
+        strHtml = `<div class="d-flex mb-4" style="position: relative; gap:15px">
                                 <div name="forgeViewer" style="position: absolute;width: 100%;height:85vh;">
                                 ${setTopHeatBar()}
                                   </div>
                             </div>
                             `;
-                break;
+        break;
+    }
+
+    return strHtml;
+  }
+  //baja 閮���梯身���
+  function subDevice() {
+    let myBaja = new subscriptionDevices();
+    var ordPath = {
+      area_tag: pageAct.AreaTag,
+      building_tag: pageAct.buiTag,
+      system_tag: pageAct.sysMainTag,
+      name_tag: pageAct.sysSubTag,
+    };
+    myBaja.setSubscribeDevicesByBql(ordPath);
+
+    // �����梢�����
+    let lightOnHotColorArr = [];
+    let lightOffHotColorArr = [];
+    // ������������
+    let deviceNormalArr = [];
+    let deviceCloseArr = [];
+
+    myBaja.setSubscribeDevicesCallBack(function (data) {
+      console.log("subDevice ���憪�");
+      let matchDevice = allDevList.filter(
+        (x) => x.device_number == data.device_number_full
+      )[0];
+      if (!matchDevice) {
+        $(loadEle).Loading("close");
+        return false;
+      }
+
+      //撠�閮���勗�澆����� subDeviceData
+      if (
+        subDeviceData.findIndex(
+          (x) => x.device_number == matchDevice.device_number
+        ) == -1
+      ) {
+        let obj = {};
+        obj.device_number = matchDevice.device_number;
+        obj.dbid = matchDevice.forge_dbid;
+        subDeviceData.push(obj);
+      }
+
+      let subData = subDeviceData.filter(
+        (x) => x.device_number == matchDevice.device_number
+      )[0];
+
+      if (subData) {
+        subData[data.point_name] = data.value;
+      }
+
+      // setForgeHotSpotColor(matchDevice);
+
+      let norDevPoiName = matchDevice.device_normal_point_name;
+      let cloDevPoiName = matchDevice.device_close_point_name;
+      let errDevPoiName = matchDevice.device_error_point_name;
+
+      if (data.point_name == "SSC" && pageAct.sysSubTag === "L1") {
+        const lightOn = data.value.includes("true");
+        setLightOpenOrClose(lightOn, matchDevice);
+        if (lightOn && matchDevice.spriteDbid) {
+          if (
+            !lightOnHotColorArr.some(
+              ({ spriteDbid }) => spriteDbid === matchDevice.spriteDbid
+            )
+          ) {
+            setLightValues(matchDevice.device_node_guid, 200, 0xe1cf18);
+            lightOnHotColorArr.push(matchDevice);
+          }
+          lightOffHotColorArr = lightOffHotColorArr.filter(
+            (light) => light.spriteDbid !== matchDevice.spriteDbid
+          );
+        } else if (matchDevice.spriteDbid) {
+          if (
+            !lightOffHotColorArr.some(
+              ({ spriteDbid }) => spriteDbid === matchDevice.spriteDbid
+            )
+          ) {
+            setLightValues(matchDevice.device_node_guid, 0, 0xffffff);
+            lightOffHotColorArr.push(matchDevice);
+          }
+          lightOnHotColorArr = lightOnHotColorArr.filter(
+            (light) => light.spriteDbid !== matchDevice.spriteDbid
+          );
         }
+      }
 
-        return strHtml;
-    }
-    //baja 閮���梯身���
-    function subDevice() {
-        let myBaja = new subscriptionDevices();
-        var ordPath = {
-            area_tag: pageAct.AreaTag,
-            building_tag: pageAct.buiTag,
-            system_tag: pageAct.sysMainTag,
-            name_tag: pageAct.sysSubTag,
-        };
-        myBaja.setSubscribeDevicesByBql(ordPath);
-
-        // �����梢�����
-        let lightOnHotColorArr = [];
-        let lightOffHotColorArr = [];
-        // ������������
-        let deviceNormalArr = [];
-        let deviceCloseArr = [];
-
-        myBaja.setSubscribeDevicesCallBack(function (data) {
-            console.log("subDevice ���憪�");
-            let matchDevice = allDevList.filter(
-                (x) => x.device_number == data.device_number_full
-            )[0];
-            if (!matchDevice) {
-                $(loadEle).Loading("close");
-                return false;
-            }
-
-            //撠�閮���勗�澆����� subDeviceData
-            if (
-                subDeviceData.findIndex(
-                    (x) => x.device_number == matchDevice.device_number
-                ) == -1
-            ) {
-                let obj = {};
-                obj.device_number = matchDevice.device_number;
-                obj.dbid = matchDevice.forge_dbid;
-                subDeviceData.push(obj);
-            }
-
-            let subData = subDeviceData.filter(
-                (x) => x.device_number == matchDevice.device_number
-            )[0];
-
-            if (subData) {
-                subData[data.point_name] = data.value;
-            }
-
-            // setForgeHotSpotColor(matchDevice);
-
-            let norDevPoiName = matchDevice.device_normal_point_name;
-            let cloDevPoiName = matchDevice.device_close_point_name;
-            let errDevPoiName = matchDevice.device_error_point_name;
-
-            if (data.point_name == "SSC" && pageAct.sysSubTag === "L1") {
-                const lightOn = data.value.includes("true");
-                setLightOpenOrClose(lightOn, matchDevice);
-                if (lightOn && matchDevice.spriteDbid) {
-                    if (
-                        !lightOnHotColorArr.some(
-                            ({ spriteDbid }) => spriteDbid === matchDevice.spriteDbid
-                        )
-                    ) {
-                        setLightValues(matchDevice.device_node_guid, 200, 0xe1cf18);
-                        lightOnHotColorArr.push(matchDevice);
-                    }
-                    lightOffHotColorArr = lightOffHotColorArr.filter(
-                        (light) => light.spriteDbid !== matchDevice.spriteDbid
-                    );
-                } else if (matchDevice.spriteDbid) {
-                    if (
-                        !lightOffHotColorArr.some(
-                            ({ spriteDbid }) => spriteDbid === matchDevice.spriteDbid
-                        )
-                    ) {
-                        setLightValues(matchDevice.device_node_guid, 0, 0xffffff);
-                        lightOffHotColorArr.push(matchDevice);
-                    }
-                    lightOnHotColorArr = lightOnHotColorArr.filter(
-                        (light) => light.spriteDbid !== matchDevice.spriteDbid
-                    );
-                }
-            }
-
-            if (data.point_name == "Temp") {
-                heatMap?.changeTemp(
-                    data.device_number_full,
-                    !isNaN(parseInt(data.value)) ? parseInt(data.value) : 0
-                );
-                let devIdx = allDevList.findIndex(
-                    (x) => x.device_number == data.device_number_full
-                );
-                allDevList[devIdx]._temp = !isNaN(parseInt(data.value))
-                    ? parseInt(data.value)
-                    : 0;
-            }
-
-            if (
-                data.point_name == norDevPoiName &&
-                data.value == matchDevice.device_normal_point_value &&
-                !deviceNormalArr.some(
-                    ({ device_number }) => device_number === matchDevice.device_number
-                )
-            ) {
-                //憿舐內甇�撣貊�����
-                $(`#${matchDevice.device_number}_status`)
-                    .attr("data-light-type", "normal")
-                    .data("light-type", "normal");
-
-                deviceNormalArr.push(matchDevice);
-                deviceCloseArr = deviceCloseArr.filter(
-                    (device) => device.spriteDbid !== matchDevice.spriteDbid
-                );
-            } else if (
-                data.point_name == cloDevPoiName &&
-                data.value == matchDevice.device_close_point_value &&
-                !deviceCloseArr.some(
-                    ({ device_number }) => device_number === matchDevice.device_number
-                )
-            ) {
-                $(`#${matchDevice.device_number}_status`)
-                    .attr("data-light-type", "close")
-                    .data("light-type", "close");
-
-                deviceCloseArr.push(matchDevice);
-                deviceNormalArr = deviceNormalArr.filter(
-                    (device) => device.spriteDbid !== matchDevice.spriteDbid
-                );
-            }
-
-            if (
-                data.point_name == errDevPoiName &&
-                data.value == matchDevice.device_error_point_value &&
-                !alarmDbIdList.some(
-                    (device) => device.device_number === matchDevice.device_number
-                )
-            ) {
-                $(`#${matchDevice.device_number}_status`)
-                    .attr("data-light-error-type", "error")
-                    .data("light-error-type", "error");
-
-                alarmDbIdList.push(matchDevice);
-            } else if (
-                data.point_name == errDevPoiName &&
-                data.value !== matchDevice.device_error_point_value
-            ) {
-                $(`#${matchDevice.device_number}_status`)
-                    .attr("data-light-error-type", "")
-                    .data("light-error-type", "");
-                alarmDbIdList = alarmDbIdList.filter(
-                    (device) => device.device_number !== matchDevice.device_number
-                );
-            }
-
-            if (
-                deviceCloseArr.length === 0 &&
-                alarmDbIdList.some(
-                    (device) => device.device_number === matchDevice.device_number
-                )
-            ) {
-                $(`#${matchDevice.device_number}_status`)
-                    .attr("data-light-type", "error")
-                    .data("light-type", "error");
-            }
-
-            if (
-                (!pageAct.floTag &&
-                    allDevList.length ===
-                    deviceNormalArr.length + deviceCloseArr.length) ||
-                allDevList.length === deviceNormalArr.length + alarmDbIdList.length
-            ) {
-                changeColorForHotspot(
-                    deviceNormalArr.map(({ spriteDbid }) => spriteDbid),
-                    null,
-                    true
-                );
-                changeColorForHotspot(
-                    deviceCloseArr.map(({ spriteDbid }) => spriteDbid),
-                    null,
-                    false
-                );
-            }
-            changeColorForHotspot(
-                alarmDbIdList.map(({ spriteDbid }) => spriteDbid),
-                "error",
-                false
-            );
-            $(loadEle).Loading("close");
-
-            setLightColor();
-            lightDevForgeSpotLig(matchDevice);
-            // 敺�閮剖��閮���望�湔�唳�����閮剖����∠����單��暺�雿�
-            setDevItemPoiValBySub(data);
-        });
-
-        myBaja.setSubscribeDeviceEndCallBack(function (data) {
-            endPageLoading();
-            if (data.findIndex((x) => x.point_name == "CO2") != -1) {
-                // 憿舐內皞怠漲璇�
-                showHeatCO2("[name=forgeHeatBar]");
-            } else if (data.findIndex((x) => x.point_name == "Temp" || x.point_name == "TEMP") != -1) {
-                // 憿舐內皞怠漲璇�
-                showHeat("[name=forgeHeatBar]");
-            }
-        });
-    }
-
-    function lightDevForgeSpotLig(devObj) { }
-
-    // 敺�閮剖��閮���望�湔�唳�����閮剖����∠����單��暺�雿�
-    function setDevItemPoiValBySub(data) {
-        let pointSpan = $(
-            `.card.device-wrap[data-number=${data.device_number_full}] span[name=devItemPoiVal]`
+      if (data.point_name == "Temp") {
+        heatMap?.changeTemp(
+          data.device_number_full,
+          !isNaN(parseInt(data.value)) ? parseInt(data.value) : 0
         );
-        if (pointSpan && pointSpan.data("point") == data.point_name) {
-            // console.log(data)
-            pointSpan.text(data.value);
-        }
-    }
+        let devIdx = allDevList.findIndex(
+          (x) => x.device_number == data.device_number_full
+        );
+        allDevList[devIdx]._temp = !isNaN(parseInt(data.value))
+          ? parseInt(data.value)
+          : 0;
+      }
 
-    /* function setLightColor() {
-      $("[data-light-type]").each((index, ele) => {
-        let type = $(ele).data("light-type");
-        let isFlashing = false;
-        let color = "#000";
-        switch (type) {
-          case "normal":
-            color =
-              pageAct.sysSubObj.device_normal_color ?? "var(--theme-success)";
-            isFlashing = pageAct.sysSubObj.device_normal_flashing == "1";
-            break;
-          case "close":
-            color =
-              pageAct.sysSubObj.device_close_color ?? "var(--theme-secondary)";
-            isFlashing = pageAct.sysSubObj.device_close_flashing == "1";
-            break;
-          case "error":
-            color = pageAct.sysSubObj.device_error_color ?? "var(--theme-danger)";
-            isFlashing = pageAct.sysSubObj.device_error_flashing == "1";
-            break;
-        }
-        $(ele).css("background-color", color);
-        //��臬�阡�����
-        if (isFlashing) {
-          $(ele).parents(".card.device-wrap").addClass("light-flash");
+      if (
+        data.point_name == norDevPoiName &&
+        (data.value == matchDevice.device_normal_point_value || norDevPoiName === errDevPoiName) &&
+        !deviceNormalArr.some(
+          ({ device_number }) => device_number === matchDevice.device_number
+        )
+      ) {
+        //憿舐內甇�撣貊�����
+        $(`#${matchDevice.device_number}_status`)
+          .attr("data-light-type", "normal")
+          .data("light-type", "normal");
+
+        deviceNormalArr.push(matchDevice);
+        deviceCloseArr = deviceCloseArr.filter(
+          (device) => device.spriteDbid !== matchDevice.spriteDbid
+        );
+      } else if (
+        data.point_name == cloDevPoiName &&
+        data.value == matchDevice.device_close_point_value &&
+        !deviceCloseArr.some(
+          ({ device_number }) => device_number === matchDevice.device_number
+        )
+      ) {
+        $(`#${matchDevice.device_number}_status`)
+          .attr("data-light-type", "close")
+          .data("light-type", "close");
+
+        deviceCloseArr.push(matchDevice);
+        deviceNormalArr = deviceNormalArr.filter(
+          (device) => device.spriteDbid !== matchDevice.spriteDbid
+        );
+      }
+
+      if (
+        data.point_name == errDevPoiName &&
+        data.value == matchDevice.device_error_point_value &&
+        !alarmDbIdList.some(
+          (device) => device.device_number === matchDevice.device_number
+        )
+      ) {
+        $(`#${matchDevice.device_number}_status`)
+          .attr("data-light-error-type", "error")
+          .data("light-error-type", "error");
+
+        alarmDbIdList.push(matchDevice);
+      } else if (
+        data.point_name == errDevPoiName &&
+        data.value !== matchDevice.device_error_point_value
+      ) {
+        $(`#${matchDevice.device_number}_status`)
+          .attr("data-light-error-type", "")
+          .data("light-error-type", "");
+        alarmDbIdList = alarmDbIdList.filter(
+          (device) => device.device_number !== matchDevice.device_number
+        );
+      }
+
+      if (
+        deviceCloseArr.length === 0 &&
+        alarmDbIdList.some(
+          (device) => device.device_number === matchDevice.device_number
+        )
+      ) {
+        $(`#${matchDevice.device_number}_status`)
+          .attr("data-light-type", "error")
+          .data("light-type", "error");
+      }
+
+      if (
+        (!pageAct.floTag &&
+          allDevList.length ===
+          deviceNormalArr.length + deviceCloseArr.length) ||
+        allDevList.length === deviceNormalArr.length + alarmDbIdList.length
+      ) {
+        changeColorForHotspot(
+          deviceNormalArr.map(({ spriteDbid }) => spriteDbid),
+          null,
+          true
+        );
+        changeColorForHotspot(
+          deviceCloseArr.map(({ spriteDbid }) => spriteDbid),
+          null,
+          false
+        );
+      }
+      changeColorForHotspot(
+        alarmDbIdList.map(({ spriteDbid }) => spriteDbid),
+        "error",
+        false
+      );
+      $(loadEle).Loading("close");
+
+      setLightColor();
+      lightDevForgeSpotLig(matchDevice);
+      // 敺�閮剖��閮���望�湔�唳�����閮剖����∠����單��暺�雿�
+      setDevItemPoiValBySub(data);
+    });
+
+    myBaja.setSubscribeDeviceEndCallBack(function (data) {
+      endPageLoading();
+      if (data.findIndex((x) => x.point_name == "CO2") != -1) {
+        // 憿舐內皞怠漲璇�
+        showHeatCO2("[name=forgeHeatBar]");
+      } else if (data.findIndex((x) => x.point_name == "Temp" || x.point_name == "TEMP") != -1) {
+        // 憿舐內皞怠漲璇�
+        showHeat("[name=forgeHeatBar]");
+      }
+    });
+  }
+
+  function lightDevForgeSpotLig(devObj) { }
+
+  // 敺�閮剖��閮���望�湔�唳�����閮剖����∠����單��暺�雿�
+  function setDevItemPoiValBySub(data) {
+    let pointSpan = $(
+      `.card.device-wrap[data-number=${data.device_number_full}] span[name=devItemPoiVal]`
+    );
+    if (pointSpan && pointSpan.data("point") == data.point_name) {
+      // console.log(data)
+      pointSpan.text(data.value);
+    }
+  }
+
+  /* function setLightColor() {
+    $("[data-light-type]").each((index, ele) => {
+      let type = $(ele).data("light-type");
+      let isFlashing = false;
+      let color = "#000";
+      switch (type) {
+        case "normal":
+          color =
+            pageAct.sysSubObj.device_normal_color ?? "var(--theme-success)";
+          isFlashing = pageAct.sysSubObj.device_normal_flashing == "1";
+          break;
+        case "close":
+          color =
+            pageAct.sysSubObj.device_close_color ?? "var(--theme-secondary)";
+          isFlashing = pageAct.sysSubObj.device_close_flashing == "1";
+          break;
+        case "error":
+          color = pageAct.sysSubObj.device_error_color ?? "var(--theme-danger)";
+          isFlashing = pageAct.sysSubObj.device_error_flashing == "1";
+          break;
+      }
+      $(ele).css("background-color", color);
+      //��臬�阡�����
+      if (isFlashing) {
+        $(ele).parents(".card.device-wrap").addClass("light-flash");
+      } else {
+        $(ele).parents(".card.device-wrap").removeClass("light-flash");
+      }
+    });
+  } */
+
+  function setLightSchBlcok(obj) {
+    let devNum = $(obj).parents(".device-wrap").data("number");
+    let devPath = devNum.replaceAll("_", "/");
+    let iframe = `<iframe src="/ord?station:%7Cslot:/${devPath}/Sch|view:?fullScreen=true" style="min-height:100px;width:100%;height:100%"></iframe>`;
+    $("#lightSchBlock").html(iframe);
+  }
+
+  // forge 3D ��啣虜暺�雿�霈�蝝����
+  function setForgeHotSpotColor(device) {
+    let subData = subDeviceData.filter(
+      (x) => x.device_number == device.device_number
+    )[0];
+    if (
+      subData &&
+      subData[device.device_error_point_name] ==
+      device.device_error_point_value &&
+      (!isNaN(parseInt(device.spriteDbid)) || !isNaN(parseInt(device._dbId)))
+    ) {
+      const _dbId = parseInt(device.spriteDbid) || parseInt(device._dbId);
+      alarmDbIdList = [...alarmDbIdList, _dbId];
+      // console.log("��啣虜", _dbId)
+      changeColorForHotspot(_dbId, "error");
+    } else if (
+      subData &&
+      subData[device.device_error_point_name] !==
+      device.device_error_point_value &&
+      (!isNaN(parseInt(device.spriteDbid)) || !isNaN(parseInt(device._dbId)))
+    ) {
+      const _dbId = parseInt(device.spriteDbid) || parseInt(device._dbId);
+      let index = alarmDbIdList.findIndex((dbId) => dbId == _dbId);
+      index !== -1 && alarmDbIdList.splice(index, 1);
+    }
+  }
+
+  // ���敺����雿����暺�雿� (deviceItem)
+  function getRiserPoiObj() {
+    let tarDevItem = pageAct.devItems?.filter(
+      (x) => x.is_show_riserDiagram == 1
+    );
+    if (tarDevItem && tarDevItem[0]) {
+      return tarDevItem[0];
+    }
+    return null;
+  }
+
+  // ���敺�閮剖�����銵� 銝衣鼓鋆賢�∠��
+  function getFloDevList(position = "left") {
+    let url = baseApiUrl + "/api/Device/GetDeviceList";
+    let sendData = {
+      sub_system_tag: pageAct.sysSubTag,
+      building_tag: pageAct.buiTag,
+      floor_tag: pageAct.floTag,
+    };
+    objSendData.Data = sendData;
+    ytAjax = new YourTeam.Ajax(
+      url,
+      objSendData,
+      function (res) {
+        if (!res || res.code != "0000" || !res.data) {
         } else {
-          $(ele).parents(".card.device-wrap").removeClass("light-flash");
-        }
-      });
-    } */
-
-    function setLightSchBlcok(obj) {
-        let devNum = $(obj).parents(".device-wrap").data("number");
-        let devPath = devNum.replaceAll("_", "/");
-        let iframe = `<iframe src="/ord?station:%7Cslot:/${devPath}/Sch|view:?fullScreen=true" style="min-height:100px;width:100%;height:100%"></iframe>`;
-        $("#lightSchBlock").html(iframe);
-    }
-
-    // forge 3D ��啣虜暺�雿�霈�蝝����
-    function setForgeHotSpotColor(device) {
-        let subData = subDeviceData.filter(
-            (x) => x.device_number == device.device_number
-        )[0];
-        if (
-            subData &&
-            subData[device.device_error_point_name] ==
-            device.device_error_point_value &&
-            (!isNaN(parseInt(device.spriteDbid)) || !isNaN(parseInt(device._dbId)))
-        ) {
-            const _dbId = parseInt(device.spriteDbid) || parseInt(device._dbId);
-            alarmDbIdList = [...alarmDbIdList, _dbId];
-            // console.log("��啣虜", _dbId)
-            changeColorForHotspot(_dbId, "error");
-        } else if (
-            subData &&
-            subData[device.device_error_point_name] !==
-            device.device_error_point_value &&
-            (!isNaN(parseInt(device.spriteDbid)) || !isNaN(parseInt(device._dbId)))
-        ) {
-            const _dbId = parseInt(device.spriteDbid) || parseInt(device._dbId);
-            let index = alarmDbIdList.findIndex((dbId) => dbId == _dbId);
-            index !== -1 && alarmDbIdList.splice(index, 1);
-        }
-    }
-
-    // ���敺����雿����暺�雿� (deviceItem)
-    function getRiserPoiObj() {
-        let tarDevItem = pageAct.devItems?.filter(
-            (x) => x.is_show_riserDiagram == 1
-        );
-        if (tarDevItem && tarDevItem[0]) {
-            return tarDevItem[0];
-        }
-        return null;
-    }
-
-    // ���敺�閮剖�����銵� 銝衣鼓鋆賢�∠��
-    function getFloDevList(position = "left") {
-        let url = baseApiUrl + "/api/Device/GetDeviceList";
-        let sendData = {
-            sub_system_tag: pageAct.sysSubTag,
-            building_tag: pageAct.buiTag,
-            floor_tag: pageAct.floTag,
-        };
-        objSendData.Data = sendData;
-        ytAjax = new YourTeam.Ajax(
-            url,
-            objSendData,
-            function (res) {
-                if (!res || res.code != "0000" || !res.data) {
-                } else {
-                    let strHtml = ``;
-                    $.each(res.data, (index, floObj) => {
-                        strHtml += `<div class='d-flex justify-content-start mb-5'>`;
-                        strHtml += `<button id="floItemBtn${floObj.full_name}" type="button" class="btn btn-primary waves-effect waves-themed mr-5 mt-1 align-self-start" >${floObj.full_name}</button>`;
-                        strHtml += `<div class="col p-0 d-grid grid-gap-5 grid-temp-col-c" style="--c-grid-temp-col:repeat(auto-fill,minmax(250px,1fr))">`;
-                        $.each(floObj.device_list, (index2, devObj) => {
-                            allDevList.push(devObj);
-                            let devItem = getRiserPoiObj();
-                            strHtml += `<div class="card m-1 border device-wrap" data-number="${devObj.device_number
-                                }" data-position="${position}">
+          let strHtml = ``;
+          $.each(res.data, (index, floObj) => {
+            strHtml += `<div class='d-flex justify-content-start mb-5'>`;
+            strHtml += `<button id="floItemBtn${floObj.full_name}" type="button" class="btn btn-primary waves-effect waves-themed mr-5 mt-1 align-self-start" >${floObj.full_name}</button>`;
+            strHtml += `<div class="col p-0 d-grid grid-gap-5 grid-temp-col-c" style="--c-grid-temp-col:repeat(auto-fill,minmax(250px,1fr))">`;
+            $.each(floObj.device_list, (index2, devObj) => {
+              allDevList.push(devObj);
+              let devItem = getRiserPoiObj();
+              strHtml += `<div class="card m-1 border device-wrap" data-number="${devObj.device_number
+                }" data-position="${position}">
                                         <div class="card-body p-2">
                                             <div class="d-flex mb-2">
                                                 <div  class="mr-5 cur-poi">
                                                     <span class="d-inline-block mr-3">
                                                         <img src="${baseImgUrl +
-                                varPathDevIcon +
-                                devObj.device_image
-                                }" class="profile-image rounded-circle" onerror="defDev(this)" alt="...">
+                varPathDevIcon +
+                devObj.device_image
+                }" class="profile-image rounded-circle" onerror="defDev(this)" alt="...">
                                                     </span>
                                                     <a name="devItemName" data-number="${devObj.device_number
-                                }" href="javascript:;">${devObj.full_name
-                                }</a>
+                }" href="javascript:;">${devObj.full_name
+                }</a>
                                                 </div>
                                             </div>
                                         <div class="d-flex mb-0 mt-2 align-items-center">
                                                 <span id="${devObj.device_number
-                                }_status" class="circle-light"></span>
+                }_status" class="circle-light"></span>
                                                 <span class="${devItem ? "" : "d-none"
-                                } ml-2">${devItem?.full_name
-                                }嚗�<span name="devItemPoiVal" data-point="${devItem?.points
-                                }"></span>${devItem?.unit}</span>
+                } ml-2">${devItem?.full_name
+                }嚗�<span name="devItemPoiVal" data-point="${devItem?.points
+                }"></span>${devItem?.unit}</span>
                                                 <a href="javascript:;" name="devItem" data-id="${devObj.device_guid
-                                }" data-number="${devObj.device_number
-                                }" data-name="${devObj.full_name
-                                }" class=" ml-2 mb-0 " data-toggle="tooltip" title="暺�霈斤�� Tooltip">閰喟敦鞈����</a>
+                }" data-number="${devObj.device_number
+                }" data-name="${devObj.full_name
+                }" class=" ml-2 mb-0 " data-toggle="tooltip" title="暺�霈斤�� Tooltip">閰喟敦鞈����</a>
                                             </div>
                                         </div>
                                     </div>`;
-                        });
-                        strHtml += "</div></div>";
-                    });
-                    // Niagara ��Ｙ�� file �����剖��銝脣��憿�
-                    strHtml = strHtml.replaceAll(`src="/file/`, `src="`);
+            });
+            strHtml += "</div></div>";
+          });
+          // Niagara ��Ｙ�� file �����剖��銝脣��憿�
+          strHtml = strHtml.replaceAll(`src="/file/`, `src="`);
 
-                    if (!res.data || res.data.length == 0) {
-                        endPageLoading();
-                    } else {
-                        // 閮���� baja 閮剖��
-                        // if (pageAct.sysSubTag !== "L1" && pageAct.sysSubTag !== "M12") {
-                        //   subDevice();
-                        // }
-                    }
+          if (!res.data || res.data.length == 0) {
+            endPageLoading();
+          } else {
+            // 閮���� baja 閮剖��
+            // if (pageAct.sysSubTag !== "L1" && pageAct.sysSubTag !== "M12") {
+            //   subDevice();
+            // }
+          }
 
-                    // 蝜芾ˊ html
-                    $("#floDevList").append(strHtml);
+          // 蝜芾ˊ html
+          $("#floDevList").append(strHtml);
 
-                    // 摮���� device ��箸�祈�������喳��蝝� data 撅祆��
-                    $("#floDevList a[name=devItem]").each((idx, ele) => {
-                        if (
-                            allDevList.findIndex(
-                                (x) => x.device_number == $(ele).data("number")
-                            ) != -1
-                        ) {
-                            $(ele).data(
-                                "devobj",
-                                allDevList.filter(
-                                    (x) => x.device_number == $(ele).data("number")
-                                )[0]
-                            );
-                        }
-                    });
+          // 摮���� device ��箸�祈�������喳��蝝� data 撅祆��
+          $("#floDevList a[name=devItem]").each((idx, ele) => {
+            if (
+              allDevList.findIndex(
+                (x) => x.device_number == $(ele).data("number")
+              ) != -1
+            ) {
+              $(ele).data(
+                "devobj",
+                allDevList.filter(
+                  (x) => x.device_number == $(ele).data("number")
+                )[0]
+              );
+            }
+          });
 
-                    // ���憪���� pop 閬�蝒�
-                    initPopover();
-                    // ��∠��閮剖�����蝔梢�����鈭�隞�
-                    devItemNameEvent();
-                }
-            },
-            null,
-            "POST"
-        ).send();
-    }
+          // ���憪���� pop 閬�蝒�
+          initPopover();
+          // ��∠��閮剖�����蝔梢�����鈭�隞�
+          devItemNameEvent();
+        }
+      },
+      null,
+      "POST"
+    ).send();
+  }
 
-    function getBuildMenu(callback = null) {
-        let url = baseApiUrl + "/api/Device/GetBuildMenu";
-        let sendData = {
-            main_system_tag: pageAct.sysMainTag,
-            sub_system_tag: pageAct.sysSubTag,
-            building_tag: pageAct.buiTag,
-        };
-        objSendData.Data = sendData;
-        ytAjax = new YourTeam.Ajax(
-            url,
-            objSendData,
-            function (res) {
-                if (!res || res.code != "0000" || !res.data) {
-                } else {
-                    let leftData = {},
-                        rightData = {};
+  function getBuildMenu(callback = null) {
+    let url = baseApiUrl + "/api/Device/GetBuildMenu";
+    let sendData = {
+      main_system_tag: pageAct.sysMainTag,
+      sub_system_tag: pageAct.sysSubTag,
+      building_tag: pageAct.buiTag,
+    };
+    objSendData.Data = sendData;
+    ytAjax = new YourTeam.Ajax(
+      url,
+      objSendData,
+      function (res) {
+        if (!res || res.code != "0000" || !res.data) {
+        } else {
+          let leftData = {},
+            rightData = {};
 
-                    for (var key in res.data) {
-                        if (key.startsWith("left")) {
-                            leftData[key.split("left_")[1]] = res.data[key];
-                        } else if (key.startsWith("right")) {
-                            rightData[key.split("right_")[1]] = res.data[key];
-                        }
-                    }
+          for (var key in res.data) {
+            if (key.startsWith("left")) {
+              leftData[key.split("left_")[1]] = res.data[key];
+            } else if (key.startsWith("right")) {
+              rightData[key.split("right_")[1]] = res.data[key];
+            }
+          }
 
-                    if (res.data.left_drawing != null) {
-                        $("#leftDiv").html(getHtmlByType(res.data.left_drawing, leftData));
-                    } else {
-                        $("#leftDiv").html(getHtmlByType(0, leftData));
-                    }
-                    if (res.data.right_drawing != null) {
-                        $("#rightDiv").html(
-                            getHtmlByType(res.data.right_drawing),
-                            rightData
-                        );
-                    } else {
-                        $("#rightDiv").html(getHtmlByType(0, rightData));
-                    }
+          if (res.data.left_drawing != null) {
+            $("#leftDiv").html(getHtmlByType(res.data.left_drawing, leftData));
+          } else {
+            $("#leftDiv").html(getHtmlByType(0, leftData));
+          }
+          if (res.data.right_drawing != null) {
+            $("#rightDiv").html(
+              getHtmlByType(res.data.right_drawing),
+              rightData
+            );
+          } else {
+            $("#rightDiv").html(getHtmlByType(0, rightData));
+          }
 
-                    callback
-                        ? callback(
-                            [res.data.left_drawing, res.data.right_drawing],
-                            res.data
-                        )
-                        : "";
-                }
-            },
-            null,
-            "POST"
-        ).send();
-    }
+          callback
+            ? callback(
+              [res.data.left_drawing, res.data.right_drawing],
+              res.data
+            )
+            : "";
+        }
+      },
+      null,
+      "POST"
+    ).send();
+  }
 
-    // Card ��單��������
-    function drawStateTabBlo(devNum) {
-        let devPath = devNum.replaceAll("_", "/");
-        let position =
-            $(`.card.device-wrap[data-number=${devNum}]`).data("position") || "left";
-        let width = buildMenuData[position + "_icon_click_url_width"]
-            ? buildMenuData[position + "_icon_click_url_width"] + "px"
-            : "100%";
-        let height = buildMenuData[position + "_icon_click_url_height"]
-            ? buildMenuData[position + "_icon_click_url_height"] + "px"
-            : "100%";
-        let strHtml;
-        if (pageAct.sysSubTag == "C") {
-            strHtml = `<div style="width:${width};height:${height};">
+  // Card ��單��������
+  function drawStateTabBlo(devNum) {
+    let devPath = devNum.replaceAll("_", "/");
+    let position =
+      $(`.card.device-wrap[data-number=${devNum}]`).data("position") || "left";
+    let width = buildMenuData[position + "_icon_click_url_width"]
+      ? buildMenuData[position + "_icon_click_url_width"] + "px"
+      : "100%";
+    let height = buildMenuData[position + "_icon_click_url_height"]
+      ? buildMenuData[position + "_icon_click_url_height"] + "px"
+      : "100%";
+    let strHtml;
+    if (pageAct.sysSubTag == "C") {
+      strHtml = `<div style="width:${width};height:${height};">
                             <iframe src="./px/CCTV/TEST_RENDER.mp4" style="width:${width};height:${height};"></iframe>
                        </div>`;
-        } else {
-            strHtml = `<div style="width:${width};height:${height};">
+    } else {
+      strHtml = `<div style="width:${width};height:${height};">
                             <iframe src="/ord?station:%7Cslot:/${devPath}|view:?fullScreen=true" style="width:${width};height:${height};"></iframe>
                        </div>`;
+    }
+
+    return strHtml;
+  }
+
+  function iframeResize(obj) {
+    obj.style.height =
+      obj.contentWindow.document.documentElement.scrollHeight + "px";
+  }
+
+  function show3DModel(urn) {
+    launchViewerForHotspot(
+      urn,
+      (viewer, nodeIds) => {
+        // ��梯�� toolbar
+        document.querySelector("#guiviewer3d-toolbar").style.display = "none";
+        let devDbIds = allDevList.map((x) => x.forge_dbid);
+        // 憭折��
+        let subDevDbId = [];
+        allDevList.forEach(({ device_nodes }) => {
+          subDevDbId = [
+            ...subDevDbId,
+            ...device_nodes.map((n) => n.forge_dbid),
+          ];
+        });
+        // console.log(devDbIds, subDevDbId)
+        // 敺�鞈����摨怨身摰�銝���航��璅∪�����憿����嚗���交�����������閰脣��憿�銝���航��憿����嚗����憟���刻�����摨怨身摰����閮剝�����
+        if (forgeInvType) {
+          setInviForge(forgeInvType, [...devDbIds, ...subDevDbId]);
+        } else {
+          setInviForge(forgeInvTypeDef, [...devDbIds, ...subDevDbId]);
         }
 
-        return strHtml;
-    }
+        let sensorObjs = [];
+        let devices = [];
+        if (pageAct.sysSubTag === "M12") {
+          addHotPoint(viewer);
+          Forge3DSensor.sensorTimes = 0;
+          allDevList.forEach((device) => {
+            Forge3DSensor.sensorTimes++;
+            const sensorObj = new Forge3DSensor({
+              viewer: viewer,
+              ordPath: {
+                area_tag: pageAct.AreaTag,
+                building_tag: pageAct.buiTag,
+              },
+              selector: "[name=forgeViewer]",
+              elevCb: elevatorShow
+                ? () => {
+                  let elevOption = {
+                    selector: "[name=forgeViewer]",
+                    viewer: viewer,
+                    ordPath: {
+                      area_tag: pageAct.AreaTag,
+                      building_tag: pageAct.buiTag,
+                    },
+                    sensorObjs,
+                  };
 
-    function iframeResize(obj) {
-        obj.style.height =
-            obj.contentWindow.document.documentElement.scrollHeight + "px";
-    }
-
-    function show3DModel(urn) {
-        launchViewerForHotspot(
-            urn,
-            (viewer, nodeIds) => {
-                // ��梯�� toolbar
-                document.querySelector("#guiviewer3d-toolbar").style.display = "none";
-                let devDbIds = allDevList.map((x) => x.forge_dbid);
-                // 憭折��
-                let subDevDbId = [];
-                allDevList.forEach(({ device_nodes }) => {
-                    subDevDbId = [
-                        ...subDevDbId,
-                        ...device_nodes.map((n) => n.forge_dbid),
-                    ];
-                });
-                // console.log(devDbIds, subDevDbId)
-                // 敺�鞈����摨怨身摰�銝���航��璅∪�����憿����嚗���交�����������閰脣��憿�銝���航��憿����嚗����憟���刻�����摨怨身摰����閮剝�����
-                if (forgeInvType) {
-                    setInviForge(forgeInvType, [...devDbIds, ...subDevDbId]);
-                } else {
-                    setInviForge(forgeInvTypeDef, [...devDbIds, ...subDevDbId]);
-                }
-
-                let sensorObjs = [];
-                let devices = [];
-                if (pageAct.sysSubTag === "M12") {
-                    addHotPoint(viewer);
-                    Forge3DSensor.sensorTimes = 0;
-                    allDevList.forEach((device) => {
-                        Forge3DSensor.sensorTimes++;
-                        const sensorObj = new Forge3DSensor({
-                            viewer: viewer,
-                            ordPath: {
-                                area_tag: pageAct.AreaTag,
-                                building_tag: pageAct.buiTag,
-                            },
-                            selector: "[name=forgeViewer]",
-                            elevCb: elevatorShow
-                                ? () => {
-                                    let elevOption = {
-                                        selector: "[name=forgeViewer]",
-                                        viewer: viewer,
-                                        ordPath: {
-                                            area_tag: pageAct.AreaTag,
-                                            building_tag: pageAct.buiTag,
-                                        },
-                                        sensorObjs,
-                                    };
-
-                                    // ��餅０蝘餃��閮���梁��摨�頛����
-                                    let forge3DElev = new Forge3DElevFull(elevOption);
-                                    forge3DElev.bajaEndCallback = function () {
-                                        endPageLoading();
-                                    };
-                                    forge3DElev.init();
-                                }
-                                : null,
-                            curDevice: {
-                                ...device,
-                                roomDbId: !isNaN(parseInt(device.room_dbid))
-                                    ? parseInt(device.room_dbid)
-                                    : -1,
-                                id: device.device_number,
-                                position: isJSON(device.device_coordinate_3d)
-                                    ? JSON.parse(device.device_coordinate_3d)
-                                    : {}, // x: 0, y: 25, z: -2.5      (3.35, -4.81, 12.88
-                                temp: 25,
-                                forge_dbid: parseInt(device.forge_dbid),
-                            },
-                            deviceList: allDevList.map((d) => ({
-                                ...d,
-                                roomDbId: !isNaN(parseInt(d.room_dbid))
-                                    ? parseInt(d.room_dbid)
-                                    : -1,
-                                id: d.device_number,
-                                position: isJSON(d.device_coordinate_3d)
-                                    ? JSON.parse(d.device_coordinate_3d)
-                                    : {}, // x: 0, y: 25, z: -2.5      (3.35, -4.81, 12.88
-                                temp: 25,
-                                forge_dbid: parseInt(d.forge_dbid),
-                            })),
-                        });
-                        sensorObjs.push(sensorObj);
-                    });
-                } else {
-                    devices = allDevList.map((x) => {
-                        return {
-                            roomDbId: !isNaN(parseInt(x.room_dbid))
-                                ? parseInt(x.room_dbid)
-                                : -1,
-                            id: x.device_number,
-                            position: isJSON(x.device_coordinate_3d)
-                                ? JSON.parse(x.device_coordinate_3d)
-                                : {}, // x: 0, y: 25, z: -2.5      (3.35, -4.81, 12.88
-                            sensorTypes: ["temperature", "humidity"],
-                            temp: 30,
-                            forgeDbId: parseInt(x.forge_dbid),
-                        };
-                    });
-
-                    if (
-                        (pageAct.sysSubTag == "M12" || pageAct.sysSubTag == "ELEV") &&
-                        elevatorShow
-                    ) {
-                        let elevOption = {
-                            selector: "[name=forgeViewer]",
-                            viewer: viewer,
-                            ordPath: {
-                                area_tag: pageAct.AreaTag,
-                                building_tag: pageAct.buiTag,
-                            },
-                        };
-
-                        // ��餅０蝘餃��閮���梁��摨�頛����
-                        let forge3DElev = new Forge3DElevFull(elevOption);
-                        forge3DElev.bajaEndCallback = function () {
-                            endPageLoading();
-                        };
-                        forge3DElev.init();
-                    }
-                }
-
-                let option = {
-                    devices: devices,
-                };
-
-                if (pageAct.sysSubTag !== "M12") {
-                    // console.log(pageAct.sysSubTag, option)
-                    heatMap = new ADHeatMaps(option);
-                    heatMap.onComplete = () => {
-                        $.each(allDevList, (idx, dev) => {
-                            heatMap.changeTemp(dev.device_number, dev._temp || 0);
-                        });
-                        subDevice();
-                    };
-                }
-                if (subDeviceData.length != 0) {
-                    let stSubArr = subDeviceData.map((x) =>
-                        Object.keys(x)
-                            .filter((y) => y == "ST")
-                            .map((y) => x)
-                    );
-
-                    // for (let sub of stSubArr) {
-                    //   let matchDevice = allDevList.filter(
-                    //     (x) => x.device_number == sub[0]?.device_number
-                    //   )[0];
-                    //   if (matchDevice) {
-                    //     setForgeHotSpotColor(matchDevice);
-                    //   }
-                    // }
-                }
-                if (pageAct.sysSubTag == "W2") {
-                    // console.log("@@",pageAct, pageAct.sub_system_tag)
-                    getWaterNodeId(viewer);
-                } else if (pageAct.sysSubTag == "E1") {
-                    getE1NodeId(viewer);
-                }
-            },
-            () => { },
-            "[name=forgeViewer]"
-        );
-    }
-
-    // 靘�瘞渡頂蝯� - ���敺�甈脫����� dbid
-    function getWaterNodeId() {
-        // let url = baseApiUrl + "/api/Device/GetForgeNodeIdFromVar";
-        // let sendData = { forgeNodeKey: "water_wupply" };
-        // objSendData.Data = sendData;
-        // ytAjax = new YourTeam.Ajax(url, objSendData, function (res) {
-        //     if (!res || res.code != "0000" || !res.data) {
-
-        //     } else {
-        //         if (!isNaN(parseInt(res.data[0]?.system_value))) {
-        //             changeColor(parseInt(res.data[0]?.system_value))
-        //         }
-        //         console.log(res.data)
-        //     }
-        // }, null, "POST").send();
-        // console.log("1",viewer.model)
-        viewer.model.search(
-            "蝯行偌",
-            (nodeIds) => {
-                // console.log("2",nodeIds)
-                viewer.show(nodeIds);
-            },
-            (e) => {
-                console.log(e);
-            }
-        );
-    }
-
-    // 擃�憯������餌�斗�����
-    function getE1NodeId() {
-        viewer.model.search(
-            "擃�憯���餃��",
-            (nodeIds) => {
-                viewer.show(nodeIds);
-            },
-            (e) => {
-                console.log(e);
-            }
-        );
-    }
-
-    function getHotspotPoint(callback = null) {
-        let url = baseApiUrl + "/api/GetDevForCor";
-        let sendData = {
-            device_area_tag: pageAct.AreaTag,
-            device_building_tag: pageAct.buiTag,
-            device_system_tag: pageAct.sysMainTag,
-            device_name_tag: pageAct.sysSubTag,
-        };
-        objSendData.Data = sendData;
-        ytAjax = new YourTeam.Ajax(
-            url,
-            objSendData,
-            function (res) {
-                if (!res || res.code != "0000" || !res.data) {
-                } else {
-                    let myDataList = [];
-                    $.each(res.data, (idx, data) => {
-                        let item = {};
-                        item.position = {};
-                        if (
-                            data.device_coordinate_3d != null &&
-                            isJSON(data.device_coordinate_3d)
-                        ) {
-                            item.position = JSON.parse(data.device_coordinate_3d);
-                        }
-                        $.extend(item, data);
-                        myDataList.push(item);
-                    });
-                    setHotspotPoint(myDataList);
-                    if (pageAct.sysMainTag == "LT") {
-                        setLightPoint(myDataList);
-                    }
-                    callback ? callback() : "";
-                }
-            },
-            null,
-            "POST"
-        ).send();
-    }
-
-    function setHotspotPoint(myDataList = []) {
-        getHopspotPoint(myDataList);
-    }
-
-    function setLightPoint(myDataList = []) {
-        getLightData(myDataList);
-    }
-
-    // ���敺� 銝���航�� 3D 璅∪��憿����
-    function getInviForge() {
-        let url = baseApiUrl + "/api/Device/GetForgeInvType";
-
-        ytAjax = new YourTeam.Ajax(
-            url,
-            null,
-            function (res) {
-                if (!res || res.code != "0000" || !res.data) {
-                } else {
-                    let datas = res.data;
-
-                    forgeInvType = datas.filter(
-                        (x) => x.sub_system_tag == pageAct.sysSubTag
-                    )[0]?.invisible_value;
-                    forgeInvTypeDef = datas.filter(
-                        (x) => x.invisible_type == "default_value"
-                    )[0]?.invisible_value;
-                }
-            },
-            null,
-            "POST"
-        ).send();
-    }
-
-    // 閮剔蔭 璅∪����梯�����������
-    function setInviForge(type, devDbIds) {
-        if (type == "Hide") {
-            hideAllObjects(devDbIds);
-        } else if (type == "Opacity") {
-            setTransparentBuilding(0, devDbIds);
-        }
-    }
-
-    var parentEle = "";
-    onEvent("autodesk:click:sprite", "[name=forgeViewer]", function (e, obj) {
-        forgeUnFocusAll();
-        let rect = $("[name=forgeViewer]")[0].getBoundingClientRect();
-        let position = [rect.left + rect.width / 2, rect.top + rect.height / 3];
-        // let position = [obj.event.target.toolController.lastClickX - 300, obj.event.target.toolController.lastClickY - 300];
-        let devObj = obj.myData;
-        let name =
-            allDevList.filter((x) => x.device_guid == devObj.device_guid)[0]
-                ?.full_name || devObj.full_name;
-        devObj.full_name = name;
-        parentEle = crePosPopover(position, devObj);
-        $(parentEle).click();
-    });
-
-    onEvent("autodesk:clickOut:sprite", "[name=forgeViewer]", function (e) {
-        $(parentEle).YTTooltip("hide");
-    });
-
-    onEvent("autodesk:complete:sprite", "[name=forgeViewer]", function (e, obj) {
-        $("#floDevList a[name=devItem]").each((idx, ele) => {
-            let devNum = $(ele).data("number");
-            let dbid = obj.myDataList.filter((x) => x.device_number == devNum)[0]
-                ?._dbId;
-            allDevList.forEach((dev, idx) => {
-                if (dev.device_number == devNum) {
-                    dev.spriteDbid = dbid;
-                    // setForgeHotSpotColor(dev);
+                  // ��餅０蝘餃��閮���梁��摨�頛����
+                  let forge3DElev = new Forge3DElevFull(elevOption);
+                  forge3DElev.bajaEndCallback = function () {
+                    endPageLoading();
+                  };
+                  forge3DElev.init();
                 }
+                : null,
+              curDevice: {
+                ...device,
+                roomDbId: !isNaN(parseInt(device.room_dbid))
+                  ? parseInt(device.room_dbid)
+                  : -1,
+                id: device.device_number,
+                position: isJSON(device.device_coordinate_3d)
+                  ? JSON.parse(device.device_coordinate_3d)
+                  : {}, // x: 0, y: 25, z: -2.5      (3.35, -4.81, 12.88
+                temp: 25,
+                forge_dbid: parseInt(device.forge_dbid),
+              },
+              deviceList: allDevList.map((d) => ({
+                ...d,
+                roomDbId: !isNaN(parseInt(d.room_dbid))
+                  ? parseInt(d.room_dbid)
+                  : -1,
+                id: d.device_number,
+                position: isJSON(d.device_coordinate_3d)
+                  ? JSON.parse(d.device_coordinate_3d)
+                  : {}, // x: 0, y: 25, z: -2.5      (3.35, -4.81, 12.88
+                temp: 25,
+                forge_dbid: parseInt(d.forge_dbid),
+              })),
             });
-            $(ele).data("dbId", dbid);
-        });
-        if (pageAct.sysSubTag !== "L1" && pageAct.sysSubTag !== "M12") {
-            subDevice();
+            sensorObjs.push(sensorObj);
+          });
+        } else {
+          devices = allDevList.map((x) => {
+            return {
+              roomDbId: !isNaN(parseInt(x.room_dbid))
+                ? parseInt(x.room_dbid)
+                : -1,
+              id: x.device_number,
+              position: isJSON(x.device_coordinate_3d)
+                ? JSON.parse(x.device_coordinate_3d)
+                : {}, // x: 0, y: 25, z: -2.5      (3.35, -4.81, 12.88
+              sensorTypes: ["temperature", "humidity"],
+              temp: 30,
+              forgeDbId: parseInt(x.forge_dbid),
+            };
+          });
+
+          if (
+            (pageAct.sysSubTag == "M12" || pageAct.sysSubTag == "ELEV") &&
+            elevatorShow
+          ) {
+            let elevOption = {
+              selector: "[name=forgeViewer]",
+              viewer: viewer,
+              ordPath: {
+                area_tag: pageAct.AreaTag,
+                building_tag: pageAct.buiTag,
+              },
+            };
+
+            // ��餅０蝘餃��閮���梁��摨�頛����
+            let forge3DElev = new Forge3DElevFull(elevOption);
+            forge3DElev.bajaEndCallback = function () {
+              endPageLoading();
+            };
+            forge3DElev.init();
+          }
         }
-    });
 
-    onEvent("yt:tooltip:show", "[name=devItem]", function (e, obj) {
-        forgeUnFocusAll();
-    });
+        let option = {
+          devices: devices,
+        };
 
-    function forgeUnFocusAll() {
-        $("#floDevList a[name=devItem]").each((idx, ele) => {
-            const eleDbId = $(ele).data("dbId");
-            if (alarmDbIdList.some((dbId) => dbId == eleDbId)) {
-                changeScaleForHotspot(eleDbId, false);
-                return;
-            } else {
-                // 3D ��梢��閫����
-                controlFocusHotspot(eleDbId, false);
+        if (pageAct.sysSubTag !== "M12") {
+          // console.log(pageAct.sysSubTag, option)
+          heatMap = new ADHeatMaps(option);
+          heatMap.onComplete = () => {
+            $.each(allDevList, (idx, dev) => {
+              heatMap.changeTemp(dev.device_number, dev._temp || 0);
+            });
+            subDevice();
+          };
+        }
+        if (subDeviceData.length != 0) {
+          let stSubArr = subDeviceData.map((x) =>
+            Object.keys(x)
+              .filter((y) => y == "ST")
+              .map((y) => x)
+          );
+
+          // for (let sub of stSubArr) {
+          //   let matchDevice = allDevList.filter(
+          //     (x) => x.device_number == sub[0]?.device_number
+          //   )[0];
+          //   if (matchDevice) {
+          //     setForgeHotSpotColor(matchDevice);
+          //   }
+          // }
+        }
+        if (pageAct.sysSubTag == "W2") {
+          // console.log("@@",pageAct, pageAct.sub_system_tag)
+          getWaterNodeId(viewer);
+        } else if (pageAct.sysSubTag == "E1") {
+          getE1NodeId(viewer);
+        }
+      },
+      () => { },
+      "[name=forgeViewer]"
+    );
+  }
+
+  // 靘�瘞渡頂蝯� - ���敺�甈脫����� dbid
+  function getWaterNodeId() {
+    // let url = baseApiUrl + "/api/Device/GetForgeNodeIdFromVar";
+    // let sendData = { forgeNodeKey: "water_wupply" };
+    // objSendData.Data = sendData;
+    // ytAjax = new YourTeam.Ajax(url, objSendData, function (res) {
+    //     if (!res || res.code != "0000" || !res.data) {
+
+    //     } else {
+    //         if (!isNaN(parseInt(res.data[0]?.system_value))) {
+    //             changeColor(parseInt(res.data[0]?.system_value))
+    //         }
+    //         console.log(res.data)
+    //     }
+    // }, null, "POST").send();
+    // console.log("1",viewer.model)
+    viewer.model.search(
+      "蝯行偌",
+      (nodeIds) => {
+        // console.log("2",nodeIds)
+        viewer.show(nodeIds);
+      },
+      (e) => {
+        console.log(e);
+      }
+    );
+  }
+
+  // 擃�憯������餌�斗�����
+  function getE1NodeId() {
+    viewer.model.search(
+      "擃�憯���餃��",
+      (nodeIds) => {
+        viewer.show(nodeIds);
+      },
+      (e) => {
+        console.log(e);
+      }
+    );
+  }
+
+  function getHotspotPoint(callback = null) {
+    let url = baseApiUrl + "/api/GetDevForCor";
+    let sendData = {
+      device_area_tag: pageAct.AreaTag,
+      device_building_tag: pageAct.buiTag,
+      device_system_tag: pageAct.sysMainTag,
+      device_name_tag: pageAct.sysSubTag,
+    };
+    objSendData.Data = sendData;
+    ytAjax = new YourTeam.Ajax(
+      url,
+      objSendData,
+      function (res) {
+        if (!res || res.code != "0000" || !res.data) {
+        } else {
+          let myDataList = [];
+          $.each(res.data, (idx, data) => {
+            let item = {};
+            item.position = {};
+            if (
+              data.device_coordinate_3d != null &&
+              isJSON(data.device_coordinate_3d)
+            ) {
+              item.position = JSON.parse(data.device_coordinate_3d);
             }
-        });
+            $.extend(item, data);
+            myDataList.push(item);
+          });
+          setHotspotPoint(myDataList);
+          if (pageAct.sysMainTag == "LT") {
+            setLightPoint(myDataList);
+          }
+          callback ? callback() : "";
+        }
+      },
+      null,
+      "POST"
+    ).send();
+  }
+
+  function setHotspotPoint(myDataList = []) {
+    getHopspotPoint(myDataList);
+  }
+
+  function setLightPoint(myDataList = []) {
+    getLightData(myDataList);
+  }
+
+  // ���敺� 銝���航�� 3D 璅∪��憿����
+  function getInviForge() {
+    let url = baseApiUrl + "/api/Device/GetForgeInvType";
+
+    ytAjax = new YourTeam.Ajax(
+      url,
+      null,
+      function (res) {
+        if (!res || res.code != "0000" || !res.data) {
+        } else {
+          let datas = res.data;
+
+          forgeInvType = datas.filter(
+            (x) => x.sub_system_tag == pageAct.sysSubTag
+          )[0]?.invisible_value;
+          forgeInvTypeDef = datas.filter(
+            (x) => x.invisible_type == "default_value"
+          )[0]?.invisible_value;
+        }
+      },
+      null,
+      "POST"
+    ).send();
+  }
+
+  // 閮剔蔭 璅∪����梯�����������
+  function setInviForge(type, devDbIds) {
+    if (type == "Hide") {
+      hideAllObjects(devDbIds);
+    } else if (type == "Opacity") {
+      setTransparentBuilding(0, devDbIds);
     }
+  }
+
+  var parentEle = "";
+  onEvent("autodesk:click:sprite", "[name=forgeViewer]", function (e, obj) {
+    forgeUnFocusAll();
+    let rect = $("[name=forgeViewer]")[0].getBoundingClientRect();
+    let position = [rect.left + rect.width / 2, rect.top + rect.height / 3];
+    // let position = [obj.event.target.toolController.lastClickX - 300, obj.event.target.toolController.lastClickY - 300];
+    let devObj = obj.myData;
+    let name =
+      allDevList.filter((x) => x.device_guid == devObj.device_guid)[0]
+        ?.full_name || devObj.full_name;
+    devObj.full_name = name;
+    parentEle = crePosPopover(position, devObj);
+    $(parentEle).click();
+  });
+
+  onEvent("autodesk:clickOut:sprite", "[name=forgeViewer]", function (e) {
+    $(parentEle).YTTooltip("hide");
+  });
+
+  onEvent("autodesk:complete:sprite", "[name=forgeViewer]", function (e, obj) {
+    $("#floDevList a[name=devItem]").each((idx, ele) => {
+      let devNum = $(ele).data("number");
+      let dbid = obj.myDataList.filter((x) => x.device_number == devNum)[0]
+        ?._dbId;
+      allDevList.forEach((dev, idx) => {
+        if (dev.device_number == devNum) {
+          dev.spriteDbid = dbid;
+          // setForgeHotSpotColor(dev);
+        }
+      });
+      $(ele).data("dbId", dbid);
+    });
+    if (pageAct.sysSubTag !== "L1" && pageAct.sysSubTag !== "M12") {
+      subDevice();
+    }
+  });
+
+  onEvent("yt:tooltip:show", "[name=devItem]", function (e, obj) {
+    forgeUnFocusAll();
+  });
+
+  function forgeUnFocusAll() {
+    $("#floDevList a[name=devItem]").each((idx, ele) => {
+      const eleDbId = $(ele).data("dbId");
+      if (alarmDbIdList.some((dbId) => dbId == eleDbId)) {
+        changeScaleForHotspot(eleDbId, false);
+        return;
+      } else {
+        // 3D ��梢��閫����
+        controlFocusHotspot(eleDbId, false);
+      }
+    });
+  }
 </script>
diff --git a/Frontend/_sysMonFloor.html b/Frontend/_sysMonFloor.html
index ce8a580..c3365f3 100644
--- a/Frontend/_sysMonFloor.html
+++ b/Frontend/_sysMonFloor.html
@@ -1,7 +1,7 @@
 嚜�<style>
-    [id^="yt_tooltip"] {
-        min-width: 520px;
-    }
+  [id^="yt_tooltip"] {
+    min-width: 520px;
+  }
 </style>
 
 <!-- <div class="row m-0 mb-3">
@@ -15,1799 +15,1799 @@
   <div id="forgeViewer" class="position-absolute" style="width:96%;height:96%;"></div>
 </div> -->
 <div class="d-flex">
-    <div class="col-6 my-3">
-        <div id="floChart"
-             style="height: 100%; width: 100%; background-color: #fff"></div>
-    </div>
-    <div class="col-6 my-3">
-        <!-- <div id="forgeViewer" class="position-relative" style="height:100%">
-              <div id="forgeHeatBarDiv" class="d-flex mb-4 position-absolute" style="gap:15px">
-              </div>
-            </div> -->
-        <div id="forgeViewer" class="position-relative" style="height: 80vh">
-            <div id="forgeHeatBarDiv"
-                 class="d-flex mb-4 position-absolute"
-                 style="gap: 15px"></div>
-        </div>
+  <div class="col-6 my-3">
+    <div id="floChart"
+         style="height: 100%; width: 100%; background-color: #fff"></div>
+  </div>
+  <div class="col-6 my-3">
+    <!-- <div id="forgeViewer" class="position-relative" style="height:100%">
+          <div id="forgeHeatBarDiv" class="d-flex mb-4 position-absolute" style="gap:15px">
+          </div>
+        </div> -->
+    <div id="forgeViewer" class="position-relative" style="height: 80vh">
+      <div id="forgeHeatBarDiv"
+           class="d-flex mb-4 position-absolute"
+           style="gap: 15px"></div>
     </div>
+  </div>
 </div>
 
 <!--<script src="lib/echarts.min.js"></script>-->
 <script>
-    var floChart = null;
-    var currentData = [];
-    var heatMap = null;
-    var allDeviceRowData = []; //������閮剖�����憪�鞈����
-    var global_emergency_alarm_device_number = [];
-    var lightControl = "device"; // device 蝢斗�� node ������
-    var zoomToggle = 1.3;
-    $(function () {
-        $(loadEle).Loading("start");
-        alarmDbIdList = [];
-        $("#topLight").html(setTopLight());
-        setLightColor();
-        initChart();
-        getFloData();
-        drawHeatBar();
-        getHotspotPoint(() => {
-            show3DModel(pageAct.urn);
-        });
+  var floChart = null;
+  var currentData = [];
+  var heatMap = null;
+  var allDeviceRowData = []; //������閮剖�����憪�鞈����
+  var global_emergency_alarm_device_number = [];
+  var lightControl = "device"; // device 蝢斗�� node ������
+  var zoomToggle = 1.3;
+  $(function () {
+    $(loadEle).Loading("start");
+    alarmDbIdList = [];
+    $("#topLight").html(setTopLight());
+    setLightColor();
+    initChart();
+    getFloData();
+    drawHeatBar();
+    getHotspotPoint(() => {
+      show3DModel(pageAct.urn);
     });
+  });
 
-    onEvent("click", "#resChartZoom", function () {
-        floChart.setOption({
-            geo: {
-                center: null,
-                zoom: 1.2,
-            },
-        });
-        resetData();
+  onEvent("click", "#resChartZoom", function () {
+    floChart.setOption({
+      geo: {
+        center: null,
+        zoom: 1.2,
+      },
     });
+    resetData();
+  });
 
-    function getFloData() {
-        let url = baseApiUrl + "/api/Device/GetDeviceList";
-        let sendData = {
-            sub_system_tag: pageAct.sysSubTag,
-            building_tag: pageAct.buiTag,
-            floor_tag: pageAct.floTag,
-        };
-        objSendData.Data = sendData;
-        ytAjax = new YourTeam.Ajax(
-            url,
-            objSendData,
-            function (res) {
-                if (!res || res.code != "0000" || !res.data) {
-                } else {
-                    lightControl = res.module;
-                    chartHandler(
-                        `${baseImgUrl}/upload/floor_map/${res.data[0].floor_map_name}`
-                    );
-                    if (pageAct.sysSubTag === "L1") {
-                        let nodes = [];
-                        res.data[0].device_list.forEach((d) => {
-                            nodes = [...nodes, ...d.device_nodes];
-                        });
-                        getDevice([...nodes, ...res.data[0].device_list]);
-                    } else {
-                        getDevice(res.data[0].device_list);
-                    }
-                }
-            },
-            null,
-            "POST"
-        ).send();
-    }
-
-    function getDevice(devList) {
-        let selected_floor = devList[0];
-        //let selected_floor_objs = devList.filter(function (item) {
-        //    return item.floor_guid == selected_floor.floor_guid;
-        //});
-
-        //currentData = selected_floor_objs[0].device;
-
-        currentData = $.map(devList, function (item) {
-            //鞈����������
-            if (
-                selected_floor.device_number != undefined &&
-                selected_floor.device_number != null &&
-                selected_floor.device_number != "" &&
-                selected_floor.device_number == item.device_number
-            ) {
-                item.selected = true;
-            } else {
-                item.selected = false;
-            }
-            if (
-                item.device_coordinate != undefined &&
-                item.device_coordinate != null
-            ) {
-                var coordinate = item.device_coordinate.split(",");
-                item.value = [parseFloat(coordinate[0]), parseFloat(coordinate[1])];
-            }
-
-            if (
-                item.device_nodes != undefined &&
-                item.device_nodes != null &&
-                item.device_nodes.length > 0
-            ) {
-                if (item.device_master_number == selected_floor.device_master) {
-                    //var datatable_data = {
-                    //    device_full_name: item.full_name,
-                    //    device_number: item.device_number,
-                    //    device_master: item.device_master_number
-                    //}
-                    //datatable_data_list.push(datatable_data);
-
-                    $.map(item.device_nodes, function (item_node) {
-                        item_node.selected = false;
-                        if (
-                            item_node.device_node_coordinate != undefined &&
-                            item_node.device_node_coordinate != null
-                        ) {
-                            var node_coordinate = item_node.device_node_coordinate.split(",");
-                            item_node.value = [
-                                parseFloat(node_coordinate[0]),
-                                parseFloat(node_coordinate[1]),
-                            ];
-                        }
-                    });
-                } else {
-                    //var index = datatable_data_list.findIndex(x => x.device_number == item.device_number);
-                    //if (index < 0) {
-                    //    var datatable_data = {
-                    //        device_number: item.device_number,
-                    //        device_master: item.device_master_number
-                    //    }
-                    //    datatable_data_list.push(datatable_data);
-                    //}
-
-                    $.map(item.device_nodes, function (item_node) {
-                        item_node.selected = false;
-                        if (
-                            item_node.device_node_coordinate != undefined &&
-                            item_node.device_node_coordinate != null
-                        ) {
-                            var node_coordinate = item_node.device_node_coordinate.split(",");
-                            item_node.value = [
-                                parseFloat(node_coordinate[0]),
-                                parseFloat(node_coordinate[1]),
-                            ];
-                        }
-                    });
-                }
-            }
-            return item;
-        });
-        if (currentData == null || currentData.length == 0) {
-            currentData = [];
+  function getFloData() {
+    let url = baseApiUrl + "/api/Device/GetDeviceList";
+    let sendData = {
+      sub_system_tag: pageAct.sysSubTag,
+      building_tag: pageAct.buiTag,
+      floor_tag: pageAct.floTag,
+    };
+    objSendData.Data = sendData;
+    ytAjax = new YourTeam.Ajax(
+      url,
+      objSendData,
+      function (res) {
+        if (!res || res.code != "0000" || !res.data) {
+        } else {
+          lightControl = res.module;
+          chartHandler(
+            `${baseImgUrl}/upload/floor_map/${res.data[0].floor_map_name}`
+          );
+          if (pageAct.sysSubTag === "L1") {
+            let nodes = [];
+            res.data[0].device_list.forEach((d) => {
+              nodes = [...nodes, ...d.device_nodes];
+            });
+            getDevice([...nodes, ...res.data[0].device_list]);
+          } else {
+            getDevice(res.data[0].device_list);
+          }
         }
+      },
+      null,
+      "POST"
+    ).send();
+  }
 
-        // myBaja.setPrepareSubscribeDevices(currentData);
-        // myBaja.setCallBack(mySubscribeDevices);
+  function getDevice(devList) {
+    let selected_floor = devList[0];
+    //let selected_floor_objs = devList.filter(function (item) {
+    //    return item.floor_guid == selected_floor.floor_guid;
+    //});
 
-        //if (datatable_data_list.length > 0) {
-        //    $("#datatablediv").show();
-        //    dataTableDraw();
-        //} else {
-        //    $("#datatablediv").hide();
-        //}
-    }
+    //currentData = selected_floor_objs[0].device;
 
-    function initChart() {
-        let chartDom = $("#floChart")[0];
-        floChart = echarts.init(chartDom, null, { width: "auto" });
-    }
+    currentData = $.map(devList, function (item) {
+      //鞈����������
+      if (
+        selected_floor.device_number != undefined &&
+        selected_floor.device_number != null &&
+        selected_floor.device_number != "" &&
+        selected_floor.device_number == item.device_number
+      ) {
+        item.selected = true;
+      } else {
+        item.selected = false;
+      }
+      if (
+        item.device_coordinate != undefined &&
+        item.device_coordinate != null
+      ) {
+        var coordinate = item.device_coordinate.split(",");
+        item.value = [parseFloat(coordinate[0]), parseFloat(coordinate[1])];
+      }
 
-    function chartHandler(url) {
-        floChart.clear();
+      if (
+        item.device_nodes != undefined &&
+        item.device_nodes != null &&
+        item.device_nodes.length > 0
+      ) {
+        if (item.device_master_number == selected_floor.device_master) {
+          //var datatable_data = {
+          //    device_full_name: item.full_name,
+          //    device_number: item.device_number,
+          //    device_master: item.device_master_number
+          //}
+          //datatable_data_list.push(datatable_data);
 
-        $.get(url, function (svg) {
-            if (svg == undefined || svg == null) {
-                return;
+          $.map(item.device_nodes, function (item_node) {
+            item_node.selected = false;
+            if (
+              item_node.device_node_coordinate != undefined &&
+              item_node.device_node_coordinate != null
+            ) {
+              var node_coordinate = item_node.device_node_coordinate.split(",");
+              item_node.value = [
+                parseFloat(node_coordinate[0]),
+                parseFloat(node_coordinate[1]),
+              ];
             }
+          });
+        } else {
+          //var index = datatable_data_list.findIndex(x => x.device_number == item.device_number);
+          //if (index < 0) {
+          //    var datatable_data = {
+          //        device_number: item.device_number,
+          //        device_master: item.device_master_number
+          //    }
+          //    datatable_data_list.push(datatable_data);
+          //}
 
-            echarts.registerMap("floor_svg", { svg: svg });
+          $.map(item.device_nodes, function (item_node) {
+            item_node.selected = false;
+            if (
+              item_node.device_node_coordinate != undefined &&
+              item_node.device_node_coordinate != null
+            ) {
+              var node_coordinate = item_node.device_node_coordinate.split(",");
+              item_node.value = [
+                parseFloat(node_coordinate[0]),
+                parseFloat(node_coordinate[1]),
+              ];
+            }
+          });
+        }
+      }
+      return item;
+    });
+    if (currentData == null || currentData.length == 0) {
+      currentData = [];
+    }
 
-            option = {
-                // animationDurationUpdate: 1500,
-                tooltip: {
-                    formatter: function (params) {
-                        if (
-                            params.data.device_node_guid != undefined &&
-                            params.data.device_node_guid != null &&
-                            params.data.device_node_guid != ""
-                        ) {
-                            return `<div >
+    // myBaja.setPrepareSubscribeDevices(currentData);
+    // myBaja.setCallBack(mySubscribeDevices);
+
+    //if (datatable_data_list.length > 0) {
+    //    $("#datatablediv").show();
+    //    dataTableDraw();
+    //} else {
+    //    $("#datatablediv").hide();
+    //}
+  }
+
+  function initChart() {
+    let chartDom = $("#floChart")[0];
+    floChart = echarts.init(chartDom, null, { width: "auto" });
+  }
+
+  function chartHandler(url) {
+    floChart.clear();
+
+    $.get(url, function (svg) {
+      if (svg == undefined || svg == null) {
+        return;
+      }
+
+      echarts.registerMap("floor_svg", { svg: svg });
+
+      option = {
+        // animationDurationUpdate: 1500,
+        tooltip: {
+          formatter: function (params) {
+            if (
+              params.data.device_node_guid != undefined &&
+              params.data.device_node_guid != null &&
+              params.data.device_node_guid != ""
+            ) {
+              return `<div >
               ���蝔梧��${params.data.device_node_full_name}<br>
                     Guid嚗�${params.data.device_node_guid}
               </div>`;
-                        } else {
-                            return `<div >���蝔梧��${params.data.full_name}<br>
+            } else {
+              return `<div >���蝔梧��${params.data.full_name}<br>
                     Guid嚗�${params.data.device_guid}</div>`;
-                        }
-                    },
-                },
-                toolbox: {
-                    //撌亙�瑟��
-                    show: false,
-                },
-                geo: {
-                    map: "floor_svg",
-                    roam: true,
-                    scaleLimit: {
-                        //�����嗆�曉之蝮桀��������
-                        max: 2,
-                        min: 1,
-                    },
-                    layoutSize: "100%",
-                    layoutCenter: [],
-                    zoom: 1.1,
-                    silent: true,
-                },
-                series: [
-                    {
-                        //銝�蝞⊥����∟◤��豢��(���暺�)
-                        type: "scatter",
-                        coordinateSystem: "geo",
-                        geoIndex: 0,
-                        symbol: "circle",
-                        symbolSize: 20,
-                        symbolOffset: [10, 10],
-                        label: {
-                            show: false,
-                        },
-                        /*data: currentData,*/
-                        z: 2,
-                    },
-                    {
-                        //��芷�豢�����閮剖��(icon)
-                        type: "scatter",
-                        coordinateSystem: "geo",
-                        geoIndex: 0,
-                        symbolSize: 50,
-                        label: {
-                            formatter: "{b}",
-                            position: "bottom",
-                            show: true,
-                            backgroundColor: "orange",
-                        },
-                        emphasis: {
-                            label: {
-                                show: true,
-                                fontSize: "20",
-                                fontWeight: "bold",
-                                color: "yellow",
-                            },
-                        },
-                        selectedMode: "single",
-                        data: null,
-                        z: 1,
-                    },
-                    {
-                        //鋡恍�豢�����閮剖��(icon)
-                        type: "effectScatter",
-                        coordinateSystem: "geo",
-                        geoIndex: 0,
-                        showEffectOn: "render",
-                        symbolSize: 50,
-                        label: {
-                            formatter: "{b}",
-                            position: "bottom",
-                            show: true,
-                            backgroundColor: "orange",
-                        },
-                        emphasis: {
-                            label: {
-                                show: true,
-                                fontSize: "20",
-                                fontWeight: "bold",
-                                color: "yellow",
-                            },
-                        },
-                        selectedMode: "single",
-                        data: null,
-                        z: 1,
-                    },
-                    {
-                        //蝺刻摩璅∪��摨�銝����閮剖��(���暺�嚗���芣�����銝����)
-                        type: "scatter",
-                        coordinateSystem: "geo",
-                        geoIndex: 0,
-                        symbol: "circle",
-                        symbolSize: 20,
-                        symbolOffset: [10, 10],
-                        label: {
-                            show: false,
-                        },
-                        /*data: currentData,*/
-                        z: 2,
-                    },
-                    {
-                        //蝺刻摩璅∪��摨�銝����閮剖��(icon嚗���芣�����銝����)
-                        type: "scatter",
-                        coordinateSystem: "geo",
-                        geoIndex: 0,
-                        symbolSize: 50,
-                        label: {
-                            formatter: "{b}",
-                            position: "bottom",
-                            show: true,
-                            backgroundColor: "orange",
-                        },
-                        emphasis: {
-                            label: {
-                                show: true,
-                                fontSize: "20",
-                                fontWeight: "bold",
-                                color: "yellow",
-                            },
-                        },
-                        data: null,
-                        z: 1,
-                    },
-                ],
-            };
-
-            floChart.setOption(option);
-
-            if (
-                currentData != undefined &&
-                currentData != null &&
-                currentData.length > 0
-            ) {
-                resetData();
             }
-
-            var ordPath = {
-                building_tag: pageAct.buiTag,
-                system_tag: pageAct.sysMainTag,
-            };
-            //myBaja.setSubscribeDevicesByBql(ordPath);
-            //myBaja.setSubscribeDevicesCallBack(subscribeCallBack);
-            let parentEle = null;
-            floChart.on("click", function (params) {
-                forgeUnFocusAll();
-                chartUnFocusAll();
-                if (params.componentType == "series") {
-                    let data = params.data;
-                    let rect = $("#floChart")[0].getBoundingClientRect();
-                    let position = [
-                        rect.left + rect.width / 2,
-                        rect.top + rect.height / 4,
-                    ];
-                    // console.log(position)
-                    // let position = [params.event.event.clientX+100, params.event.event.clientY-300];
-                    data._dbId = data._dbId ?? "";
-                    // currentData.find(
-                    //   (cData) => cData.device_number === data.device_number
-                    // ).forge_dbid;
-                    parentEle = crePosPopover(position, data);
-                    $(parentEle).click();
-                } else {
-                    $(parentEle).YTTooltip("hide");
-                }
-            });
-
-            floChart.getZr().on("click", function (params) {
-                /*console.log("click", params);*/
-                var pixelPoint = [params.offsetX, params.offsetY];
-                var dataPoint = floChart.convertFromPixel({ geoIndex: 0 }, pixelPoint);
-
-                if (!(params?.target?.shape?.symbolType == "circle")) {
-                    $(parentEle).YTTooltip("hide");
-                }
-
-                //temp_device_on_floor_map = [{
-                //    device_guid: selected_temp_device.device_guid,
-                //    device_full_name: selected_temp_device.device_full_name,
-                //    device_node_guid: selected_temp_device.device_node_guid ? selected_temp_device.device_node_guid : null,
-                //    device_node_full_name: selected_temp_device.device_node_full_name ? selected_temp_device.device_node_full_name : null,
-                //    status: selected_temp_device.status,
-                //    value: dataPoint
-                //}];
-
-                // currentData.push([dataPoint[0], dataPoint[1], 1]);
-                // floChart.setOption(option);
-            });
-
-            onEvent("autodesk:complete:sprite", "#forgeViewer", function (e, obj) {
-                console.log("Current", obj.myDataList);
-                let option = floChart.getOption();
-
-                option.series.forEach(function (series) {
-                    (series.data ?? []).forEach(function (point) {
-                        let dbid = obj.myDataList.filter(
-                            (x) => x.device_number == point.device_number
-                        )[0]?._dbId;
-                        point._dbId = dbid;
-                        // currentData.forEach(function (cData) {
-                        //   console.log(cData.device_node_guid=== point.device_node_guid)
-                        //   if (lightControl === "node" && pageAct.sysSubTag === "L1" && cData.device_node_guid == point.device_node_guid) {
-                        //     cData._dbId = dbid;
-                        //     cData.spriteDbid = dbid;
-                        //     setForgeHotSpotColor(cData);
-                        //   }
-                        //   else if (cData.device_guid == point.device_guid) {
-                        //     cData._dbId = dbid;
-                        //     cData.spriteDbid = dbid;
-                        //     setForgeHotSpotColor(cData);
-                        //   }
-                        // });
-                        const cData = currentData.find((cur) => {
-                            if (lightControl === "node" && pageAct.sysSubTag === "L1") {
-                                if (cur.device_node_guid == point.device_node_guid) return cur;
-                            } else if (cur.device_guid == point.device_guid) {
-                                return cur;
-                            }
-                        });
-                        cData._dbId = dbid;
-                        cData.spriteDbid = dbid;
-                        // setForgeHotSpotColor(cData);
-                    });
-                });
-                floChart.setOption(option);
-
-                subDevice();
-            });
-            //floChart.on('selectchanged', function (params) {
-
-            //    console.log("selectchanged", params);
-            //    // currentData.push([dataPoint[0], dataPoint[1], 1]);
-            //    // floChart.setOption(option);
-
-            //    currentData = $.map(currentData, function (item) {
-            //        item.selected = false;
-            //        return item;
-            //    });
-
-            //    if (params.selected.length > 0) {
-            //        currentData[params.selected[0].seriesIndex - 1].selected = true;
-            //    }
-
-            //});
-
-            // floChart.getZr().on('mousewheel', function (params) {
-            //     console.log(params)
-            // })
-            floChart.on("georoam", function (params) {
-                var zoom = floChart.getOption().geo[0].zoom;
-                const option = floChart.getOption();
-                console.log("georoam", zoom);
-
-                if (zoom <= 1.5) {
-                    /*ResetFloorMap();*/
-                    floChart.setOption({
-                        geo: {
-                            roam: "scale",
-                        },
-                    });
-                } else {
-                    floChart.setOption({
-                        geo: {
-                            roam: true,
-                        },
-                    });
-                }
-                if (zoom > zoomToggle) {
-                    const currentImage = currentData.find(
-                        ({ device_image }) => device_image
-                    ).device_image;
-                    option.series[1].data = option.series[0].data.map((d) => ({
-                        ...d,
-                        symbol:
-                            "image://" + baseImgUrl + "/upload/device_icon/" + currentImage,
-                    }));
-                } else {
-                    option.series[1].data = [];
-                }
-                floChart.setOption(option);
-                // resetData();
-            });
-        }).fail(function () {
-            toast_warning("��亦�∟府璅�撅文�啣��");
-            floChart.clear();
-        });
-    }
-
-    //baja 閮���梯身���
-    function subDevice() {
-        console.log("subDevice ���憪�");
-
-        let option = floChart.getOption();
-        let floMyBaja = new subscriptionDevices();
-        var ordPath = {
-            area_tag: pageAct.AreaTag,
-            building_tag: pageAct.buiTag,
-            system_tag: pageAct.sysMainTag,
-            name_tag: pageAct.sysSubTag,
-            flo_tag: pageAct.floTag,
-        };
-        floMyBaja.setSubscribeDevicesByBql(ordPath);
-
-        // �����梢�����
-        let lightOnHotColorArr = [];
-        let lightOffHotColorArr = [];
-        // ������������
-        let deviceScatterNormalArr = [];
-        let deviceScatterCloseArr = [];
-        let deviceScatterErrorArr = [];
-        floMyBaja.setSubscribeDevicesCallBack(function (data) {
-            let matchDevice = currentData.filter(
-                (x) => x.device_number == data.device_number_full
-            )[0];
-            if (!matchDevice) {
-                $(loadEle).Loading("close");
-                return false;
-            }
-            //撠�閮���勗�澆����� subDeviceData
-            if (
-                subDeviceData.findIndex(
-                    (x) => x.device_number == matchDevice.device_number
-                ) == -1
-            ) {
-                let obj = {};
-                obj.device_number = matchDevice.device_number;
-                obj.dbid = matchDevice.forge_dbid;
-                subDeviceData.push(obj);
-            }
-            let norDevPoiName = matchDevice.device_normal_point_name;
-            let cloDevPoiName = matchDevice.device_close_point_name;
-            let errDevPoiName = matchDevice.device_error_point_name;
-
-            if (data.point_name == "Temp" || data.point_name == "TEMP") {
-                heatMap?.changeTemp(
-                    data.device_number_full,
-                    !isNaN(parseInt(data.value)) ? parseInt(data.value) : 0
-                );
-                let devIdx = currentData.findIndex(
-                    (x) => x.device_number == data.device_number_full
-                );
-                currentData[devIdx]._temp = !isNaN(parseInt(data.value))
-                    ? parseInt(data.value)
-                    : 0;
-            }
-            if (data.point_name == "SSC" && pageAct.sysSubTag === "L1") {
-                const lightOn = data.value.includes("true");
-                setLightOpenOrClose(lightOn, matchDevice.device_guid);
-                if (lightOn && matchDevice.spriteDbid) {
-                    // setLightValues(matchDevice.device_guid, 200, 0xe1cf18);
-                    // changeColorForHotspot(matchDevice.spriteDbid, null, lightOn);
-                    if (
-                        !lightOnHotColorArr.some(
-                            ({ spriteDbid }) => spriteDbid === matchDevice.spriteDbid
-                        )
-                    ) {
-                        lightOnHotColorArr.push(matchDevice);
-                    }
-                    lightOffHotColorArr = lightOffHotColorArr.filter(
-                        (light) => light.spriteDbid !== matchDevice.spriteDbid
-                    );
-                    heatMap?.changeTemp(matchDevice.device_number, 40);
-                } else if (matchDevice.spriteDbid) {
-                    if (
-                        !lightOffHotColorArr.some(
-                            ({ spriteDbid }) => spriteDbid === matchDevice.spriteDbid
-                        )
-                    ) {
-                        lightOffHotColorArr.push(matchDevice);
-                    }
-                    lightOnHotColorArr = lightOnHotColorArr.filter(
-                        (light) => light.spriteDbid !== matchDevice.spriteDbid
-                    );
-                    heatMap?.changeTemp(matchDevice.device_number, 0);
-                }
-            }
-
-            if (
-                data.point_name == errDevPoiName &&
-                data.value !== matchDevice.device_error_point_value &&
-                alarmDbIdList.some(
-                    ({ device_number }) => matchDevice.device_number === device_number
-                )
-            ) {
-                alarmDbIdList = alarmDbIdList.filter(
-                    ({ device_number }) => matchDevice.device_number === device_number
-                );
-            } else if (
-                data.point_name == errDevPoiName &&
-                data.value == matchDevice.device_error_point_value &&
-                !alarmDbIdList.some(
-                    ({ device_number }) => matchDevice.device_number === device_number
-                )
-            ) {
-                $(`#${matchDevice.device_number}_status`)
-                    .attr("data-light-type", "error")
-                    .data("light-type", "error");
-                alarmDbIdList.push(matchDevice);
-            }
-
-            if (
-                data.point_name == norDevPoiName &&
-                data.value == matchDevice.device_normal_point_value &&
-                !deviceScatterNormalArr.some(
-                    ({ device_number }) => data.device_number_full === device_number
-                )
-            ) {
-                //憿舐內甇�撣貊�����
-                $(`#${matchDevice.device_number}_status`)
-                    .attr("data-light-type", "normal")
-                    .data("light-type", "normal");
-                deviceScatterNormalArr.push(matchDevice);
-                deviceScatterCloseArr = deviceScatterCloseArr.filter(
-                    (device) => device.spriteDbid !== matchDevice.spriteDbid
-                );
-            } else if (
-                data.point_name == cloDevPoiName &&
-                data.value == matchDevice.device_close_point_value &&
-                !deviceScatterCloseArr.some(
-                    ({ device_number }) => data.device_number_full === device_number
-                )
-            ) {
-                $(`#${matchDevice.device_number}_status`)
-                    .attr("data-light-type", "close")
-                    .data("light-type", "close");
-                deviceScatterCloseArr.push(matchDevice);
-                deviceScatterNormalArr = deviceScatterNormalArr.filter(
-                    (device) => device.spriteDbid !== matchDevice.spriteDbid
-                );
-            }
-
-            if (pageAct.sysSubTag === "L1" && lightControl === "node") {
-                alarmDbIdList = alarmDbIdList.filter(
-                    ({ device_node_guid }) =>
-                        device_node_guid !== undefined && device_node_guid !== null
-                );
-
-                deviceScatterNormalArr = deviceScatterNormalArr.filter(
-                    ({ device_node_guid }) =>
-                        device_node_guid !== undefined && device_node_guid !== null
-                );
-                deviceScatterCloseArr = deviceScatterCloseArr.filter(
-                    ({ device_node_guid }) =>
-                        device_node_guid !== undefined && device_node_guid !== null
-                );
-
-                lightOnHotColorArr = lightOnHotColorArr.filter(
-                    ({ device_node_guid }) =>
-                        device_node_guid !== undefined && device_node_guid !== null
-                );
-                lightOffHotColorArr = lightOffHotColorArr.filter(
-                    ({ device_node_guid }) =>
-                        device_node_guid !== undefined && device_node_guid !== null
-                );
-            }
-
-            if (
-                deviceScatterCloseArr.length + deviceScatterNormalArr.length ===
-                option.series[0].data.length ||
-                deviceScatterCloseArr.length +
-                deviceScatterNormalArr.length +
-                alarmDbIdList.length ===
-                option.series[0].data.length
-            ) {
-                deviceScatterNormalArr.length &&
-                    deviceScatterNormalArr.forEach((device) => {
-                        const cur = option.series[0].data.find(
-                            ({ device_number }) => device_number === device.device_number
-                        );
-
-                        const normalColor = currentData.find(
-                            ({ device_number }) => device_number === device.device_number
-                        ).device_normal_color;
-                        if (cur) {
-                            cur.itemStyle = { color: normalColor };
-                        }
-                    });
-
-                changeColorForHotspot(
-                    deviceScatterNormalArr.map(({ spriteDbid }) => spriteDbid),
-                    null,
-                    true
-                );
-
-                deviceScatterCloseArr.length &&
-                    deviceScatterCloseArr.forEach((device) => {
-                        const cur = option.series[0].data.find(
-                            ({ device_number }) => device_number === device.device_number
-                        );
-                        const closeColor = currentData.find(
-                            ({ device_number }) => device_number === device.device_number
-                        ).device_close_color;
-                        if (cur) {
-                            cur.itemStyle = { color: closeColor };
-                        }
-                    });
-
-                changeColorForHotspot(
-                    deviceScatterCloseArr.map(({ spriteDbid }) => spriteDbid),
-                    null,
-                    false
-                );
-
-                alarmDbIdList.length &&
-                    alarmDbIdList.forEach((device) => {
-                        const cur = option.series[0].data.find(
-                            ({ device_number }) => device_number === device.device_number
-                        );
-                        const errColor = currentData.find(
-                            ({ device_number }) => device_number === device.device_number
-                        )?.device_error_color;
-
-                        if (cur) {
-                            cur.itemStyle = { color: errColor };
-                        }
-                    });
-                changeColorForHotspot(
-                    alarmDbIdList.map(({ spriteDbid }) => spriteDbid),
-                    "error",
-                    false
-                );
-
-                floChart.setOption(option);
-                $(loadEle).Loading("close");
-            }
-        });
-
-        floMyBaja.setSubscribeDeviceEndCallBack(function (data) {
-            endPageLoading();
-            if (
-                pageAct.sysSubTag !== "M12" &&
-                data.findIndex(
-                    (x) => x.point_name == "Temp" || x.point_name == "TEMP"
-                ) != -1
-            ) {
-                // 憿舐內皞怠漲璇�
-                showHeat("[name=forgeHeatBar]");
-            }
-        });
-    }
-
-    function drawHeatBar() {
-        $("#forgeHeatBarDiv").html(setTopHeatBar());
-    }
-
-    // ��餅０ 3D 雿�蝵桀�����
-    function set3DElevPos(viewer) {
-        let nodeIds = allElevDevList
-            .filter((x) => !isNaN(parseInt(x.forge_dbid)))
-            .map((x) => {
-                return { devNum: x.device_number, nodeId: parseInt(x.forge_dbid) };
-            });
-
-        $.each(nodeIds, (idx, item) => {
-            elev3DBind[item.devNum] = item.nodeId;
-        });
-        nodeIds = nodeIds.map((x) => x.nodeId);
-        $.each(nodeIds, function (idx, node) {
-            let options = {
-                element: $("#forgeViewer"),
-                viewer: viewer,
-                nodeId: node,
-                floorHeight: elev3DOption.floorHeight ?? [],
-                inited: function () { },
-            };
-            let elevator3DObj = new elevator3D(options);
-            let devNum = Object.keys(elev3DBind).filter(
-                (x) => elev3DBind[x] == node
-            )[0];
-            let subData = subSeviceData.filter((x) => x.device_number == devNum)[0];
-
-            if (elev3DObj.filter((x) => x.nodeId == node).length == 0) {
-                elev3DObj.push({ id: devNum, nodeId: node, obj: elevator3DObj });
-            }
-
-            if (subData) {
-                let elevObj = elev3DObj.filter((x) => x.nodeId == node)[0];
-                if (!elevObj.id) {
-                    elevObj.id = devNum;
-                }
-                elevObj.obj = Object.assign(elevObj, elevator3DObj ?? {});
-                elevObj.obj.init(function () {
-                    let frags = elevObj.obj.fragProxys.filter((x) => x.nodeId == node);
-
-                    frags.forEach((fragProxy) => {
-                        fragProxy.frag.position.z =
-                            elev3DOption.floorHeight.filter(
-                                (x) => x.floor == subData["CP"]
-                            )[0]?.height ?? 0;
-                        fragProxy.frag.updateAnimTransform();
-                    });
-                    elevObj.obj.viewer.impl.sceneUpdated(true);
-                });
-            }
-        });
-    }
-
-    // ��餅０ 3D Option 閮剔蔭
-    function set3DElevOpt(data) {
-        let devNumArr = data
-            .map((x) => {
-                return {
-                    devNum: x.device_number_full,
-                    priority: allElevDevList.filter(
-                        (y) => y.device_number == x.device_number_full
-                    )[0]?.priority,
-                };
-            })
-            .DistinctBy("devNum");
-        devNumArr = devNumArr.oSort("priority");
-        $.each(devNumArr, (idx, devObj) => {
-            devNum = devObj.devNum;
-            let subData = subSeviceData.filter((x) => x.device_number == devNum)[0];
-
-            if (subData) {
-                //// 撌血�� 3D ��餅０ nodeID ��� device_number match
-                //if (Object.keys(elev3DBind).indexOf(devNum) == -1 && viewer3DNodeIds.length != 0) {
-                //    elev3DBind[devNum] = viewer3DNodeIds[Object.keys(elev3DBind).length];
-                //}
-                // 撌血�� 3D ��餅０ Viewer Option 閮剔蔭
-                /*elev3DOption.nodes = Object.keys(elev3DBind).map(x => elev3DBind[x]);*/
-                elev3DOption.nodeId = elev3DBind[devNum];
-                elev3DOption.floorHeight = floList.map((x) => {
-                    return { floor: x };
-                });
-                elev3DOption.floorHeight.forEach((floObj, idx) => {
-                    if (floObj.floor.startsWith("B")) {
-                        let floor = parseInt(floObj.floor.split("B")[1].split("F")[0]);
-                        floObj.height = floor * -13;
-                    } else {
-                        let floor = parseInt(floObj.floor.split("F")[0]);
-                        if (floor == 1) {
-                            floObj.height = 0;
-                        } else if (floor == 2) {
-                            floObj.height = 14.75;
-                        } else {
-                            floObj.height = 14.75 + (floor - 2) * 9.75;
-                        }
-                    }
-                });
-
-                if (elev3DObj.length != 0) {
-                    let elevObj = elev3DObj.filter(
-                        (x) => x.nodeId == elev3DBind[devNum]
-                    )[0];
-                    if (!elevObj.id) {
-                        elevObj.id = devNum;
-                    }
-                    elevObj.obj = Object.assign(elevObj.obj, elev3DOption);
-                    elevObj.obj.init(function () {
-                        let frags = elevObj.obj.fragProxys.filter(
-                            (x) => x.nodeId == elev3DBind[devNum]
-                        );
-
-                        frags.forEach((fragProxy) => {
-                            fragProxy.frag.position.z =
-                                elev3DOption.floorHeight.filter(
-                                    (x) => x.floor == subData["CP"]
-                                )[0]?.height ?? 0;
-                            fragProxy.frag.updateAnimTransform();
-                        });
-                        elevObj.obj.viewer.impl.sceneUpdated(true);
-                    });
-                }
-            }
-        });
-    }
-
-    // //閮���梯身�����������喳�潘��銝血����啣�典��霈����
-    // function subscribeCallBack(change_device, is_need_reset = false) {
-    //     if (change_device != undefined && change_device != null) {
-    //         var target_device = allDeviceRowData.filter(x => x.device_number == change_device.device_number)[0];
-
-    //         if (target_device == undefined || target_device == null) {
-    //             //��啣��
-    //             obj = {
-    //                 device_number: change_device.device_number,
-    //                 points: [{
-    //                     name: change_device.point_name,
-    //                     value: change_device.value
-    //                 }]
-    //             };
-
-    //             allDeviceRowData.push(obj);
-    //         }
-    //         else {
-    //             selected_device_point = target_device.points.find(x => x.name == change_device.point_name);
-    //             if (selected_device_point != null) {
-    //                 selected_device_point.value = change_device.value;
-    //             }
-    //             else {
-    //                 obj = {
-    //                     name: change_device.point_name,
-    //                     value: change_device.value
-    //                 }
-    //                 target_device.points.push(obj);
-    //             }
-    //         }
-
-    //         if (is_need_reset) {
-    //             resetData();
-    //         }
-    //     }
-    // }
-
-    // ���閮剖像��Ｗ��閮剖��鞈����
-    function resetData() {
-        const scatter_symbol_convertData = function (data, zoom) {
-            //甇�撣詻�������������七CVT(���暺�)
-            let res = [],
-                temp = [];
-            data.forEach(function (item, index) {
-                if (
-                    global_emergency_alarm_device_number != undefined &&
-                    global_emergency_alarm_device_number != null
-                ) {
-                    if (
-                        global_emergency_alarm_device_number.findIndex(
-                            (x) => x.device_number == item.device_number
-                        ) < 0 &&
-                        item.device_system_category_layer3 != "C"
-                    ) {
-                        //憒�������摮�蝭�暺�嚗������芷��撠�摮�蝭�暺����雿�
-                        if (
-                            lightControl === "node" &&
-                            item.device_nodes != undefined &&
-                            item.device_nodes != null &&
-                            item.device_nodes.length > 0
-                        ) {
-                            item.device_nodes.forEach(function (item_node, item_node_index) {
-                                //瘛餃����嗥��暺���賊��鞈�閮�
-                                item_node.device_system_category_layer3 =
-                                    item.device_system_category_layer3;
-                                item_node.device_normal_color = item.device_normal_color;
-                                item_node.device_close_color = item.device_close_color;
-
-                                //��斗�瑞�嗥��暺�������
-                                var device_index = allDeviceRowData.findIndex(
-                                    (x) => x.device_number == item.device_number
-                                );
-                                var temp_point_value;
-                                if (device_index > -1) {
-                                    if (
-                                        item.device_normal_point_name != null ||
-                                        item.device_close_point_name != null
-                                    ) {
-                                        //��嗅�嗡葉point name 銝���槃ull������瘜�
-                                        if (item.device_normal_point_name != null) {
-                                            temp_point_value = allDeviceRowData[
-                                                device_index
-                                            ].points.find(
-                                                (x) => x.name == item.device_normal_point_name
-                                            );
-                                            temp_point_value =
-                                                allDeviceRowData[device_index].points[
-                                                item.device_normal_point_name
-                                                ];
-                                            if (temp_point_value == item.device_normal_point_value) {
-                                                item_node.device_color = item.device_normal_color;
-                                            }
-                                        }
-                                        if (item.device_close_point_name != null) {
-                                            temp_point_value =
-                                                allDeviceRowData[device_index].points[
-                                                item.device_close_point_name
-                                                ];
-                                            if (temp_point_value == item.device_close_point_value) {
-                                                item_node.device_color = item.device_close_color;
-                                            }
-                                        }
-                                    } else {
-                                        if (item.device_normal_point_name == "ER") {
-                                            temp_point_value =
-                                                allDeviceRowData[device_index].points[
-                                                item.device_normal_point_name
-                                                ];
-                                            if (temp_point_value == "true") {
-                                                item_node.device_color = item.device_normal_color;
-                                            } else {
-                                                temp_point_value =
-                                                    allDeviceRowData[device_index].points[
-                                                    item.device_close_point_name
-                                                    ];
-                                                if (temp_point_value == item.device_close_point_value) {
-                                                    item_node.device_color = item.device_close_color;
-                                                }
-                                            }
-                                        } else if (item.device_close_point_name == "ER") {
-                                            temp_point_value =
-                                                allDeviceRowData[device_index].points[
-                                                item.device_close_point_name
-                                                ];
-                                            if (temp_point_value == "true") {
-                                                item_node.device_color = item.device_close_color;
-                                            } else {
-                                                temp_point_value =
-                                                    allDeviceRowData[device_index].points[
-                                                    item.device_normal_point_name
-                                                    ];
-                                                if (
-                                                    temp_point_value == item.device_normal_point_value
-                                                ) {
-                                                    item_node.device_color = item.device_normal_color;
-                                                }
-                                            }
-                                        } else {
-                                            temp_point_value =
-                                                allDeviceRowData[device_index].points[
-                                                item.device_normal_point_name
-                                                ];
-                                            if (temp_point_value == item.device_normal_point_value) {
-                                                item_node.device_color = item.device_normal_color;
-                                            } else if (
-                                                temp_point_value == item.device_close_point_value
-                                            ) {
-                                                item_node.device_color = item.device_close_color;
-                                            }
-                                        }
-                                    }
-                                }
-                                // temp.push(item_node);
-                            });
-                        } else {
-                            var device_index = allDeviceRowData.findIndex(
-                                (x) => x.device_number == item.device_number
-                            );
-                            if (device_index > -1) {
-                                if (
-                                    item.device_normal_point_name != null ||
-                                    item.device_close_point_name != null
-                                ) {
-                                    //��嗅�嗡葉point name �����槃ull������瘜�
-                                    if (item.device_normal_point_name != null) {
-                                        // temp_point_value = allDeviceRowData[device_index].points[item.device_normal_point_name];
-                                        temp_point_value = allDeviceRowData[
-                                            device_index
-                                        ].points.find(
-                                            (x) => x.name == item.device_normal_point_name
-                                        ).value;
-                                        if (temp_point_value == item.device_normal_point_value) {
-                                            item.device_color = item.device_normal_color;
-                                        }
-                                    }
-                                    if (item.device_close_point_name != null) {
-                                        // temp_point_value = allDeviceRowData[device_index].points[item.device_close_point_name];
-                                        temp_point_value = allDeviceRowData[
-                                            device_index
-                                        ].points.find(
-                                            (x) => x.name == item.device_close_point_name
-                                        ).value;
-                                        if (temp_point_value == item.device_close_point_value) {
-                                            item.device_color = item.device_close_color;
-                                        }
-                                    }
-                                } else {
-                                    if (item.device_normal_point_name == "ER") {
-                                        // temp_point_value = allDeviceRowData[device_index].points[item.device_normal_point_name];
-                                        temp_point_value = allDeviceRowData[
-                                            device_index
-                                        ].points.find(
-                                            (x) => x.name == item.device_normal_point_name
-                                        ).value;
-                                        if (temp_point_value == "true") {
-                                            item.device_color = item.device_normal_color;
-                                        } else {
-                                            // temp_point_value = allDeviceRowData[device_index].points[item.device_close_point_name];
-                                            temp_point_value = allDeviceRowData[
-                                                device_index
-                                            ].points.find(
-                                                (x) => x.name == item.device_close_point_name
-                                            ).value;
-                                            if (temp_point_value == item.device_close_point_value) {
-                                                item.device_color = item.device_close_color;
-                                            }
-                                        }
-                                    } else if (item.device_close_point_name == "ER") {
-                                        // temp_point_value = allDeviceRowData[device_index].points[item.device_close_point_name];
-                                        temp_point_value = allDeviceRowData[
-                                            device_index
-                                        ].points.find(
-                                            (x) => x.name == item.device_close_point_name
-                                        ).value;
-                                        if (temp_point_value == "true") {
-                                            item.device_color = item.device_close_color;
-                                        } else {
-                                            // temp_point_value = allDeviceRowData[device_index].points[item.device_normal_point_name];
-                                            temp_point_value = allDeviceRowData[
-                                                device_index
-                                            ].points.find(
-                                                (x) => x.name == item.device_normal_point_name
-                                            ).value;
-                                            if (temp_point_value == item.device_normal_point_value) {
-                                                item.device_color = item.device_normal_color;
-                                            }
-                                        }
-                                    } else {
-                                        // temp_point_value = allDeviceRowData[device_index].points[item.device_normal_point_name];
-                                        temp_point_value = allDeviceRowData[
-                                            device_index
-                                        ].points.find(
-                                            (x) => x.name == item.device_normal_point_name
-                                        ).value;
-                                        if (temp_point_value == item.device_normal_point_value) {
-                                            item.device_color = item.device_normal_color;
-                                        } else if (
-                                            temp_point_value == item.device_close_point_value
-                                        ) {
-                                            item.device_color = item.device_close_color;
-                                        }
-                                    }
-                                }
-                            }
-                            item.zoom = zoom;
-                            temp.push(item);
-                        }
-                    }
-                }
-            });
-
-            // let temp = data.filter(function (item, index) {
-            //     if (global_emergency_alarm_device_number != undefined && global_emergency_alarm_device_number != null) {
-            //         return global_emergency_alarm_device_number.findIndex(x => x.device_number == item.device_number) < 0 && item.device_system_category_layer3 != "C";
-            //     } else {
-            //         return [];
-            //     }
-            // });
-            let option = floChart.getOption();
-            temp.forEach(function (tempData) {
-                let oldTarObj = option.series[0]?.data?.filter(
-                    (x) => x.device_number == tempData.device_number
-                )[0];
-                if (oldTarObj) {
-                    tempData = Object.assign(tempData, oldTarObj);
-                }
-            });
-            temp.map(function (item) {
-                var obj = {
-                    device_guid: item.device_guid,
-                    device_number: item.device_number,
-                    full_name: item.full_name ? item.full_name : null,
-                    device_node_guid: item.device_node_guid
-                        ? item.device_node_guid
-                        : null,
-                    device_node_full_name: item.device_node_full_name
-                        ? item.device_node_full_name
-                        : null,
-                    device_system_category_layer3: item.device_system_category_layer3
-                        ? item.device_system_category_layer3
-                        : null,
-                    status: item.status,
-                    value: item.value,
-                    deviceItems: item.deviceItems,
-                    deviceURL: item.deviceURL,
-                    _dbId: item._dbId ?? null,
-                };
-
-                obj.itemStyle = {
-                    color: item.device_color || item.device_close_color,
-                };
-
-                res.push(obj);
-            });
-
-            return res;
-        };
-
-        const scatter_icon_convertData = function (data) {
-            //甇�撣詻��������(icon)
-            let res = [],
-                temp = [];
-
-            data.forEach(function (item, index) {
-                if (
-                    global_emergency_alarm_device_number != undefined &&
-                    global_emergency_alarm_device_number != null
-                ) {
-                    if (
-                        global_emergency_alarm_device_number.findIndex(
-                            (x) => x.device_number == item.device_number
-                        ) < 0 &&
-                        item.device_system_category_layer3 != "C"
-                    ) {
-                        //憒�������摮�蝭�暺�嚗������芷��撠�摮�蝭�暺����雿�
-                        if (
-                            lightControl === "node" &&
-                            item.device_nodes != undefined &&
-                            item.device_nodes != null &&
-                            item.device_nodes.length > 0
-                        ) {
-                            item.device_nodes.forEach(function (item_node, item_node_index) {
-                                //瘛餃����嗥��暺���賊��鞈�閮�
-                                item_node.device_system_category_layer3 =
-                                    item.device_system_category_layer3;
-                                item_node.device_normal_color = item.device_normal_color;
-                                item_node.device_image = item.device_image;
-                                temp.push(item_node);
-                            });
-                        } else {
-                            temp.push(item);
-                        }
-                    }
-                }
-            });
-
-            temp = data.filter(function (item, index) {
-                if (
-                    global_emergency_alarm_device_number != undefined &&
-                    global_emergency_alarm_device_number != null
-                ) {
-                    return (
-                        global_emergency_alarm_device_number.findIndex(
-                            (x) => x.device_number == item.device_number
-                        ) < 0 && item.device_system_category_layer3 != "C"
-                    );
-                } else {
-                    return [];
-                }
-            });
-
-            temp.map(function (item) {
-                var obj = {
-                    device_guid: item.device_guid,
-                    device_number: item.device_number,
-                    full_name: item.full_name ? item.full_name : null,
-                    device_node_guid: item.device_node_guid
-                        ? item.device_node_guid
-                        : null,
-                    device_node_full_name: item.device_node_full_name
-                        ? item.device_node_full_name
-                        : null,
-                    device_system_category_layer3: item.device_system_category_layer3
-                        ? item.device_system_category_layer3
-                        : null,
-                    status: item.status,
-                    symbol:
-                        "image://" +
-                        baseImgUrl +
-                        "/upload/device_icon/" +
-                        item.device_image,
-                    value: item.value,
-                    deviceItems: item.deviceItems,
-                    deviceURL: item.deviceURL,
-                };
-
-                if (item.selected) {
-                    obj.symbolSize = 50;
-                }
-                obj.itemStyle = {
-                    color: item.device_colse_color,
-                };
-                res.push(obj);
-            });
-
-            return res;
-        };
-
-        const scatter_error_convertData = function (data) {
-            //��啣虜(���暺�)
-            let res = [],
-                temp = [];
-
-            data.forEach(function (item, index) {
-                if (
-                    global_emergency_alarm_device_number != undefined &&
-                    global_emergency_alarm_device_number != null
-                ) {
-                    if (
-                        global_emergency_alarm_device_number.findIndex(
-                            (x) => x.device_number == item.device_number
-                        ) > -1 &&
-                        item.device_system_category_layer3 != "C"
-                    ) {
-                        //憒�������摮�蝭�暺�嚗������芷��撠�摮�蝭�暺����雿�
-                        if (
-                            lightControl === "node" &&
-                            item.device_nodes != undefined &&
-                            item.device_nodes != null &&
-                            item.device_nodes.length > 0
-                        ) {
-                            item.device_nodes.forEach(function (item_node, item_node_index) {
-                                //瘛餃����嗥��暺���賊��鞈�閮�
-                                item_node.device_system_category_layer3 =
-                                    item.device_system_category_layer3;
-                                item_node.device_error_color = item.device_error_color;
-                                temp.push(item_node);
-                            });
-                        } else {
-                            temp.push(item);
-                        }
-                    }
-                }
-            });
-
-            // if (global_emergency_alarm_device_number != undefined && global_emergency_alarm_device_number != null) {
-            //     temp = data.filter(function (item, index) {
-            //         return global_emergency_alarm_device_number.findIndex(x => x.device_number == item.device_number) > -1 && item.device_system_category_layer3 != "C";
-            //     });
-            // }
-
-            temp.map(function (item) {
-                var obj = {
-                    device_guid: item.device_guid,
-                    device_number: item.device_number,
-                    full_name: item.full_name ? item.full_name : null,
-                    device_node_guid: item.device_node_guid
-                        ? item.device_node_guid
-                        : null,
-                    device_node_full_name: item.device_node_full_name
-                        ? item.device_node_full_name
-                        : null,
-                    device_system_category_layer3: item.device_system_category_layer3
-                        ? item.device_system_category_layer3
-                        : null,
-                    status: item.status,
-                    value: item.value,
-                    deviceItems: item.deviceItems,
-                    deviceURL: item.deviceURL,
-                };
-                console.log("��啣虜", item.device_color);
-                obj.itemStyle = { color: item.device_error_color };
-
-                res.push(obj);
-            });
-
-            return res;
-        };
-
-        const scatter_error_icon_convertData = function (data) {
-            //��啣虜(icon)
-            let res = [],
-                temp = [];
-
-            data.forEach(function (item, index) {
-                if (
-                    global_emergency_alarm_device_number != undefined &&
-                    global_emergency_alarm_device_number != null
-                ) {
-                    if (
-                        global_emergency_alarm_device_number.findIndex(
-                            (x) => x.device_number == item.device_number
-                        ) > -1 &&
-                        item.device_system_category_layer3 != "C"
-                    ) {
-                        //憒�������摮�蝭�暺�嚗������芷��撠�摮�蝭�暺����雿�
-                        if (
-                            lightControl === "node" &&
-                            item.device_nodes != undefined &&
-                            item.device_nodes != null &&
-                            item.device_nodes.length > 0
-                        ) {
-                            item.device_nodes.forEach(function (item_node, item_node_index) {
-                                //瘛餃����嗥��暺���賊��鞈�閮�
-                                item_node.device_system_category_layer3 =
-                                    item.device_system_category_layer3;
-                                item_node.device_error_color = item.device_error_color;
-                                item_node.device_image = item.device_image;
-                                temp.push(item_node);
-                            });
-                        } else {
-                            temp.push(item);
-                        }
-                    }
-                }
-            });
-
-            if (
-                global_emergency_alarm_device_number != undefined &&
-                global_emergency_alarm_device_number != null
-            ) {
-                temp = data.filter(function (item, index) {
-                    return (
-                        global_emergency_alarm_device_number.findIndex(
-                            (x) => x.device_number == item.device_number
-                        ) > -1 && item.device_system_category_layer3 != "C"
-                    );
-                });
-            }
-
-            temp.map(function (item) {
-                var obj = {
-                    device_guid: item.device_guid,
-                    device_number: item.device_number,
-                    full_name: item.full_name ? item.full_name : null,
-                    device_node_guid: item.device_node_guid
-                        ? item.device_node_guid
-                        : null,
-                    device_node_full_name: item.device_node_full_name
-                        ? item.device_node_full_name
-                        : null,
-                    device_system_category_layer3: item.device_system_category_layer3
-                        ? item.device_system_category_layer3
-                        : null,
-                    status: item.status,
-                    symbol:
-                        "image://" +
-                        baseImgUrl +
-                        "/upload/device_icon/" +
-                        item.device_image,
-                    value: item.value,
-                    deviceItems: item.deviceItems,
-                    deviceURL: item.deviceURL,
-                };
-
-                res.push(obj);
-            });
-
-            return res;
-        };
-
-        const scatter_cctv_convertData = function (data) {
-            //CCTV
-            let res = [];
-            let temp = data.filter(function (item, index) {
-                return item.device_system_category_layer3 == "C";
-            });
-
-            temp.map(function (item) {
-                var obj = {
-                    device_guid: item.device_guid,
-                    device_number: item.device_number,
-                    full_name: item.full_name,
-                    device_system_category_layer3: item.device_system_category_layer3,
-                    device_ip: item.device_ip,
-                    device_port: item.device_port,
-                    status: item.status,
-                    symbol:
-                        "image://" +
-                        str_location_url +
-                        "/upload/device_icon/" +
-                        item.device_image,
-                    value: item.value,
-                };
-
-                res.push(obj);
-            });
-
-            return res;
-        };
-
-        if (!floChart.getOption()) {
-            return;
-        }
-
-        var zoom = 0;
-        if (floChart.getOption().geo && floChart.getOption().geo.length > 0) {
-            zoom = floChart.getOption().geo[0].zoom;
-        }
-        if (zoom <= zoomToggle) {
-            floChart.setOption({
-                series: [
-                    {
-                        symbolOffset: [0, 0],
-                        data: scatter_symbol_convertData(currentData), //甇�撣詻��������(���暺�)
-                    },
-                    {
-                        data: [], //甇�撣詻��������(icon)
-                    },
-                    {
-                        symbolOffset: [0, 0],
-                        data: scatter_error_convertData(currentData), //��啣虜(���暺�)
-                    },
-                    {
-                        data: [], //��啣虜(icon)
-                    },
-                    {
-                        data: scatter_cctv_convertData(currentData), //CCTV
-                    },
-                ],
-            });
-        } else {
-            floChart.setOption({
-                series: [
-                    {
-                        symbolOffset: [10, 10],
-
-                        data: scatter_symbol_convertData(currentData, zoom), //甇�撣詻��������(���暺�)
-                    },
-                    {
-                        data: scatter_icon_convertData(currentData), //甇�撣詻��������(icon)
-                    },
-                    {
-                        symbolOffset: [10, 10],
-                        data: scatter_error_convertData(currentData), //��啣虜(���暺�)
-                    },
-                    {
-                        data: scatter_error_icon_convertData(currentData), //��啣虜(icon)
-                    },
-                    {
-                        data: scatter_cctv_convertData(currentData), //CCTV
-                    },
-                ],
-            });
-        }
-    }
-
-    function getNextFloor(floGuid = null) {
-        let url = baseApiUrl + "/api/Device/GetNextFloor";
-        objSendData.Data = { floor_guid: floGuid, building_tag: pageAct.buiTag };
-        let result = "";
-        ytAjax = new YourTeam.Ajax(
-            url,
-            objSendData,
-            function (res) {
-                if (!res || res.code != "0000" || !res.data) {
-                } else {
-                    result = res.data?.full_name;
-                }
+          },
+        },
+        toolbox: {
+          //撌亙�瑟��
+          show: false,
+        },
+        geo: {
+          map: "floor_svg",
+          roam: true,
+          scaleLimit: {
+            //�����嗆�曉之蝮桀��������
+            max: 2,
+            min: 1,
+          },
+          layoutSize: "100%",
+          layoutCenter: [],
+          zoom: 1.1,
+          silent: true,
+        },
+        series: [
+          {
+            //銝�蝞⊥����∟◤��豢��(���暺�)
+            type: "scatter",
+            coordinateSystem: "geo",
+            geoIndex: 0,
+            symbol: "circle",
+            symbolSize: 20,
+            symbolOffset: [10, 10],
+            label: {
+              show: false,
             },
-            null,
-            "POST"
-        ).send();
-
-        return result;
-    }
-
-    // show 3D 璅∪��
-    function show3DModel(urn) {
-        launchViewerForHotspot(urn, (viewer, nodeIds) => {
-            // ��梯�� toolbar
-            document.querySelector("#guiviewer3d-toolbar").style.display = "none";
-            let nextFloor = getNextFloor(pageAct.floGuid);
-            let curFloTag = pageAct.floTag;
-
-            if (!nextFloor) {
-                toast_warning("頞���箸��撅斤�����");
-                return;
-            }
-
-            if (curFloTag?.startsWith("U")) {
-                curFloTag = curFloTag.split("U")[1];
-            }
-            if (nextFloor?.startsWith("U")) {
-                nextFloor = nextFloor.split("U")[1];
-            }
-
-            getLevelsData(curFloTag, nextFloor, function () {
-                viewer.model.search(
-                    "憭抵�望��",
-                    (nodeIds) => {
-                        // console.log("2",nodeIds)
-                        viewer.hide(nodeIds);
-                    },
-                    (e) => {
-                        console.log(e);
-                    }
-                );
-            });
-
-            setHeatMap();
-
-            if (
-                (pageAct.sysSubTag == "M12" || pageAct.sysSubTag == "ELEV") &&
-                elevatorShow
-            ) {
-                let elevOption = {
-                    viewer: viewer,
-                    ordPath: {
-                        area_tag: pageAct.AreaTag,
-                        building_tag: pageAct.buiTag,
-                    },
-                };
-                // ��餅０蝘餃��閮���梁��摨�頛����
-                let forge3DElev = new Forge3DElevFull(elevOption);
-                forge3DElev.bajaEndCallback = function () {
-                    endPageLoading();
-                };
-                forge3DElev.init();
-            }
-        });
-    }
-
-    function setHeatMap() {
-        if (pageAct.sysSubTag !== "M12") {
-            devices = currentData.map((x) => {
-                return {
-                    roomDbId: !isNaN(parseInt(x.room_dbid)) ? parseInt(x.room_dbid) : -1,
-                    id: x.device_number,
-                    position: isJSON(x.device_coordinate_3d)
-                        ? JSON.parse(x.device_coordinate_3d)
-                        : {}, // x: 0, y: 25, z: -2.5      (3.35, -4.81, 12.88
-                    sensorTypes: ["temperature", "humidity"],
-                };
-            });
-
-            let option = {
-                devices: devices,
-            };
-
-            heatMap = new ADHeatMaps(option);
-            heatMap.onComplete = () => {
-                $.each(currentData, (idx, dev) => {
-                    heatMap.changeTemp(dev.device_number, dev._temp || 0);
-                });
-            };
-        }
-        if (pageAct.sysSubTag === "M12" && !elevatorShow) {
-            let sensorObjs = [];
-            addHotPoint(viewer);
-            Forge3DSensor.sensorTimes = 0;
-            sensorObjs = currentData.map((device) => {
-                Forge3DSensor.sensorTimes++;
-                return new Forge3DSensor({
-                    viewer: viewer,
-                    ordPath: {
-                        area_tag: pageAct.AreaTag,
-                        building_tag: pageAct.buiTag,
-                    },
-                    selector: "#forgeViewer",
-                    elevCb: elevatorShow
-                        ? () => {
-                            let elevOption = {
-                                selector: "#forgeViewer",
-                                viewer: viewer,
-                                ordPath: {
-                                    area_tag: pageAct.AreaTag,
-                                    building_tag: pageAct.buiTag,
-                                },
-                                sensorObjs,
-                            };
-
-                            // ��餅０蝘餃��閮���梁��摨�頛����
-                            let forge3DElev = new Forge3DElevFull(elevOption);
-                            forge3DElev.bajaEndCallback = function () {
-                                endPageLoading();
-                            };
-                            forge3DElev.init();
-                        }
-                        : null,
-                    curDevice: {
-                        ...device,
-                        roomDbId: !isNaN(parseInt(device.room_dbid))
-                            ? parseInt(device.room_dbid)
-                            : -1,
-                        id: device.device_number,
-                        position: isJSON(device.device_coordinate_3d)
-                            ? JSON.parse(device.device_coordinate_3d)
-                            : {}, // x: 0, y: 25, z: -2.5      (3.35, -4.81, 12.88
-                        temp: 25,
-                        forge_dbid: parseInt(device.forge_dbid),
-                    },
-                    deviceList: currentData.map((d) => ({
-                        ...d,
-                        roomDbId: !isNaN(parseInt(d.room_dbid))
-                            ? parseInt(d.room_dbid)
-                            : -1,
-                        id: d.device_number,
-                        position: isJSON(d.device_coordinate_3d)
-                            ? JSON.parse(d.device_coordinate_3d)
-                            : {}, // x: 0, y: 25, z: -2.5      (3.35, -4.81, 12.88
-                        temp: 25,
-                        forge_dbid: parseInt(d.forge_dbid),
-                    })),
-                });
-            });
-        }
-    }
-
-    function getHotspotPoint(callback = null) {
-        let url = baseApiUrl + "/api/GetDevForCor";
-        let sendData = {
-            device_area_tag: pageAct.AreaTag,
-            device_building_tag: pageAct.buiTag,
-            device_system_tag: pageAct.sysMainTag,
-            device_name_tag: pageAct.sysSubTag,
-            device_floor_tag: pageAct.floTag,
-        };
-        objSendData.Data = sendData;
-        ytAjax = new YourTeam.Ajax(
-            url,
-            objSendData,
-            function (res) {
-                if (!res || res.code != "0000" || !res.data) {
-                } else {
-                    let myDataList = [];
-                    $.each(res.data, (idx, data) => {
-                        if (lightControl == "node" && data.device_nodes.length > 0) {
-                            data.device_nodes.forEach((node) => {
-                                if (
-                                    node.device_node_coordinate_3D != null &&
-                                    isJSON(node.device_node_coordinate_3D)
-                                ) {
-                                    myDataList.push({
-                                        ...node,
-                                        position: JSON.parse(node.device_node_coordinate_3D),
-                                    });
-                                }
-                            });
-                        } else if (
-                            data.device_coordinate_3d != null &&
-                            isJSON(data.device_coordinate_3d)
-                        ) {
-                            myDataList.push({
-                                ...data,
-                                position: JSON.parse(data.device_coordinate_3d),
-                            });
-                        }
-                    });
-
-                    getLightData(myDataList);
-                    setHotspotPoint(myDataList);
-                    callback ? callback() : "";
-                }
+            /*data: currentData,*/
+            z: 2,
+          },
+          {
+            //��芷�豢�����閮剖��(icon)
+            type: "scatter",
+            coordinateSystem: "geo",
+            geoIndex: 0,
+            symbolSize: 50,
+            label: {
+              formatter: "{b}",
+              position: "bottom",
+              show: true,
+              backgroundColor: "orange",
             },
-            null,
-            "POST"
-        ).send();
-    }
+            emphasis: {
+              label: {
+                show: true,
+                fontSize: "20",
+                fontWeight: "bold",
+                color: "yellow",
+              },
+            },
+            selectedMode: "single",
+            data: null,
+            z: 1,
+          },
+          {
+            //鋡恍�豢�����閮剖��(icon)
+            type: "effectScatter",
+            coordinateSystem: "geo",
+            geoIndex: 0,
+            showEffectOn: "render",
+            symbolSize: 50,
+            label: {
+              formatter: "{b}",
+              position: "bottom",
+              show: true,
+              backgroundColor: "orange",
+            },
+            emphasis: {
+              label: {
+                show: true,
+                fontSize: "20",
+                fontWeight: "bold",
+                color: "yellow",
+              },
+            },
+            selectedMode: "single",
+            data: null,
+            z: 1,
+          },
+          {
+            //蝺刻摩璅∪��摨�銝����閮剖��(���暺�嚗���芣�����銝����)
+            type: "scatter",
+            coordinateSystem: "geo",
+            geoIndex: 0,
+            symbol: "circle",
+            symbolSize: 20,
+            symbolOffset: [10, 10],
+            label: {
+              show: false,
+            },
+            /*data: currentData,*/
+            z: 2,
+          },
+          {
+            //蝺刻摩璅∪��摨�銝����閮剖��(icon嚗���芣�����銝����)
+            type: "scatter",
+            coordinateSystem: "geo",
+            geoIndex: 0,
+            symbolSize: 50,
+            label: {
+              formatter: "{b}",
+              position: "bottom",
+              show: true,
+              backgroundColor: "orange",
+            },
+            emphasis: {
+              label: {
+                show: true,
+                fontSize: "20",
+                fontWeight: "bold",
+                color: "yellow",
+              },
+            },
+            data: null,
+            z: 1,
+          },
+        ],
+      };
 
-    function setHotspotPoint(myDataList = []) {
-        getHopspotPoint(myDataList);
-    }
+      floChart.setOption(option);
 
-    onEvent("autodesk:click:sprite", "#forgeViewer", function (e, obj) {
+      if (
+        currentData != undefined &&
+        currentData != null &&
+        currentData.length > 0
+      ) {
+        resetData();
+      }
+
+      var ordPath = {
+        building_tag: pageAct.buiTag,
+        system_tag: pageAct.sysMainTag,
+      };
+      //myBaja.setSubscribeDevicesByBql(ordPath);
+      //myBaja.setSubscribeDevicesCallBack(subscribeCallBack);
+      let parentEle = null;
+      floChart.on("click", function (params) {
         forgeUnFocusAll();
         chartUnFocusAll();
-        let rect = $("#forgeViewer")[0].getBoundingClientRect();
-        let position = [rect.left + rect.width / 2, rect.top + rect.height / 4];
-        // console.log(position)
-        // let position = [obj.event.target.toolController.lastClickX, obj.event.target.toolController.lastClickY];
-        let devObj = obj.myData;
-        let name =
-            lightControl === "node" && pageAct.sysSubTag === "L1"
-                ? currentData.filter(
-                    (x) => x.device_node_guid == devObj.device_node_guid
-                )[0]?.device_node_full_name
-                : currentData.filter((x) => x.device_guid == devObj.device_guid)[0]
-                    ?.full_name;
-        devObj.full_name = name;
-        parentEle = crePosPopover(position, devObj);
-        $(parentEle).click();
+        if (params.componentType == "series") {
+          let data = params.data;
+          let rect = $("#floChart")[0].getBoundingClientRect();
+          let position = [
+            rect.left + rect.width / 2,
+            rect.top + rect.height / 4,
+          ];
+          // console.log(position)
+          // let position = [params.event.event.clientX+100, params.event.event.clientY-300];
+          data._dbId = data._dbId ?? "";
+          // currentData.find(
+          //   (cData) => cData.device_number === data.device_number
+          // ).forge_dbid;
+          parentEle = crePosPopover(position, data);
+          $(parentEle).click();
+        } else {
+          $(parentEle).YTTooltip("hide");
+        }
+      });
 
+      floChart.getZr().on("click", function (params) {
+        /*console.log("click", params);*/
+        var pixelPoint = [params.offsetX, params.offsetY];
+        var dataPoint = floChart.convertFromPixel({ geoIndex: 0 }, pixelPoint);
+
+        if (!(params?.target?.shape?.symbolType == "circle")) {
+          $(parentEle).YTTooltip("hide");
+        }
+
+        //temp_device_on_floor_map = [{
+        //    device_guid: selected_temp_device.device_guid,
+        //    device_full_name: selected_temp_device.device_full_name,
+        //    device_node_guid: selected_temp_device.device_node_guid ? selected_temp_device.device_node_guid : null,
+        //    device_node_full_name: selected_temp_device.device_node_full_name ? selected_temp_device.device_node_full_name : null,
+        //    status: selected_temp_device.status,
+        //    value: dataPoint
+        //}];
+
+        // currentData.push([dataPoint[0], dataPoint[1], 1]);
+        // floChart.setOption(option);
+      });
+
+      onEvent("autodesk:complete:sprite", "#forgeViewer", function (e, obj) {
+        console.log("Current", obj.myDataList);
         let option = floChart.getOption();
+
         option.series.forEach(function (series) {
-            series.data.forEach(function (point) {
-                if (pageAct.sysSubTag === "L1") {
-                    if (point.device_node_guid == devObj.device_node_guid) {
-                        point.symbolSize = 50;
-                    }
-                } else {
-                    if (point.device_guid == devObj.device_guid) {
-                        point.symbolSize = 50;
-                    }
-                }
+          (series.data ?? []).forEach(function (point) {
+            let dbid = obj.myDataList.filter(
+              (x) => x.device_number == point.device_number
+            )[0]?._dbId;
+            point._dbId = dbid;
+            // currentData.forEach(function (cData) {
+            //   console.log(cData.device_node_guid=== point.device_node_guid)
+            //   if (lightControl === "node" && pageAct.sysSubTag === "L1" && cData.device_node_guid == point.device_node_guid) {
+            //     cData._dbId = dbid;
+            //     cData.spriteDbid = dbid;
+            //     setForgeHotSpotColor(cData);
+            //   }
+            //   else if (cData.device_guid == point.device_guid) {
+            //     cData._dbId = dbid;
+            //     cData.spriteDbid = dbid;
+            //     setForgeHotSpotColor(cData);
+            //   }
+            // });
+            const cData = currentData.find((cur) => {
+              if (lightControl === "node" && pageAct.sysSubTag === "L1") {
+                if (cur.device_node_guid == point.device_node_guid) return cur;
+              } else if (cur.device_guid == point.device_guid) {
+                return cur;
+              }
             });
+            cData._dbId = dbid;
+            cData.spriteDbid = dbid;
+            // setForgeHotSpotColor(cData);
+          });
         });
         floChart.setOption(option);
-    });
 
-    onEvent("autodesk:clickOut:sprite", "#forgeViewer", function (e) {
-        $(parentEle).YTTooltip("hide");
-    });
+        subDevice();
+      });
+      //floChart.on('selectchanged', function (params) {
 
-    function forgeUnFocusAll() {
-        $.each(currentData, (idx, cData) => {
-            const eleDbId = cData._dbId;
-            if (alarmDbIdList.some((dbId) => dbId == eleDbId)) {
-                changeScaleForHotspot(eleDbId, false);
-                return;
-            } else {
-                // 3D ��梢��閫����
-                controlFocusHotspot(eleDbId, false);
+      //    console.log("selectchanged", params);
+      //    // currentData.push([dataPoint[0], dataPoint[1], 1]);
+      //    // floChart.setOption(option);
+
+      //    currentData = $.map(currentData, function (item) {
+      //        item.selected = false;
+      //        return item;
+      //    });
+
+      //    if (params.selected.length > 0) {
+      //        currentData[params.selected[0].seriesIndex - 1].selected = true;
+      //    }
+
+      //});
+
+      // floChart.getZr().on('mousewheel', function (params) {
+      //     console.log(params)
+      // })
+      floChart.on("georoam", function (params) {
+        var zoom = floChart.getOption().geo[0].zoom;
+        const option = floChart.getOption();
+        console.log("georoam", zoom);
+
+        if (zoom <= 1.5) {
+          /*ResetFloorMap();*/
+          floChart.setOption({
+            geo: {
+              roam: "scale",
+            },
+          });
+        } else {
+          floChart.setOption({
+            geo: {
+              roam: true,
+            },
+          });
+        }
+        if (zoom > zoomToggle) {
+          const currentImage = currentData.find(
+            ({ device_image }) => device_image
+          ).device_image;
+          option.series[1].data = option.series[0].data.map((d) => ({
+            ...d,
+            symbol:
+              "image://" + baseImgUrl + "/upload/device_icon/" + currentImage,
+          }));
+        } else {
+          option.series[1].data = [];
+        }
+        floChart.setOption(option);
+        // resetData();
+      });
+    }).fail(function () {
+      toast_warning("��亦�∟府璅�撅文�啣��");
+      floChart.clear();
+    });
+  }
+
+  //baja 閮���梯身���
+  function subDevice() {
+    console.log("subDevice ���憪�");
+
+    let option = floChart.getOption();
+    let floMyBaja = new subscriptionDevices();
+    var ordPath = {
+      area_tag: pageAct.AreaTag,
+      building_tag: pageAct.buiTag,
+      system_tag: pageAct.sysMainTag,
+      name_tag: pageAct.sysSubTag,
+      flo_tag: pageAct.floTag,
+    };
+    floMyBaja.setSubscribeDevicesByBql(ordPath);
+
+    // �����梢�����
+    let lightOnHotColorArr = [];
+    let lightOffHotColorArr = [];
+    // ������������
+    let deviceScatterNormalArr = [];
+    let deviceScatterCloseArr = [];
+    let deviceScatterErrorArr = [];
+    floMyBaja.setSubscribeDevicesCallBack(function (data) {
+      let matchDevice = currentData.filter(
+        (x) => x.device_number == data.device_number_full
+      )[0];
+      if (!matchDevice) {
+        $(loadEle).Loading("close");
+        return false;
+      }
+      //撠�閮���勗�澆����� subDeviceData
+      if (
+        subDeviceData.findIndex(
+          (x) => x.device_number == matchDevice.device_number
+        ) == -1
+      ) {
+        let obj = {};
+        obj.device_number = matchDevice.device_number;
+        obj.dbid = matchDevice.forge_dbid;
+        subDeviceData.push(obj);
+      }
+      let norDevPoiName = matchDevice.device_normal_point_name;
+      let cloDevPoiName = matchDevice.device_close_point_name;
+      let errDevPoiName = matchDevice.device_error_point_name;
+
+      if (data.point_name == "Temp" || data.point_name == "TEMP") {
+        heatMap?.changeTemp(
+          data.device_number_full,
+          !isNaN(parseInt(data.value)) ? parseInt(data.value) : 0
+        );
+        let devIdx = currentData.findIndex(
+          (x) => x.device_number == data.device_number_full
+        );
+        currentData[devIdx]._temp = !isNaN(parseInt(data.value))
+          ? parseInt(data.value)
+          : 0;
+      }
+      if (data.point_name == "SSC" && pageAct.sysSubTag === "L1") {
+        const lightOn = data.value.includes("true");
+        setLightOpenOrClose(lightOn, matchDevice.device_guid);
+        if (lightOn && matchDevice.spriteDbid) {
+          // setLightValues(matchDevice.device_guid, 200, 0xe1cf18);
+          // changeColorForHotspot(matchDevice.spriteDbid, null, lightOn);
+          if (
+            !lightOnHotColorArr.some(
+              ({ spriteDbid }) => spriteDbid === matchDevice.spriteDbid
+            )
+          ) {
+            lightOnHotColorArr.push(matchDevice);
+          }
+          lightOffHotColorArr = lightOffHotColorArr.filter(
+            (light) => light.spriteDbid !== matchDevice.spriteDbid
+          );
+          heatMap?.changeTemp(matchDevice.device_number, 40);
+        } else if (matchDevice.spriteDbid) {
+          if (
+            !lightOffHotColorArr.some(
+              ({ spriteDbid }) => spriteDbid === matchDevice.spriteDbid
+            )
+          ) {
+            lightOffHotColorArr.push(matchDevice);
+          }
+          lightOnHotColorArr = lightOnHotColorArr.filter(
+            (light) => light.spriteDbid !== matchDevice.spriteDbid
+          );
+          heatMap?.changeTemp(matchDevice.device_number, 0);
+        }
+      }
+
+      if (
+        data.point_name == errDevPoiName &&
+        data.value !== matchDevice.device_error_point_value &&
+        alarmDbIdList.some(
+          ({ device_number }) => matchDevice.device_number === device_number
+        )
+      ) {
+        alarmDbIdList = alarmDbIdList.filter(
+          ({ device_number }) => matchDevice.device_number === device_number
+        );
+      } else if (
+        data.point_name == errDevPoiName &&
+        data.value == matchDevice.device_error_point_value &&
+        !alarmDbIdList.some(
+          ({ device_number }) => matchDevice.device_number === device_number
+        )
+      ) {
+        $(`#${matchDevice.device_number}_status`)
+          .attr("data-light-type", "error")
+          .data("light-type", "error");
+        alarmDbIdList.push(matchDevice);
+      }
+
+      if (
+        data.point_name == norDevPoiName &&
+        (data.value == matchDevice.device_normal_point_value || norDevPoiName === errDevPoiName) &&
+        !deviceScatterNormalArr.some(
+          ({ device_number }) => data.device_number_full === device_number
+        )
+      ) {
+        //憿舐內甇�撣貊�����
+        $(`#${matchDevice.device_number}_status`)
+          .attr("data-light-type", "normal")
+          .data("light-type", "normal");
+        deviceScatterNormalArr.push(matchDevice);
+        deviceScatterCloseArr = deviceScatterCloseArr.filter(
+          (device) => device.spriteDbid !== matchDevice.spriteDbid
+        );
+      } else if (
+        data.point_name == cloDevPoiName &&
+        data.value == matchDevice.device_close_point_value &&
+        !deviceScatterCloseArr.some(
+          ({ device_number }) => data.device_number_full === device_number
+        )
+      ) {
+        $(`#${matchDevice.device_number}_status`)
+          .attr("data-light-type", "close")
+          .data("light-type", "close");
+        deviceScatterCloseArr.push(matchDevice);
+        deviceScatterNormalArr = deviceScatterNormalArr.filter(
+          (device) => device.spriteDbid !== matchDevice.spriteDbid
+        );
+      }
+
+      if (pageAct.sysSubTag === "L1" && lightControl === "node") {
+        alarmDbIdList = alarmDbIdList.filter(
+          ({ device_node_guid }) =>
+            device_node_guid !== undefined && device_node_guid !== null
+        );
+
+        deviceScatterNormalArr = deviceScatterNormalArr.filter(
+          ({ device_node_guid }) =>
+            device_node_guid !== undefined && device_node_guid !== null
+        );
+        deviceScatterCloseArr = deviceScatterCloseArr.filter(
+          ({ device_node_guid }) =>
+            device_node_guid !== undefined && device_node_guid !== null
+        );
+
+        lightOnHotColorArr = lightOnHotColorArr.filter(
+          ({ device_node_guid }) =>
+            device_node_guid !== undefined && device_node_guid !== null
+        );
+        lightOffHotColorArr = lightOffHotColorArr.filter(
+          ({ device_node_guid }) =>
+            device_node_guid !== undefined && device_node_guid !== null
+        );
+      }
+
+      if (
+        deviceScatterCloseArr.length + deviceScatterNormalArr.length ===
+        option.series[0].data.length ||
+        deviceScatterCloseArr.length +
+        deviceScatterNormalArr.length +
+        alarmDbIdList.length ===
+        option.series[0].data.length
+      ) {
+        deviceScatterNormalArr.length &&
+          deviceScatterNormalArr.forEach((device) => {
+            const cur = option.series[0].data.find(
+              ({ device_number }) => device_number === device.device_number
+            );
+
+            const normalColor = currentData.find(
+              ({ device_number }) => device_number === device.device_number
+            ).device_normal_color;
+            if (cur) {
+              cur.itemStyle = { color: normalColor };
             }
-        });
-    }
+          });
+
+        changeColorForHotspot(
+          deviceScatterNormalArr.map(({ spriteDbid }) => spriteDbid),
+          null,
+          true
+        );
+
+        deviceScatterCloseArr.length &&
+          deviceScatterCloseArr.forEach((device) => {
+            const cur = option.series[0].data.find(
+              ({ device_number }) => device_number === device.device_number
+            );
+            const closeColor = currentData.find(
+              ({ device_number }) => device_number === device.device_number
+            ).device_close_color;
+            if (cur) {
+              cur.itemStyle = { color: closeColor };
+            }
+          });
+
+        changeColorForHotspot(
+          deviceScatterCloseArr.map(({ spriteDbid }) => spriteDbid),
+          null,
+          false
+        );
+
+        alarmDbIdList.length &&
+          alarmDbIdList.forEach((device) => {
+            const cur = option.series[0].data.find(
+              ({ device_number }) => device_number === device.device_number
+            );
+            const errColor = currentData.find(
+              ({ device_number }) => device_number === device.device_number
+            )?.device_error_color;
+
+            if (cur) {
+              cur.itemStyle = { color: errColor };
+            }
+          });
+        changeColorForHotspot(
+          alarmDbIdList.map(({ spriteDbid }) => spriteDbid),
+          "error",
+          false
+        );
 
-    function chartUnFocusAll() {
-        let option = floChart.getOption();
-        option.series.forEach(function (series) {
-            series.data.forEach(function (point) {
-                point.symbolSize = 20;
-            });
-        });
         floChart.setOption(option);
-    }
+        $(loadEle).Loading("close");
+      }
+    });
 
-    // 閫���� series ������
-    function chartUnFocus(ele) {
-        let devGuid = $(ele).data("id");
-        let option = floChart.getOption();
-        option.series.forEach(function (series) {
-            series.data.forEach(function (point) {
-                if (point.device_guid == devGuid) {
-                    point.symbolSize = 20;
+    floMyBaja.setSubscribeDeviceEndCallBack(function (data) {
+      endPageLoading();
+      if (
+        pageAct.sysSubTag !== "M12" &&
+        data.findIndex(
+          (x) => x.point_name == "Temp" || x.point_name == "TEMP"
+        ) != -1
+      ) {
+        // 憿舐內皞怠漲璇�
+        showHeat("[name=forgeHeatBar]");
+      }
+    });
+  }
+
+  function drawHeatBar() {
+    $("#forgeHeatBarDiv").html(setTopHeatBar());
+  }
+
+  // ��餅０ 3D 雿�蝵桀�����
+  function set3DElevPos(viewer) {
+    let nodeIds = allElevDevList
+      .filter((x) => !isNaN(parseInt(x.forge_dbid)))
+      .map((x) => {
+        return { devNum: x.device_number, nodeId: parseInt(x.forge_dbid) };
+      });
+
+    $.each(nodeIds, (idx, item) => {
+      elev3DBind[item.devNum] = item.nodeId;
+    });
+    nodeIds = nodeIds.map((x) => x.nodeId);
+    $.each(nodeIds, function (idx, node) {
+      let options = {
+        element: $("#forgeViewer"),
+        viewer: viewer,
+        nodeId: node,
+        floorHeight: elev3DOption.floorHeight ?? [],
+        inited: function () { },
+      };
+      let elevator3DObj = new elevator3D(options);
+      let devNum = Object.keys(elev3DBind).filter(
+        (x) => elev3DBind[x] == node
+      )[0];
+      let subData = subSeviceData.filter((x) => x.device_number == devNum)[0];
+
+      if (elev3DObj.filter((x) => x.nodeId == node).length == 0) {
+        elev3DObj.push({ id: devNum, nodeId: node, obj: elevator3DObj });
+      }
+
+      if (subData) {
+        let elevObj = elev3DObj.filter((x) => x.nodeId == node)[0];
+        if (!elevObj.id) {
+          elevObj.id = devNum;
+        }
+        elevObj.obj = Object.assign(elevObj, elevator3DObj ?? {});
+        elevObj.obj.init(function () {
+          let frags = elevObj.obj.fragProxys.filter((x) => x.nodeId == node);
+
+          frags.forEach((fragProxy) => {
+            fragProxy.frag.position.z =
+              elev3DOption.floorHeight.filter(
+                (x) => x.floor == subData["CP"]
+              )[0]?.height ?? 0;
+            fragProxy.frag.updateAnimTransform();
+          });
+          elevObj.obj.viewer.impl.sceneUpdated(true);
+        });
+      }
+    });
+  }
+
+  // ��餅０ 3D Option 閮剔蔭
+  function set3DElevOpt(data) {
+    let devNumArr = data
+      .map((x) => {
+        return {
+          devNum: x.device_number_full,
+          priority: allElevDevList.filter(
+            (y) => y.device_number == x.device_number_full
+          )[0]?.priority,
+        };
+      })
+      .DistinctBy("devNum");
+    devNumArr = devNumArr.oSort("priority");
+    $.each(devNumArr, (idx, devObj) => {
+      devNum = devObj.devNum;
+      let subData = subSeviceData.filter((x) => x.device_number == devNum)[0];
+
+      if (subData) {
+        //// 撌血�� 3D ��餅０ nodeID ��� device_number match
+        //if (Object.keys(elev3DBind).indexOf(devNum) == -1 && viewer3DNodeIds.length != 0) {
+        //    elev3DBind[devNum] = viewer3DNodeIds[Object.keys(elev3DBind).length];
+        //}
+        // 撌血�� 3D ��餅０ Viewer Option 閮剔蔭
+        /*elev3DOption.nodes = Object.keys(elev3DBind).map(x => elev3DBind[x]);*/
+        elev3DOption.nodeId = elev3DBind[devNum];
+        elev3DOption.floorHeight = floList.map((x) => {
+          return { floor: x };
+        });
+        elev3DOption.floorHeight.forEach((floObj, idx) => {
+          if (floObj.floor.startsWith("B")) {
+            let floor = parseInt(floObj.floor.split("B")[1].split("F")[0]);
+            floObj.height = floor * -13;
+          } else {
+            let floor = parseInt(floObj.floor.split("F")[0]);
+            if (floor == 1) {
+              floObj.height = 0;
+            } else if (floor == 2) {
+              floObj.height = 14.75;
+            } else {
+              floObj.height = 14.75 + (floor - 2) * 9.75;
+            }
+          }
+        });
+
+        if (elev3DObj.length != 0) {
+          let elevObj = elev3DObj.filter(
+            (x) => x.nodeId == elev3DBind[devNum]
+          )[0];
+          if (!elevObj.id) {
+            elevObj.id = devNum;
+          }
+          elevObj.obj = Object.assign(elevObj.obj, elev3DOption);
+          elevObj.obj.init(function () {
+            let frags = elevObj.obj.fragProxys.filter(
+              (x) => x.nodeId == elev3DBind[devNum]
+            );
+
+            frags.forEach((fragProxy) => {
+              fragProxy.frag.position.z =
+                elev3DOption.floorHeight.filter(
+                  (x) => x.floor == subData["CP"]
+                )[0]?.height ?? 0;
+              fragProxy.frag.updateAnimTransform();
+            });
+            elevObj.obj.viewer.impl.sceneUpdated(true);
+          });
+        }
+      }
+    });
+  }
+
+  // //閮���梯身�����������喳�潘��銝血����啣�典��霈����
+  // function subscribeCallBack(change_device, is_need_reset = false) {
+  //     if (change_device != undefined && change_device != null) {
+  //         var target_device = allDeviceRowData.filter(x => x.device_number == change_device.device_number)[0];
+
+  //         if (target_device == undefined || target_device == null) {
+  //             //��啣��
+  //             obj = {
+  //                 device_number: change_device.device_number,
+  //                 points: [{
+  //                     name: change_device.point_name,
+  //                     value: change_device.value
+  //                 }]
+  //             };
+
+  //             allDeviceRowData.push(obj);
+  //         }
+  //         else {
+  //             selected_device_point = target_device.points.find(x => x.name == change_device.point_name);
+  //             if (selected_device_point != null) {
+  //                 selected_device_point.value = change_device.value;
+  //             }
+  //             else {
+  //                 obj = {
+  //                     name: change_device.point_name,
+  //                     value: change_device.value
+  //                 }
+  //                 target_device.points.push(obj);
+  //             }
+  //         }
+
+  //         if (is_need_reset) {
+  //             resetData();
+  //         }
+  //     }
+  // }
+
+  // ���閮剖像��Ｗ��閮剖��鞈����
+  function resetData() {
+    const scatter_symbol_convertData = function (data, zoom) {
+      //甇�撣詻�������������七CVT(���暺�)
+      let res = [],
+        temp = [];
+      data.forEach(function (item, index) {
+        if (
+          global_emergency_alarm_device_number != undefined &&
+          global_emergency_alarm_device_number != null
+        ) {
+          if (
+            global_emergency_alarm_device_number.findIndex(
+              (x) => x.device_number == item.device_number
+            ) < 0 &&
+            item.device_system_category_layer3 != "C"
+          ) {
+            //憒�������摮�蝭�暺�嚗������芷��撠�摮�蝭�暺����雿�
+            if (
+              lightControl === "node" &&
+              item.device_nodes != undefined &&
+              item.device_nodes != null &&
+              item.device_nodes.length > 0
+            ) {
+              item.device_nodes.forEach(function (item_node, item_node_index) {
+                //瘛餃����嗥��暺���賊��鞈�閮�
+                item_node.device_system_category_layer3 =
+                  item.device_system_category_layer3;
+                item_node.device_normal_color = item.device_normal_color;
+                item_node.device_close_color = item.device_close_color;
+
+                //��斗�瑞�嗥��暺�������
+                var device_index = allDeviceRowData.findIndex(
+                  (x) => x.device_number == item.device_number
+                );
+                var temp_point_value;
+                if (device_index > -1) {
+                  if (
+                    item.device_normal_point_name != null ||
+                    item.device_close_point_name != null
+                  ) {
+                    //��嗅�嗡葉point name 銝���槃ull������瘜�
+                    if (item.device_normal_point_name != null) {
+                      temp_point_value = allDeviceRowData[
+                        device_index
+                      ].points.find(
+                        (x) => x.name == item.device_normal_point_name
+                      );
+                      temp_point_value =
+                        allDeviceRowData[device_index].points[
+                        item.device_normal_point_name
+                        ];
+                      if (temp_point_value == item.device_normal_point_value) {
+                        item_node.device_color = item.device_normal_color;
+                      }
+                    }
+                    if (item.device_close_point_name != null) {
+                      temp_point_value =
+                        allDeviceRowData[device_index].points[
+                        item.device_close_point_name
+                        ];
+                      if (temp_point_value == item.device_close_point_value) {
+                        item_node.device_color = item.device_close_color;
+                      }
+                    }
+                  } else {
+                    if (item.device_normal_point_name == "ER") {
+                      temp_point_value =
+                        allDeviceRowData[device_index].points[
+                        item.device_normal_point_name
+                        ];
+                      if (temp_point_value == "true") {
+                        item_node.device_color = item.device_normal_color;
+                      } else {
+                        temp_point_value =
+                          allDeviceRowData[device_index].points[
+                          item.device_close_point_name
+                          ];
+                        if (temp_point_value == item.device_close_point_value) {
+                          item_node.device_color = item.device_close_color;
+                        }
+                      }
+                    } else if (item.device_close_point_name == "ER") {
+                      temp_point_value =
+                        allDeviceRowData[device_index].points[
+                        item.device_close_point_name
+                        ];
+                      if (temp_point_value == "true") {
+                        item_node.device_color = item.device_close_color;
+                      } else {
+                        temp_point_value =
+                          allDeviceRowData[device_index].points[
+                          item.device_normal_point_name
+                          ];
+                        if (
+                          temp_point_value == item.device_normal_point_value
+                        ) {
+                          item_node.device_color = item.device_normal_color;
+                        }
+                      }
+                    } else {
+                      temp_point_value =
+                        allDeviceRowData[device_index].points[
+                        item.device_normal_point_name
+                        ];
+                      if (temp_point_value == item.device_normal_point_value) {
+                        item_node.device_color = item.device_normal_color;
+                      } else if (
+                        temp_point_value == item.device_close_point_value
+                      ) {
+                        item_node.device_color = item.device_close_color;
+                      }
+                    }
+                  }
                 }
-            });
+                // temp.push(item_node);
+              });
+            } else {
+              var device_index = allDeviceRowData.findIndex(
+                (x) => x.device_number == item.device_number
+              );
+              if (device_index > -1) {
+                if (
+                  item.device_normal_point_name != null ||
+                  item.device_close_point_name != null
+                ) {
+                  //��嗅�嗡葉point name �����槃ull������瘜�
+                  if (item.device_normal_point_name != null) {
+                    // temp_point_value = allDeviceRowData[device_index].points[item.device_normal_point_name];
+                    temp_point_value = allDeviceRowData[
+                      device_index
+                    ].points.find(
+                      (x) => x.name == item.device_normal_point_name
+                    ).value;
+                    if (temp_point_value == item.device_normal_point_value) {
+                      item.device_color = item.device_normal_color;
+                    }
+                  }
+                  if (item.device_close_point_name != null) {
+                    // temp_point_value = allDeviceRowData[device_index].points[item.device_close_point_name];
+                    temp_point_value = allDeviceRowData[
+                      device_index
+                    ].points.find(
+                      (x) => x.name == item.device_close_point_name
+                    ).value;
+                    if (temp_point_value == item.device_close_point_value) {
+                      item.device_color = item.device_close_color;
+                    }
+                  }
+                } else {
+                  if (item.device_normal_point_name == "ER") {
+                    // temp_point_value = allDeviceRowData[device_index].points[item.device_normal_point_name];
+                    temp_point_value = allDeviceRowData[
+                      device_index
+                    ].points.find(
+                      (x) => x.name == item.device_normal_point_name
+                    ).value;
+                    if (temp_point_value == "true") {
+                      item.device_color = item.device_normal_color;
+                    } else {
+                      // temp_point_value = allDeviceRowData[device_index].points[item.device_close_point_name];
+                      temp_point_value = allDeviceRowData[
+                        device_index
+                      ].points.find(
+                        (x) => x.name == item.device_close_point_name
+                      ).value;
+                      if (temp_point_value == item.device_close_point_value) {
+                        item.device_color = item.device_close_color;
+                      }
+                    }
+                  } else if (item.device_close_point_name == "ER") {
+                    // temp_point_value = allDeviceRowData[device_index].points[item.device_close_point_name];
+                    temp_point_value = allDeviceRowData[
+                      device_index
+                    ].points.find(
+                      (x) => x.name == item.device_close_point_name
+                    ).value;
+                    if (temp_point_value == "true") {
+                      item.device_color = item.device_close_color;
+                    } else {
+                      // temp_point_value = allDeviceRowData[device_index].points[item.device_normal_point_name];
+                      temp_point_value = allDeviceRowData[
+                        device_index
+                      ].points.find(
+                        (x) => x.name == item.device_normal_point_name
+                      ).value;
+                      if (temp_point_value == item.device_normal_point_value) {
+                        item.device_color = item.device_normal_color;
+                      }
+                    }
+                  } else {
+                    // temp_point_value = allDeviceRowData[device_index].points[item.device_normal_point_name];
+                    temp_point_value = allDeviceRowData[
+                      device_index
+                    ].points.find(
+                      (x) => x.name == item.device_normal_point_name
+                    ).value;
+                    if (temp_point_value == item.device_normal_point_value) {
+                      item.device_color = item.device_normal_color;
+                    } else if (
+                      temp_point_value == item.device_close_point_value
+                    ) {
+                      item.device_color = item.device_close_color;
+                    }
+                  }
+                }
+              }
+              item.zoom = zoom;
+              temp.push(item);
+            }
+          }
+        }
+      });
+
+      // let temp = data.filter(function (item, index) {
+      //     if (global_emergency_alarm_device_number != undefined && global_emergency_alarm_device_number != null) {
+      //         return global_emergency_alarm_device_number.findIndex(x => x.device_number == item.device_number) < 0 && item.device_system_category_layer3 != "C";
+      //     } else {
+      //         return [];
+      //     }
+      // });
+      let option = floChart.getOption();
+      temp.forEach(function (tempData) {
+        let oldTarObj = option.series[0]?.data?.filter(
+          (x) => x.device_number == tempData.device_number
+        )[0];
+        if (oldTarObj) {
+          tempData = Object.assign(tempData, oldTarObj);
+        }
+      });
+      temp.map(function (item) {
+        var obj = {
+          device_guid: item.device_guid,
+          device_number: item.device_number,
+          full_name: item.full_name ? item.full_name : null,
+          device_node_guid: item.device_node_guid
+            ? item.device_node_guid
+            : null,
+          device_node_full_name: item.device_node_full_name
+            ? item.device_node_full_name
+            : null,
+          device_system_category_layer3: item.device_system_category_layer3
+            ? item.device_system_category_layer3
+            : null,
+          status: item.status,
+          value: item.value,
+          deviceItems: item.deviceItems,
+          deviceURL: item.deviceURL,
+          _dbId: item._dbId ?? null,
+        };
+
+        obj.itemStyle = {
+          color: item.device_color || item.device_close_color,
+        };
+
+        res.push(obj);
+      });
+
+      return res;
+    };
+
+    const scatter_icon_convertData = function (data) {
+      //甇�撣詻��������(icon)
+      let res = [],
+        temp = [];
+
+      data.forEach(function (item, index) {
+        if (
+          global_emergency_alarm_device_number != undefined &&
+          global_emergency_alarm_device_number != null
+        ) {
+          if (
+            global_emergency_alarm_device_number.findIndex(
+              (x) => x.device_number == item.device_number
+            ) < 0 &&
+            item.device_system_category_layer3 != "C"
+          ) {
+            //憒�������摮�蝭�暺�嚗������芷��撠�摮�蝭�暺����雿�
+            if (
+              lightControl === "node" &&
+              item.device_nodes != undefined &&
+              item.device_nodes != null &&
+              item.device_nodes.length > 0
+            ) {
+              item.device_nodes.forEach(function (item_node, item_node_index) {
+                //瘛餃����嗥��暺���賊��鞈�閮�
+                item_node.device_system_category_layer3 =
+                  item.device_system_category_layer3;
+                item_node.device_normal_color = item.device_normal_color;
+                item_node.device_image = item.device_image;
+                temp.push(item_node);
+              });
+            } else {
+              temp.push(item);
+            }
+          }
+        }
+      });
+
+      temp = data.filter(function (item, index) {
+        if (
+          global_emergency_alarm_device_number != undefined &&
+          global_emergency_alarm_device_number != null
+        ) {
+          return (
+            global_emergency_alarm_device_number.findIndex(
+              (x) => x.device_number == item.device_number
+            ) < 0 && item.device_system_category_layer3 != "C"
+          );
+        } else {
+          return [];
+        }
+      });
+
+      temp.map(function (item) {
+        var obj = {
+          device_guid: item.device_guid,
+          device_number: item.device_number,
+          full_name: item.full_name ? item.full_name : null,
+          device_node_guid: item.device_node_guid
+            ? item.device_node_guid
+            : null,
+          device_node_full_name: item.device_node_full_name
+            ? item.device_node_full_name
+            : null,
+          device_system_category_layer3: item.device_system_category_layer3
+            ? item.device_system_category_layer3
+            : null,
+          status: item.status,
+          symbol:
+            "image://" +
+            baseImgUrl +
+            "/upload/device_icon/" +
+            item.device_image,
+          value: item.value,
+          deviceItems: item.deviceItems,
+          deviceURL: item.deviceURL,
+        };
+
+        if (item.selected) {
+          obj.symbolSize = 50;
+        }
+        obj.itemStyle = {
+          color: item.device_colse_color,
+        };
+        res.push(obj);
+      });
+
+      return res;
+    };
+
+    const scatter_error_convertData = function (data) {
+      //��啣虜(���暺�)
+      let res = [],
+        temp = [];
+
+      data.forEach(function (item, index) {
+        if (
+          global_emergency_alarm_device_number != undefined &&
+          global_emergency_alarm_device_number != null
+        ) {
+          if (
+            global_emergency_alarm_device_number.findIndex(
+              (x) => x.device_number == item.device_number
+            ) > -1 &&
+            item.device_system_category_layer3 != "C"
+          ) {
+            //憒�������摮�蝭�暺�嚗������芷��撠�摮�蝭�暺����雿�
+            if (
+              lightControl === "node" &&
+              item.device_nodes != undefined &&
+              item.device_nodes != null &&
+              item.device_nodes.length > 0
+            ) {
+              item.device_nodes.forEach(function (item_node, item_node_index) {
+                //瘛餃����嗥��暺���賊��鞈�閮�
+                item_node.device_system_category_layer3 =
+                  item.device_system_category_layer3;
+                item_node.device_error_color = item.device_error_color;
+                temp.push(item_node);
+              });
+            } else {
+              temp.push(item);
+            }
+          }
+        }
+      });
+
+      // if (global_emergency_alarm_device_number != undefined && global_emergency_alarm_device_number != null) {
+      //     temp = data.filter(function (item, index) {
+      //         return global_emergency_alarm_device_number.findIndex(x => x.device_number == item.device_number) > -1 && item.device_system_category_layer3 != "C";
+      //     });
+      // }
+
+      temp.map(function (item) {
+        var obj = {
+          device_guid: item.device_guid,
+          device_number: item.device_number,
+          full_name: item.full_name ? item.full_name : null,
+          device_node_guid: item.device_node_guid
+            ? item.device_node_guid
+            : null,
+          device_node_full_name: item.device_node_full_name
+            ? item.device_node_full_name
+            : null,
+          device_system_category_layer3: item.device_system_category_layer3
+            ? item.device_system_category_layer3
+            : null,
+          status: item.status,
+          value: item.value,
+          deviceItems: item.deviceItems,
+          deviceURL: item.deviceURL,
+        };
+        console.log("��啣虜", item.device_color);
+        obj.itemStyle = { color: item.device_error_color };
+
+        res.push(obj);
+      });
+
+      return res;
+    };
+
+    const scatter_error_icon_convertData = function (data) {
+      //��啣虜(icon)
+      let res = [],
+        temp = [];
+
+      data.forEach(function (item, index) {
+        if (
+          global_emergency_alarm_device_number != undefined &&
+          global_emergency_alarm_device_number != null
+        ) {
+          if (
+            global_emergency_alarm_device_number.findIndex(
+              (x) => x.device_number == item.device_number
+            ) > -1 &&
+            item.device_system_category_layer3 != "C"
+          ) {
+            //憒�������摮�蝭�暺�嚗������芷��撠�摮�蝭�暺����雿�
+            if (
+              lightControl === "node" &&
+              item.device_nodes != undefined &&
+              item.device_nodes != null &&
+              item.device_nodes.length > 0
+            ) {
+              item.device_nodes.forEach(function (item_node, item_node_index) {
+                //瘛餃����嗥��暺���賊��鞈�閮�
+                item_node.device_system_category_layer3 =
+                  item.device_system_category_layer3;
+                item_node.device_error_color = item.device_error_color;
+                item_node.device_image = item.device_image;
+                temp.push(item_node);
+              });
+            } else {
+              temp.push(item);
+            }
+          }
+        }
+      });
+
+      if (
+        global_emergency_alarm_device_number != undefined &&
+        global_emergency_alarm_device_number != null
+      ) {
+        temp = data.filter(function (item, index) {
+          return (
+            global_emergency_alarm_device_number.findIndex(
+              (x) => x.device_number == item.device_number
+            ) > -1 && item.device_system_category_layer3 != "C"
+          );
         });
-        floChart.setOption(option);
+      }
+
+      temp.map(function (item) {
+        var obj = {
+          device_guid: item.device_guid,
+          device_number: item.device_number,
+          full_name: item.full_name ? item.full_name : null,
+          device_node_guid: item.device_node_guid
+            ? item.device_node_guid
+            : null,
+          device_node_full_name: item.device_node_full_name
+            ? item.device_node_full_name
+            : null,
+          device_system_category_layer3: item.device_system_category_layer3
+            ? item.device_system_category_layer3
+            : null,
+          status: item.status,
+          symbol:
+            "image://" +
+            baseImgUrl +
+            "/upload/device_icon/" +
+            item.device_image,
+          value: item.value,
+          deviceItems: item.deviceItems,
+          deviceURL: item.deviceURL,
+        };
+
+        res.push(obj);
+      });
+
+      return res;
+    };
+
+    const scatter_cctv_convertData = function (data) {
+      //CCTV
+      let res = [];
+      let temp = data.filter(function (item, index) {
+        return item.device_system_category_layer3 == "C";
+      });
+
+      temp.map(function (item) {
+        var obj = {
+          device_guid: item.device_guid,
+          device_number: item.device_number,
+          full_name: item.full_name,
+          device_system_category_layer3: item.device_system_category_layer3,
+          device_ip: item.device_ip,
+          device_port: item.device_port,
+          status: item.status,
+          symbol:
+            "image://" +
+            str_location_url +
+            "/upload/device_icon/" +
+            item.device_image,
+          value: item.value,
+        };
+
+        res.push(obj);
+      });
+
+      return res;
+    };
+
+    if (!floChart.getOption()) {
+      return;
     }
+
+    var zoom = 0;
+    if (floChart.getOption().geo && floChart.getOption().geo.length > 0) {
+      zoom = floChart.getOption().geo[0].zoom;
+    }
+    if (zoom <= zoomToggle) {
+      floChart.setOption({
+        series: [
+          {
+            symbolOffset: [0, 0],
+            data: scatter_symbol_convertData(currentData), //甇�撣詻��������(���暺�)
+          },
+          {
+            data: [], //甇�撣詻��������(icon)
+          },
+          {
+            symbolOffset: [0, 0],
+            data: scatter_error_convertData(currentData), //��啣虜(���暺�)
+          },
+          {
+            data: [], //��啣虜(icon)
+          },
+          {
+            data: scatter_cctv_convertData(currentData), //CCTV
+          },
+        ],
+      });
+    } else {
+      floChart.setOption({
+        series: [
+          {
+            symbolOffset: [10, 10],
+
+            data: scatter_symbol_convertData(currentData, zoom), //甇�撣詻��������(���暺�)
+          },
+          {
+            data: scatter_icon_convertData(currentData), //甇�撣詻��������(icon)
+          },
+          {
+            symbolOffset: [10, 10],
+            data: scatter_error_convertData(currentData), //��啣虜(���暺�)
+          },
+          {
+            data: scatter_error_icon_convertData(currentData), //��啣虜(icon)
+          },
+          {
+            data: scatter_cctv_convertData(currentData), //CCTV
+          },
+        ],
+      });
+    }
+  }
+
+  function getNextFloor(floGuid = null) {
+    let url = baseApiUrl + "/api/Device/GetNextFloor";
+    objSendData.Data = { floor_guid: floGuid, building_tag: pageAct.buiTag };
+    let result = "";
+    ytAjax = new YourTeam.Ajax(
+      url,
+      objSendData,
+      function (res) {
+        if (!res || res.code != "0000" || !res.data) {
+        } else {
+          result = res.data?.full_name;
+        }
+      },
+      null,
+      "POST"
+    ).send();
+
+    return result;
+  }
+
+  // show 3D 璅∪��
+  function show3DModel(urn) {
+    launchViewerForHotspot(urn, (viewer, nodeIds) => {
+      // ��梯�� toolbar
+      document.querySelector("#guiviewer3d-toolbar").style.display = "none";
+      let nextFloor = getNextFloor(pageAct.floGuid);
+      let curFloTag = pageAct.floTag;
+
+      if (!nextFloor) {
+        toast_warning("頞���箸��撅斤�����");
+        return;
+      }
+
+      if (curFloTag?.startsWith("U")) {
+        curFloTag = curFloTag.split("U")[1];
+      }
+      if (nextFloor?.startsWith("U")) {
+        nextFloor = nextFloor.split("U")[1];
+      }
+
+      getLevelsData(curFloTag, nextFloor, function () {
+        viewer.model.search(
+          "憭抵�望��",
+          (nodeIds) => {
+            // console.log("2",nodeIds)
+            viewer.hide(nodeIds);
+          },
+          (e) => {
+            console.log(e);
+          }
+        );
+      });
+
+      setHeatMap();
+
+      if (
+        (pageAct.sysSubTag == "M12" || pageAct.sysSubTag == "ELEV") &&
+        elevatorShow
+      ) {
+        let elevOption = {
+          viewer: viewer,
+          ordPath: {
+            area_tag: pageAct.AreaTag,
+            building_tag: pageAct.buiTag,
+          },
+        };
+        // ��餅０蝘餃��閮���梁��摨�頛����
+        let forge3DElev = new Forge3DElevFull(elevOption);
+        forge3DElev.bajaEndCallback = function () {
+          endPageLoading();
+        };
+        forge3DElev.init();
+      }
+    });
+  }
+
+  function setHeatMap() {
+    if (pageAct.sysSubTag !== "M12") {
+      devices = currentData.map((x) => {
+        return {
+          roomDbId: !isNaN(parseInt(x.room_dbid)) ? parseInt(x.room_dbid) : -1,
+          id: x.device_number,
+          position: isJSON(x.device_coordinate_3d)
+            ? JSON.parse(x.device_coordinate_3d)
+            : {}, // x: 0, y: 25, z: -2.5      (3.35, -4.81, 12.88
+          sensorTypes: ["temperature", "humidity"],
+        };
+      });
+
+      let option = {
+        devices: devices,
+      };
+
+      heatMap = new ADHeatMaps(option);
+      heatMap.onComplete = () => {
+        $.each(currentData, (idx, dev) => {
+          heatMap.changeTemp(dev.device_number, dev._temp || 0);
+        });
+      };
+    }
+    if (pageAct.sysSubTag === "M12" && !elevatorShow) {
+      let sensorObjs = [];
+      addHotPoint(viewer);
+      Forge3DSensor.sensorTimes = 0;
+      sensorObjs = currentData.map((device) => {
+        Forge3DSensor.sensorTimes++;
+        return new Forge3DSensor({
+          viewer: viewer,
+          ordPath: {
+            area_tag: pageAct.AreaTag,
+            building_tag: pageAct.buiTag,
+          },
+          selector: "#forgeViewer",
+          elevCb: elevatorShow
+            ? () => {
+              let elevOption = {
+                selector: "#forgeViewer",
+                viewer: viewer,
+                ordPath: {
+                  area_tag: pageAct.AreaTag,
+                  building_tag: pageAct.buiTag,
+                },
+                sensorObjs,
+              };
+
+              // ��餅０蝘餃��閮���梁��摨�頛����
+              let forge3DElev = new Forge3DElevFull(elevOption);
+              forge3DElev.bajaEndCallback = function () {
+                endPageLoading();
+              };
+              forge3DElev.init();
+            }
+            : null,
+          curDevice: {
+            ...device,
+            roomDbId: !isNaN(parseInt(device.room_dbid))
+              ? parseInt(device.room_dbid)
+              : -1,
+            id: device.device_number,
+            position: isJSON(device.device_coordinate_3d)
+              ? JSON.parse(device.device_coordinate_3d)
+              : {}, // x: 0, y: 25, z: -2.5      (3.35, -4.81, 12.88
+            temp: 25,
+            forge_dbid: parseInt(device.forge_dbid),
+          },
+          deviceList: currentData.map((d) => ({
+            ...d,
+            roomDbId: !isNaN(parseInt(d.room_dbid))
+              ? parseInt(d.room_dbid)
+              : -1,
+            id: d.device_number,
+            position: isJSON(d.device_coordinate_3d)
+              ? JSON.parse(d.device_coordinate_3d)
+              : {}, // x: 0, y: 25, z: -2.5      (3.35, -4.81, 12.88
+            temp: 25,
+            forge_dbid: parseInt(d.forge_dbid),
+          })),
+        });
+      });
+    }
+  }
+
+  function getHotspotPoint(callback = null) {
+    let url = baseApiUrl + "/api/GetDevForCor";
+    let sendData = {
+      device_area_tag: pageAct.AreaTag,
+      device_building_tag: pageAct.buiTag,
+      device_system_tag: pageAct.sysMainTag,
+      device_name_tag: pageAct.sysSubTag,
+      device_floor_tag: pageAct.floTag,
+    };
+    objSendData.Data = sendData;
+    ytAjax = new YourTeam.Ajax(
+      url,
+      objSendData,
+      function (res) {
+        if (!res || res.code != "0000" || !res.data) {
+        } else {
+          let myDataList = [];
+          $.each(res.data, (idx, data) => {
+            if (lightControl == "node" && data.device_nodes.length > 0) {
+              data.device_nodes.forEach((node) => {
+                if (
+                  node.device_node_coordinate_3D != null &&
+                  isJSON(node.device_node_coordinate_3D)
+                ) {
+                  myDataList.push({
+                    ...node,
+                    position: JSON.parse(node.device_node_coordinate_3D),
+                  });
+                }
+              });
+            } else if (
+              data.device_coordinate_3d != null &&
+              isJSON(data.device_coordinate_3d)
+            ) {
+              myDataList.push({
+                ...data,
+                position: JSON.parse(data.device_coordinate_3d),
+              });
+            }
+          });
+
+          getLightData(myDataList);
+          setHotspotPoint(myDataList);
+          callback ? callback() : "";
+        }
+      },
+      null,
+      "POST"
+    ).send();
+  }
+
+  function setHotspotPoint(myDataList = []) {
+    getHopspotPoint(myDataList);
+  }
+
+  onEvent("autodesk:click:sprite", "#forgeViewer", function (e, obj) {
+    forgeUnFocusAll();
+    chartUnFocusAll();
+    let rect = $("#forgeViewer")[0].getBoundingClientRect();
+    let position = [rect.left + rect.width / 2, rect.top + rect.height / 4];
+    // console.log(position)
+    // let position = [obj.event.target.toolController.lastClickX, obj.event.target.toolController.lastClickY];
+    let devObj = obj.myData;
+    let name =
+      lightControl === "node" && pageAct.sysSubTag === "L1"
+        ? currentData.filter(
+          (x) => x.device_node_guid == devObj.device_node_guid
+        )[0]?.device_node_full_name
+        : currentData.filter((x) => x.device_guid == devObj.device_guid)[0]
+          ?.full_name;
+    devObj.full_name = name;
+    parentEle = crePosPopover(position, devObj);
+    $(parentEle).click();
+
+    let option = floChart.getOption();
+    option.series.forEach(function (series) {
+      series.data.forEach(function (point) {
+        if (pageAct.sysSubTag === "L1") {
+          if (point.device_node_guid == devObj.device_node_guid) {
+            point.symbolSize = 50;
+          }
+        } else {
+          if (point.device_guid == devObj.device_guid) {
+            point.symbolSize = 50;
+          }
+        }
+      });
+    });
+    floChart.setOption(option);
+  });
+
+  onEvent("autodesk:clickOut:sprite", "#forgeViewer", function (e) {
+    $(parentEle).YTTooltip("hide");
+  });
+
+  function forgeUnFocusAll() {
+    $.each(currentData, (idx, cData) => {
+      const eleDbId = cData._dbId;
+      if (alarmDbIdList.some((dbId) => dbId == eleDbId)) {
+        changeScaleForHotspot(eleDbId, false);
+        return;
+      } else {
+        // 3D ��梢��閫����
+        controlFocusHotspot(eleDbId, false);
+      }
+    });
+  }
+
+  function chartUnFocusAll() {
+    let option = floChart.getOption();
+    option.series.forEach(function (series) {
+      series.data.forEach(function (point) {
+        point.symbolSize = 20;
+      });
+    });
+    floChart.setOption(option);
+  }
+
+  // 閫���� series ������
+  function chartUnFocus(ele) {
+    let devGuid = $(ele).data("id");
+    let option = floChart.getOption();
+    option.series.forEach(function (series) {
+      series.data.forEach(function (point) {
+        if (point.device_guid == devGuid) {
+          point.symbolSize = 20;
+        }
+      });
+    });
+    floChart.setOption(option);
+  }
 </script>
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 fd43970..8095336 100644
--- a/Frontend/js/n4js/alarmbaja.js
+++ b/Frontend/js/n4js/alarmbaja.js
@@ -1,17 +1,16 @@
-
 function addzero(num) {
-  return num < 10 ? '0' + num : num;
+  return num < 10 ? "0" + num : num;
 }
 
 /**
-* ���敺���啣虜鞈���� by baja
-* @param {any} startDate_millisecond
-* @param {any} endDate_millisecond
-* @param {any} isRecover
-* @param {any} isAck
-* @param {any} alarmClass
-* @param {any} callback
-*/
+ * ���敺���啣虜鞈���� by baja
+ * @param {any} startDate_millisecond
+ * @param {any} endDate_millisecond
+ * @param {any} isRecover
+ * @param {any} isAck
+ * @param {any} alarmClass
+ * @param {any} callback
+ */
 // function getAlarmByBaja(startDate_millisecond, endDate_millisecond, isRecover, isAck, alarmClass, callback) {
 //     let _sourceTmp;
 //     var _result = "";
@@ -84,54 +83,86 @@ function addzero(num) {
 //             });
 //     });
 // }
-function getAlarmByBaja(startDate_millisecond, endDate_millisecond, isRecover, isAck, alarmClass, callback) {
+function getAlarmByBaja(
+  startDate_millisecond,
+  endDate_millisecond,
+  isRecover,
+  isAck,
+  alarmClass,
+  callback
+) {
   let _sourceTmp;
   var _result = "";
   var _ss = [];
   var _bfName = "";
   var _sourceName = "";
   var _index = 0;
-  var _recoverState = isRecover ? "!= null" : "= null";
+  var _recoverState = isRecover ? "= 'normal'" : "= 'offnormal'";
   var _ackState = isAck ? "= 'acked'" : "= 'unacked'";
-    //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 alarmClass = '" + alarmClass + "' and timestamp.millis > " + startDate_millisecond + " and timestamp.millis < " + endDate_millisecond + " and normalTime " + _recoverState + " and ackState " + _ackState + " order by timestamp asc")
-  require(['baja!'], function (baja) {
-    baja.Ord.make("local:|foxs:|alarm:|bql:select timestamp, ackTime, ackState, alarmClass, alarmClassDisplayName, alarmValue, alarmData, alarmData.sourceName, uuid, alarmData.msgText, alarmData.numericValue, alarmData.presentValue, alarmData.status, alarmData.toState, normalTime where alarmClass = '" + alarmClass + "' and timestamp.millis > " + startDate_millisecond + " and timestamp.millis < " + endDate_millisecond + " and normalTime " + _recoverState + " and ackState " + _ackState + " order by timestamp asc").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 alarmClass = '" + alarmClass + "' and timestamp.millis > " + startDate_millisecond + " and timestamp.millis < " + endDate_millisecond + " and normalTime " + _recoverState + " and ackState " + _ackState + " order by timestamp asc")
+  require(["baja!"], function (baja) {
+    baja.Ord.make(
+      "local:|foxs:|alarm:|bql:select timestamp, ackTime, ackState, alarmClass, alarmClassDisplayName, alarmValue, alarmData, alarmData.sourceName, uuid, alarmData.msgText, alarmData.numericValue, alarmData.presentValue, alarmData.status, alarmData.toState, normalTime where alarmClass = '" +
+      alarmClass +
+      "' and timestamp.millis > " +
+      startDate_millisecond +
+      " and timestamp.millis < " +
+      endDate_millisecond +
+      " and sourceState " +
+      _recoverState +
+      " and ackState " +
+      _ackState +
+      " order by timestamp asc"
+    )
+      .get()
       .then(function (table) {
         return table.cursor({
           each: function (record) {
-            // console.log(record)
-            const alarmDisplayName = record.get('alarmData').get('sourceName').split(":")[1] ?? record.get('alarmData').get('sourceName').split(":")[0]
+            const alarmDisplayName =
+              record.get("alarmData").get("sourceName").split(":")[1] ??
+              record.get("alarmData").get("sourceName").split(":")[0];
             //console.log(alarmDisplayName)
-            _sourceTmp = alarmDisplayName.split('_');
+            _sourceTmp = alarmDisplayName.split("_");
             _bfName = _sourceTmp[1] + "-" + _sourceTmp[4];
             _sourceName = _sourceTmp.slice(0, 8).join("_");
             _sourceTmp = _sourceTmp[7] + "-" + _sourceTmp[8];
             if (!_sourceTmp.includes("undefined")) {
-              _ss.push({ buildingFloorName_zh: _bfName, uuid: record.get('uuid'), timestamp: record.get('timestamp').$cEncStr, alarmClass: record.get('alarmClass'), sourceName_zh: _sourceName, sourceTmp: _sourceTmp, msgText: record.get('alarmData').get('msgText'), ackState: record.get('ackState'), normalTime: record.get('normalTime'), ackedTime: record.get('ackTime').$cEncStr })
+              _ss.push({
+                buildingFloorName_zh: _bfName,
+                uuid: record.get("uuid"),
+                timestamp: record.get("timestamp").$cEncStr,
+                alarmClass: record.get("alarmClass"),
+                sourceName_zh: _sourceName,
+                sourceTmp: _sourceTmp,
+                msgText: record.get("alarmData").get("msgText"),
+                ackState: record.get("ackState"),
+                normalTime: record.get("normalTime"),
+                ackedTime: record.get("ackTime").$cEncStr,
+              });
             }
-            _index++
+            _index++;
           },
           after: function () {
-            _result = { count: _index, data: _ss }
+            _result = { count: _index, data: _ss };
 
             //console.log(552, _result);
 
-            if (typeof callback === 'function') {
+            if (typeof callback === "function") {
               callback(_result);
             }
           },
           limit: -1,
-          offset: 0
+          offset: 0,
         });
       });
   });
 }
 
 /**
-* ���敺���桐��閮剖��������10蝑���啣虜鞈���� by baja
-* @param {any} devicePath
-* @param {any} callback
-*/
+ * ���敺���桐��閮剖��������10蝑���啣虜鞈���� by baja
+ * @param {any} devicePath
+ * @param {any} callback
+ */
 // function getOneDeviceAlarmTop10ByBaja(devicePath, callback) {
 //     var _result = "";
 //     var _ss = "";
@@ -168,46 +199,74 @@ function getOneDeviceAlarmTop10ByBaja(devicePath, callback) {
   var _normalTime = "";
   var _index = 0;
   //{ "count":2,"data": [{ "time": "2022/11/14 15:00:00", "errId": "0001", "ackCheck": "��芰Ⅱ隤�", "errReason": "���瘜⊥�����" }, { "time": "2022/11/14 15:00:00", "errId": "0002", "ackCheck": "��芰Ⅱ隤�", "errReason": "���瘜⊥�����" }]}
-  require(['baja!'], function (baja) {
-    baja.Ord.make("local:|foxs:|alarm:|bql:select top 10 timestamp, ackState, alarmData, alarmData.sourceName, sourceState, uuid, alarmData.msgText, normalTime where alarmData.sourceName like '%" + devicePath + "%' order by timestamp desc").get()
+  require(["baja!"], function (baja) {
+    baja.Ord.make(
+      "local:|foxs:|alarm:|bql:select top 10 timestamp, ackState, alarmData, alarmData.sourceName, sourceState, uuid, alarmData.msgText, normalTime where alarmData.sourceName like '%" +
+      devicePath +
+      "%' order by timestamp desc"
+    )
+      .get()
       .then(function (table) {
         return table.cursor({
           each: function (record) {
             _occurrenceTime = "";
             _normalTime = "";
             // console.log(record.get('timestamp'),record.get('normalTime') )
-            var _resultUuid = record.get('uuid').toString().split("-");//43dc7846-bd96-4be2-ab35-f11aec729c60
+            var _resultUuid = record.get("uuid").toString().split("-"); //43dc7846-bd96-4be2-ab35-f11aec729c60
 
-            var _occurrenceTime = new Date(record.get('timestamp').$cEncStr).toLocaleString('zh-tw', { year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit" });
+            var _occurrenceTime = new Date(
+              record.get("timestamp").$cEncStr
+            ).toLocaleString("zh-tw", {
+              year: "numeric",
+              month: "2-digit",
+              day: "2-digit",
+              hour: "2-digit",
+              minute: "2-digit",
+            });
             // _occurrenceTime += _timestampTemp.getFullYear().toString() + "-" + addzero(_timestampTemp.getMonth() + 1).toString() + "-" + addzero(_timestampTemp.getDate()).toString() + " " + addzero(_timestampTemp.getHours()).toString() + ":" + addzero(_timestampTemp.getMinutes()).toString() + ":" + addzero(_timestampTemp.getSeconds()).toString();
 
             //var _occurrenceTime = _timestamp.format("yyyy-MM-dd hh:mm:ss");//.toLocaleString();
-            var _normalTime = new Date(record.get('normalTime').$cEncStr).toLocaleString('zh-tw', { year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit" });
+            var _normalTime = new Date(
+              record.get("normalTime").$cEncStr
+            ).toLocaleString("zh-tw", {
+              year: "numeric",
+              month: "2-digit",
+              day: "2-digit",
+              hour: "2-digit",
+              minute: "2-digit",
+            });
             // _normalTime += _normaltime.getFullYear().toString() + "-" + addzero(_normaltime.getMonth() + 1).toString() + "-" + addzero(_normaltime.getDate()).toString() + " " + addzero(_normaltime.getHours()).toString() + ":" + addzero(_normaltime.getMinutes()).toString() + ":" + addzero(_normaltime.getSeconds()).toString();
 
-            var _msgText = record.get('alarmData').get('msgText');// == 1 ? _occurrenceTime : "��芰Ⅱ隤�";
-            var _ackText = record.get('ackState') == 1 ? _occurrenceTime : "��芰Ⅱ隤�";
-            _ss.push({ uuid: _resultUuid[0], msgText: _msgText, ackState: _ackText, timestamp: _occurrenceTime, normalTime: _normalTime })
+            var _msgText = record.get("alarmData").get("msgText"); // == 1 ? _occurrenceTime : "��芰Ⅱ隤�";
+            var _ackText =
+              record.get("ackState") == 1 ? _occurrenceTime : "��芰Ⅱ隤�";
+            _ss.push({
+              uuid: _resultUuid[0],
+              msgText: _msgText,
+              ackState: _ackText,
+              timestamp: _occurrenceTime,
+              normalTime: _normalTime,
+            });
             _index++;
           },
           after: function () {
-            _result = JSON.stringify({ count: _index, data: _ss })
-            if (typeof callback === 'function') {
+            _result = JSON.stringify({ count: _index, data: _ss });
+            if (typeof callback === "function") {
               callback(_result);
             }
           },
           limit: -1,
-          offset: 0
+          offset: 0,
         });
       });
   });
 }
 
 /**
-* ��典�桐��蝟餌絞銝�嚗����敺�������閮剖�������啣虜������
-* @param {any} systemPath
-* @param {any} callback
-*/
+ * ��典�桐��蝟餌絞銝�嚗����敺�������閮剖�������啣虜������
+ * @param {any} systemPath
+ * @param {any} callback
+ */
 // function getOneSystemAlarmStateByBaja(systemPath, callback) {
 //     var _result = "";
 //     var _ss = "";
@@ -238,44 +297,70 @@ function getOneSystemAlarmStateByBaja(systemPath, callback) {
   var _ss = "";
   var _index = 0;
   /*  console.log("local:|foxs:|alarm:|bql:select alarmData, alarmData.sourceName, sourceState, uuid where alarmData.sourceName like '%" + systemPath + "%' order by timestamp desc")*/
-  require(['baja!'], function (baja) {
-    baja.Ord.make("local:|foxs:|alarm:|bql:select alarmData, alarmData.sourceName, sourceState, uuid where alarmData.sourceName like '%" + systemPath + "%' order by timestamp desc").get()
+  require(["baja!"], function (baja) {
+    baja.Ord.make(
+      "local:|foxs:|alarm:|bql:select alarmData, alarmData.sourceName, sourceState, uuid where alarmData.sourceName like '%" +
+      systemPath +
+      "%' order by timestamp desc"
+    )
+      .get()
       .then(function (table) {
         return table.cursor({
           each: function (record) {
             if (_index == 0)
-              _ss += '{"uuid":"' + record.get('uuid') + '", "sourceName":"' + record.get('alarmData').get('sourceName') + '", "sourceState":"' + record.get('sourceState') + '"}';
+              _ss +=
+                '{"uuid":"' +
+                record.get("uuid") +
+                '", "sourceName":"' +
+                record.get("alarmData").get("sourceName") +
+                '", "sourceState":"' +
+                record.get("sourceState") +
+                '"}';
             else
-              _ss += ',{"uuid":"' + record.get('uuid') + '", "sourceName":"' + record.get('alarmData').get('sourceName') + '", "sourceState":"' + record.get('sourceState') + '"}';
+              _ss +=
+                ',{"uuid":"' +
+                record.get("uuid") +
+                '", "sourceName":"' +
+                record.get("alarmData").get("sourceName") +
+                '", "sourceState":"' +
+                record.get("sourceState") +
+                '"}';
             _index++;
           },
           after: function () {
-            _result += '{' + '"count": ' + _index + ', "data":[';
+            _result += "{" + '"count": ' + _index + ', "data":[';
             _result += _ss;
-            _result += ']}';
-            if (typeof callback === 'function') {
+            _result += "]}";
+            if (typeof callback === "function") {
               callback(_result);
             }
           },
           limit: -1,
-          offset: 0
+          offset: 0,
         });
       });
   });
 }
 
 /**
-* ��典�桐��蝟餌絞銝�嚗����敺�������蝟餌絞��������� ��啣虜������
-* @param {any} systemPath
-* @param {any} callback
-*/
+ * ��典�桐��蝟餌絞銝�嚗����敺�������蝟餌絞��������� ��啣虜������
+ * @param {any} systemPath
+ * @param {any} callback
+ */
 function getOneSystemStateByBaja(systemPath, callback) {
   var _result = "";
   var _ss = "";
   var _index = 0;
 
-  require(['baja!'], function (baja) {
-    baja.Ord.make("local:|foxs:|alarm:|bql:select top 1 alarmData, alarmData.sourceName, sourceState where alarmData.sourceName like '%" + systemPath + "%' order by timestamp desc").get()
+  require(["baja!"], function (baja) {
+    baja.Ord.make(
+      "local:|foxs:" +
+      port +
+      "|alarm:|bql:select top 1 alarmData, alarmData.sourceName, sourceState where alarmData.sourceName like '%" +
+      systemPath +
+      "%' order by timestamp desc"
+    )
+      .get()
       .then(function (table) {
         return table.cursor({
           each: function (record) {
@@ -283,166 +368,248 @@ function getOneSystemStateByBaja(systemPath, callback) {
             //    _ss += '{"sourceState":"' + record.get('sourceState') + '"}';
             //else
             //    _ss += '{"sourceState":"' + record.get('sourceState') + '"}';
-            _ss += '{"sourceState":"' + record.get('sourceState') + '"}';
+            _ss += '{"sourceState":"' + record.get("sourceState") + '"}';
             _index++;
           },
           after: function () {
-            _result += '{' + '"count": ' + _index + ', "data":[';
+            _result += "{" + '"count": ' + _index + ', "data":[';
             _result += _ss;
-            _result += ']}';
-            if (typeof callback === 'function') {
+            _result += "]}";
+            if (typeof callback === "function") {
               callback(_result);
             }
           },
           limit: -1,
-          offset: 0
+          offset: 0,
         });
       });
   });
 }
 
 /**
-* [擐����] ��亥岷��啣虜��賊��
-* @param {any} callback
-*/
+ * [擐����] ��亥岷��啣虜��賊��
+ * @param {any} callback
+ */
 function getAlarmCountByBaja(callback) {
   var _result = { count: 0 };
   var _index = 0;
 
-  require(['baja!'], function (baja) {
-    baja.Ord.make("local:|foxs:|alarm:|bql:select sourceState where sourceState = 'offnormal'").get()
+  // require(['baja!'], function (baja) {
+  //   baja.Ord.make("local:|foxs:"+port+"|alarm:|bql:select sourceState where sourceState = 'offnormal'").get()
+  //     .then(function (table) {
+  //       return table.cursor({
+  //         each: function (record) {
+  //           _index++;
+  //         },
+  //         after: function () {
+  //           _result.count = _index;
+  //           if (typeof callback === 'function') {
+  //             callback(_result);
+  //           }
+  //         },
+  //         limit: -1,
+  //         offset: 0
+  //       });
+  //     });
+  // });
+  require(["baja!"], function (baja) {
+    baja.Ord.make(
+      "local:|foxs:" +
+      port +
+      "|alarm:|bql:select COUNT(*) where sourceState = 'offnormal'"
+    )
+      .get()
       .then(function (table) {
         return table.cursor({
           each: function (record) {
-            _index++;
-          },
-          after: function () {
-            _result.count = _index;
-            if (typeof callback === 'function') {
-              callback(_result);
+            if (typeof callback === "function") {
+              // console.log("@@@@@@@@@", record.get("COUNT$28toString$29").$val)
+              callback(record.get("COUNT$28toString$29").$val);
             }
           },
           limit: -1,
-          offset: 0
+          offset: 0,
         });
       });
   });
 }
 
 /**
-* [擐����] ��亥岷敺拇飛��賊��
-* @param {any} callback
-*/
+ * [擐����] ��亥岷敺拇飛��賊��
+ * @param {any} callback
+ */
 function getRecoverCountByBaja(callback) {
   var _result = { count: 0 };
   var _index = 0;
 
-  require(['baja!'], function (baja) {
-    baja.Ord.make("local:|foxs:|alarm:|bql:select normalTime where normalTime != null").get()
+  // require(['baja!'], function (baja) {
+  //   baja.Ord.make("local:|foxs:"+port+"|alarm:|bql:select normalTime where normalTime != null").get()
+  //     .then(function (table) {
+  //       return table.cursor({
+  //         each: function (record) {
+  //           _index++;
+  //         },
+  //         after: function () {
+  //           _result.count = _index;
+  //           if (typeof callback === 'function') {
+  //             callback(_result);
+  //           }
+  //         },
+  //         limit: -1,
+  //         offset: 0
+  //       });
+  //     });
+  // });
+  require(["baja!"], function (baja) {
+    baja.Ord.make(
+      "local:|foxs:" +
+      port +
+      "|alarm:|bql:select COUNT(*) where normalTime != null"
+    )
+      .get()
       .then(function (table) {
         return table.cursor({
           each: function (record) {
-            _index++;
-          },
-          after: function () {
-            _result.count = _index;
-            if (typeof callback === 'function') {
-              callback(_result);
+            if (typeof callback === "function") {
+              callback(record.get("COUNT$28toString$29").$val);
             }
           },
           limit: -1,
-          offset: 0
+          offset: 0,
         });
       });
   });
 }
 
 /**
-* [擐����] ��亥岷撌脩Ⅱ隤���啣虜��賊��
-* @param {any} callback
-*/
+ * [擐����] ��亥岷撌脩Ⅱ隤���啣虜��賊��
+ * @param {any} callback
+ */
 function getCheckedAckedCountByBaja(callback) {
   var _result = { count: 0 };
   var _index = 0;
 
-  require(['baja!'], function (baja) {
-    baja.Ord.make("local:|foxs:|alarm:|bql:select ackState where ackState ='acked'").get()
+  // require(['baja!'], function (baja) {
+  //   baja.Ord.make("local:|foxs:"+port+"|alarm:|bql:select ackState where ackState ='acked'").get()
+  //     .then(function (table) {
+  //       return table.cursor({
+  //         each: function (record) {
+  //           _index++;
+  //         },
+  //         after: function () {
+  //           _result.count = _index;
+  //           if (typeof callback === 'function') {
+  //             callback(_result);
+  //           }
+  //         },
+  //         limit: -1,
+  //         offset: 0
+  //       });
+  //     });
+  // });
+  require(["baja!"], function (baja) {
+    baja.Ord.make(
+      "local:|foxs:" +
+      port +
+      "|alarm:|bql:select COUNT(*) where ackState='acked'"
+    )
+      .get()
       .then(function (table) {
         return table.cursor({
           each: function (record) {
-            _index++;
-          },
-          after: function () {
-            _result.count = _index;
-            if (typeof callback === 'function') {
-              callback(_result);
+            if (typeof callback === "function") {
+              callback(record.get("COUNT$28toString$29").$val);
             }
           },
           limit: -1,
-          offset: 0
+          offset: 0,
         });
       });
   });
 }
 
 /**
-* [擐����] ��亥岷��芰Ⅱ隤���啣虜��賊��
-* @param {any} callback
-*/
+ * [擐����] ��亥岷��芰Ⅱ隤���啣虜��賊��
+ * @param {any} callback
+ */
 function getUnCheckedAckedCountByBaja(callback) {
   var _result = { count: 0 };
   var _index = 0;
-
-  require(['baja!'], function (baja) {
-    baja.Ord.make("local:|foxs:|alarm:|bql:select ackState where ackState ='unacked'").get()
+  // console.log("######getUnCheckedAckedCountByBaja#######");
+  // require(['baja!'], function (baja) {
+  //   baja.Ord.make("local:|foxs:"+port+"|alarm:|bql:select ackState where ackState ='unacked'").get()
+  //     .then(function (table) {
+  //       return table.cursor({
+  //         each: function (record) {
+  //           _index++;
+  //         },
+  //         after: function () {
+  //           _result.count = _index;
+  //           if (typeof callback === 'function') {
+  //             callback(_result);
+  //           }
+  //         },
+  //         limit: -1,
+  //         offset: 0
+  //       });
+  //     });
+  // });
+  require(["baja!"], function (baja) {
+    baja.Ord.make(
+      "local:|foxs:" +
+      port +
+      "|alarm:|bql:select COUNT(*) where ackState='unacked'"
+    )
+      .get()
       .then(function (table) {
         return table.cursor({
           each: function (record) {
-            _index++;
-          },
-          after: function () {
-            _result.count = _index;
-            if (typeof callback === 'function') {
-              callback(_result);
+            if (typeof callback === "function") {
+              callback(record.get("COUNT$28toString$29").$val);
             }
           },
           limit: -1,
-          offset: 0
+          offset: 0,
         });
       });
   });
 }
 
 /**
-* [擐����] ���敺���曉�冽�舐�啣虜���蝟餌絞 (頛�敹�)
-* @param {any} callback
-*/
+ * [擐����] ���敺���曉�冽�舐�啣虜���蝟餌絞 (頛�敹�)
+ * @param {any} callback
+ */
 function getSystemAlarmByBaja(callback) {
   var _result = { count: 0, data: [] };
   var _index = 0;
 
-  require(['baja!'], function (baja) {
-    // console.log("ip:202.39.218.221|foxs:4912|alarm:|bql:select alarmClass where isAlarm")
+  require(["baja!"], function (baja) {
+    // console.log("local:|foxs:"+ port +"|alarm:|bql:select alarmClass where isAlarm")
     //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 isAlarm").get()
-    baja.Ord.make("local:|foxs:|alarm:|bql:select alarmClass where isAlarm").get()
+    baja.Ord.make(
+      "local:|foxs:" +
+      port +
+      "|alarm:|bql:select alarmClass where sourceState = 'offnormal'"
+    )
+      .get()
       .then(function (table) {
         return table.cursor({
           each: function (record) {
             // console.log(record)
             let main = {};
-            main.alarmClass = record.get('alarmClass');
+            main.alarmClass = record.get("alarmClass");
 
             _result.data.push(main);
             _index++;
           },
           after: function () {
             _result.count = _index;
-            if (typeof callback === 'function') {
+            if (typeof callback === "function") {
               callback(_result);
             }
           },
           limit: -1,
-          offset: 0
+          offset: 0,
         });
       });
   });
@@ -521,10 +688,10 @@ function getSystemAlarmByBaja(callback) {
 // }
 
 /**
-*  ���敺���桐��閮剖����啣虜
-* @param {any} devicePath
-* @param {any} callback
-*/
+ *  ���敺���桐��閮剖����啣虜
+ * @param {any} devicePath
+ * @param {any} callback
+ */
 function getOneDeviceAlarmByBaja(devicePath, callback) {
   let _sourceTmp;
   var _result = "";
@@ -533,79 +700,130 @@ function getOneDeviceAlarmByBaja(devicePath, callback) {
   var _sourceName = "";
   var _index = 0;
 
-  require(['baja!'], function (baja) {
+  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 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()
+    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) {
-            _sourceTmp = (record.get('alarmData').get('sourceName')).toString().split('_');
+            _sourceTmp = record
+              .get("alarmData")
+              .get("sourceName")
+              .toString()
+              .split("_");
             _bfName = _sourceTmp[1] + "-" + _sourceTmp[4];
             _sourceName = _sourceTmp[7] + "-" + _sourceTmp[8];
-            _ss.push({ buildingFloorName_zh: _bfName, uuid: record.get('uuid'), timestamp: record.get('timestamp'), alarmClass: record.get('alarmClass'), sourceName_zh: _sourceName, msgText: record.get('alarmData').get('msgText'), ackState: record.get('ackState'), normalTime: record.get('normalTime') })
-            _index++
+            _ss.push({
+              buildingFloorName_zh: _bfName,
+              uuid: record.get("uuid"),
+              timestamp: record.get("timestamp"),
+              alarmClass: record.get("alarmClass"),
+              sourceName_zh: _sourceName,
+              msgText: record.get("alarmData").get("msgText"),
+              ackState: record.get("ackState"),
+              normalTime: record.get("normalTime"),
+            });
+            _index++;
           },
           after: function () {
-            _result = { count: _index, data: _ss }
+            _result = { count: _index, data: _ss };
 
             //console.log(552, _result);
 
-            if (typeof callback === 'function') {
+            if (typeof callback === "function") {
               callback(_result);
             }
           },
           limit: -1,
-          offset: 0
+          offset: 0,
         });
       });
   });
 }
 
-function getOtherAlarmByBaja(startDate_millisecond, endDate_millisecond, isRecover, isAck, callback) {
+function getOtherAlarmByBaja(
+  startDate_millisecond,
+  endDate_millisecond,
+  isRecover,
+  isAck,
+  callback
+) {
   var _result = { count: 0, data: [] };
   var _index = 0;
-  var _recoverState = isRecover ? "!= null" : "= null";
+  var _recoverState = isRecover ? "= 'normal'" : "= 'offnormal'";
   var _ackState = isAck ? "= 'acked'" : "= 'unacked'";
 
   let startUrl = "";
   if (startDate_millisecond) {
     startUrl = "timestamp.millis >= " + startDate_millisecond + " and ";
   }
-  console.log("���霅�2", "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()
+  console.log(
+    "���霅�2",
+    "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 sourceState " +
+    _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 sourceState " +
+      _recoverState +
+      " and ackState " +
+      _ackState +
+      " order by timestamp desc"
+    )
+      .get()
       .then(function (table) {
         return table.cursor({
           each: function (record) {
             // console.log(record)
             let main = {};
             //   const alarmDisplayName = record.get('alarmData').get('sourceName').split(":")[1] ?? record.get('alarmData').get('sourceName').split(":")[0]
-            const alarmDisplayName = record.get('alarmData').get('sourceName').split(":")[1] ?? record.get('alarmData').get('sourceName')
-            _sourceTmp = alarmDisplayName.split('_');
-            let _bfName = _sourceTmp[1] + "-" + _sourceTmp[4]
+            const alarmDisplayName =
+              record.get("alarmData").get("sourceName").split(":")[1] ??
+              record.get("alarmData").get("sourceName");
+            _sourceTmp = alarmDisplayName.split("_");
+            let _bfName = _sourceTmp[1] + "-" + _sourceTmp[4];
             let _sourceName = _sourceTmp.slice(0, 8).join("_");
             _sourceTmp = _sourceTmp[7] + "-" + _sourceTmp[8];
-            console.log(record.get('alarmData').get('sourceName'), _bfName, _sourceName)
+            console.log(
+              record.get("alarmData").get("sourceName"),
+              _bfName,
+              _sourceName
+            );
 
             main.buildingFloorName_zh = _bfName;
             main.sourceName_zh = _sourceName;
-            main.uuid = record.get('uuid').$val;
-            main.timestamp = record.get('timestamp').$cEncStr;
-            main.alarmClass = record.get('alarmClass');
+            main.uuid = record.get("uuid").$val;
+            main.timestamp = record.get("timestamp").$cEncStr;
+            main.alarmClass = record.get("alarmClass");
             main.point = _sourceTmp;
             main.sourceTmp = _sourceTmp;
             main.devicePath = _sourceName;
-            main.msgText = record.get('alarmData').get('msgText');
-            main.normalTime = record.get('normalTime');
-            main.priority = record.get('priority');
-            main.ackedTime = record.get('ackTime').$cEncStr;
-            main.ackState = record.get('ackState').$ordinal
+            main.msgText = record.get("alarmData").get("msgText");
+            main.normalTime = record.get("normalTime");
+            main.priority = record.get("priority");
+            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);
             }
 
@@ -613,86 +831,108 @@ function getOtherAlarmByBaja(startDate_millisecond, endDate_millisecond, isRecov
           },
           after: function () {
             _result.count = _index;
-            if (typeof callback === 'function') {
+            if (typeof callback === "function") {
               //console.log(_result)
               callback(_result);
             }
           },
           limit: -1,
-          offset: 0
+          offset: 0,
         });
       });
   });
 }
 
-function getAllDeviceAlarmByBaja(startDate_millisecond, endDate_millisecond, isRecover, isAck, callback) {
+function getAllDeviceAlarmByBaja(
+  startDate_millisecond,
+  endDate_millisecond,
+  isRecover,
+  isAck,
+  callback
+) {
   var _result = { count: 0, data: [] };
   var _index = 0;
-  var _recoverState = isRecover ? "!= null" : "= null";
+  var _recoverState = isRecover ? "= 'normal'" : "= 'offnormal'";
   var _ackState = isAck ? "= 'acked'" : "= 'unacked'";
 
   let startUrl = "";
   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");
-  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()
+  // 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 sourceState " +
+      _recoverState +
+      " and ackState " +
+      _ackState +
+      " order by timestamp desc"
+    )
+      .get()
       .then(function (table) {
         return table.cursor({
           each: function (record) {
-            // console.log(record)
             let main = {};
             //   const alarmDisplayName = record.get('alarmData').get('sourceName').split(":")[1] ?? record.get('alarmData').get('sourceName').split(":")[0]
-            const alarmDisplayName = record.get('alarmData').get('sourceName').split(":")[1] ?? record.get('alarmData').get('sourceName')
-            _sourceTmp = alarmDisplayName.split('_');
-            let _bfName = _sourceTmp[1] + "-" + _sourceTmp[4]
+            const alarmDisplayName =
+              record.get("alarmData").get("sourceName").split(":")[1] ??
+              record.get("alarmData").get("sourceName");
+            _sourceTmp = alarmDisplayName.split("_");
+            let _bfName = _sourceTmp[1] + "-" + _sourceTmp[4];
             let _sourceName = _sourceTmp.slice(0, 8).join("_");
             _sourceTmp = _sourceTmp[7] + "-" + _sourceTmp[8];
 
             main.buildingFloorName_zh = _bfName;
             main.sourceName_zh = _sourceName;
-            main.uuid = record.get('uuid').$val;
-            main.timestamp = record.get('timestamp').$cEncStr;
-            main.alarmClass = record.get('alarmClass');
+            main.uuid = record.get("uuid").$val;
+            main.timestamp = record.get("timestamp").$cEncStr;
+            main.alarmClass = record.get("alarmClass");
             main.point = _sourceTmp;
             main.sourceTmp = _sourceTmp;
             main.devicePath = _sourceName;
-            main.msgText = record.get('alarmData').get('msgText');
-            main.normalTime = record.get('normalTime');
-            main.priority = record.get('priority');
-            main.ackedTime = record.get('ackTime').$cEncStr;
-            main.ackState = record.get('ackState').$ordinal
+            main.msgText = record.get("alarmData").get("msgText");
+            main.normalTime = record.get("normalTime");
+            main.priority = record.get("priority");
+            main.ackedTime = record.get("ackTime").$cEncStr;
+            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++;
           },
           after: function () {
             _result.count = _index;
-            if (typeof callback === 'function') {
+            if (typeof callback === "function") {
               //console.log(_result)
               callback(_result);
             }
           },
           limit: -1,
-          offset: 0
+          offset: 0,
         });
       });
   });
 }
 
-
-function getDeviceAlarmCardByBaja(startDate_millisecond, endDate_millisecond, isRecover, isAck, callback) {
+function getDeviceAlarmCardByBaja(
+  startDate_millisecond,
+  endDate_millisecond,
+  isRecover,
+  isAck,
+  callback
+) {
   var _result = { count: 0, data: [] };
   var _index = 0;
-  var _recoverState = isRecover ? "!= null" : "= null";
+  var _recoverState = isRecover ? "= 'normal'" : "= 'offnormal'";
   var _ackState = isAck ? "= 'acked'" : "= 'unacked'";
 
   let startUrl = "";
@@ -700,35 +940,47 @@ function getDeviceAlarmCardByBaja(startDate_millisecond, endDate_millisecond, is
     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 from openAlarms 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()
+  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 sourceState " +
+      _recoverState +
+      " and ackState " +
+      _ackState +
+      " order by timestamp desc"
+    )
+      .get()
       .then(function (table) {
         return table.cursor({
           each: function (record) {
-            // console.log(record)
+            // console.log("%%%%%%%%%%%%%%%%", record.get('alarmData').get('alarmClassDisplayName'))
             let main = {};
             // console.log(record.get('alarmData').get('sourceName'),record.get('timestamp').$cEncStr)
-            const alarmDisplayName = record.get('alarmData').get('sourceName').split(":")[1] ?? record.get('alarmData').get('sourceName').split(":")[0]
+            const alarmDisplayName =
+              record.get("alarmData").get("sourceName").split(":")[1] ??
+              record.get("alarmData").get("sourceName").split(":")[0];
             //console.log(alarmDisplayName)
-            _sourceTmp = alarmDisplayName.split('_');
-            let _bfName = _sourceTmp[1] + "-" + _sourceTmp[4]
+            _sourceTmp = alarmDisplayName.split("_");
+            let _bfName = _sourceTmp[1] + "-" + _sourceTmp[4];
             let _sourceName = _sourceTmp.slice(0, 8).join("_");
             _sourceTmp = _sourceTmp[7] + "-" + _sourceTmp[8];
 
             main.buildingFloorName_zh = _bfName;
             main.sourceName_zh = _sourceName;
-            main.uuid = record.get('uuid').$val;
-            main.timestamp = record.get('timestamp').$cEncStr;
-            main.alarmClass = record.get('alarmClass');
+            main.uuid = record.get("uuid").$val;
+            main.timestamp = record.get("timestamp").$cEncStr;
+            main.alarmClass = record.get("alarmClass");
             main.point = _sourceTmp;
             main.sourceTmp = _sourceTmp;
             main.devicePath = _sourceName;
-            main.msgText = record.get('alarmData').get('msgText');
-            main.normalTime = record.get('normalTime');
-            main.priority = record.get('priority');
-            main.ackedTime = record.get('ackTime').$cEncStr;
-            main.ackState = record.get('ackState').$ordinal
+            main.msgText = record.get("alarmData").get("msgText");
+            main.normalTime = record.get("normalTime");
+            main.priority = record.get("priority");
+            main.ackedTime = record.get("ackTime").$cEncStr;
+            main.ackState = record.get("ackState").$ordinal;
             //   if (!_sourceTmp.includes("undefined")) {
             //       // console.log(main.ackState)
             //     }
@@ -737,49 +989,64 @@ function getDeviceAlarmCardByBaja(startDate_millisecond, endDate_millisecond, is
           },
           after: function () {
             _result.count = _index;
-            if (typeof callback === 'function') {
+            if (typeof callback === "function") {
               //console.log(_result)
               callback(_result);
             }
           },
           limit: -1,
-          offset: 0
+          offset: 0,
         });
       });
   });
 }
 
 /**
-* [擐����] ���擗����鞈���� - ��券�函����啣虜
-* @param {any} callback
-*/
+ * [擐����] ���擗����鞈���� - ��券�函����啣虜
+ * @param {any} callback
+ */
 function getAlarmForChartDataByBaja(callback) {
   var _result = "";
   var _ss = "";
   var _index = 0;
 
-  require(['baja!'], function (baja) {
-    baja.Ord.make("local:|foxs:|alarm:|bql:select *").get()
+  require(["baja!"], function (baja) {
+    baja.Ord.make("local:|foxs:|alarm:|bql:select *")
+      .get()
       .then(function (table) {
         return table.cursor({
           each: function (record) {
             if (_index == 0)
-              _ss += '{"alarmClass":"' + record.get('alarmClass') + '", "ackState":"' + record.get('ackState') + '", "normalTime":"' + record.get('normalTime') + '"}';
+              _ss +=
+                '{"alarmClass":"' +
+                record.get("alarmClass") +
+                '", "ackState":"' +
+                record.get("ackState") +
+                '", "normalTime":"' +
+                record.get("normalTime") +
+                '"}';
             else
-              _ss += ',{"alarmClass":"' + record.get('alarmClass') + '", "ackState":"' + record.get('ackState') + '", "normalTime":"' + record.get('normalTime') + '"}';
+              _ss +=
+                ',{"alarmClass":"' +
+                record.get("alarmClass") +
+                '", "ackState":"' +
+                record.get("ackState") +
+                '", "normalTime":"' +
+                record.get("normalTime") +
+                '"}';
             _index++;
           },
           after: function () {
             //_result += '{' + '"count": ' + _index + ', "data":[';
             //_result += _ss;
             //_result += ']}';
-            if (typeof callback === 'function') {
+            if (typeof callback === "function") {
               callback(_index);
             }
           },
           limit: -1,
-          offset: 0
+          offset: 0,
         });
       });
   });
-}
\ No newline at end of file
+}
diff --git a/Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs b/Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs
index d293e89..53e91eb 100644
--- a/Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs
+++ b/Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs
@@ -506,11 +506,25 @@ namespace Repository.BackendRepository.Implement
                         
                         //��祆活�����臬�亦�� isLink ��寧�� 1, 瘝������� isLink = 0
                         sb.Append($@" SET SQL_SAFE_UPDATES = 0;
-                              UPDATE device_item d LEFT JOIN import_niagara_item m 
-                                ON d.device_system_tag = m.device_system_tag and d.device_name_tag = m.device_name_tag and d.points = m.device_point_name and d.full_name = m.full_name and d.is_show_history = m.is_history
-                                SET d.is_link	    = case when device_point_name is null then 0 else 1 end , 
-			                      d.is_show_history = case when device_point_name is null then 0 else 1 end
-                                    where m.is_history = 1
+                                update
+                                    device_item d 
+                                    LEFT JOIN import_niagara_item m 
+                                    ON d.device_system_tag = m.device_system_tag
+                                     and d.device_name_tag = m.device_name_tag 
+                                     and d.points = m.device_point_name 
+                                     and d.full_name = m.full_name 
+                                    SET d.is_link = case when device_point_name is null then 0 else 1 end;
+
+                                update 
+                                device_item d 
+                                LEFT JOIN import_niagara_item m 
+                                ON d.device_system_tag = m.device_system_tag
+                                 and d.device_name_tag = m.device_name_tag 
+                                 and d.points = m.device_point_name 
+                                 and d.full_name = m.full_name 
+                                 and d.is_show_history = m.is_history
+	                                SET d.is_show_history = case when device_point_name is null then 0 else 1 end
+                                where (m.is_history = 1 or d.is_show_history);
                                 ");
 
                         await conn.ExecuteAsync(sb.ToString());