Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS

Frontend/_sysElevator.html

@@ -1964,7 +1964,7 @@
 
         })
             .fail(function () {
-                toast_warning("查無該樓層地圖")
+                // toast_warning("查無該樓層地圖")
                 floChart.clear();
             });
 

Frontend/_sysMonAll.html

@@ -150,7 +150,7 @@
       let cloDevPoiName = matchDevice.device_close_point_name;
       let errDevPoiName = matchDevice.device_error_point_name;
 
-      if (data.point_name == "ONOFF" && pageAct.sysSubTag === "L1") {
+      if (data.point_name == "SSC" && pageAct.sysSubTag === "L1") {
         const lightOn = data.value.includes("true");
 
         setLightOpenOrClose(lightOn, matchDevice.device_guid);
@@ -254,6 +254,160 @@
       }
     });
   }
+  // 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 lightOnGuidArr = [];
+  //   let lightOffGuidArr = [];
+
+  //   myBaja.setSubscribeDevicesCallBack(function (data) {
+  //     // console.log(data)
+  //     let matchDevice = allDevList.filter(
+  //       (x) => x.device_number == data.device_number_full
+  //     )[0];
+  //     if (!matchDevice) {
+  //       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;
+  //     }
+
+  //     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 == "ONOFF" && pageAct.sysSubTag === "L1") {
+  //       const lightOn = data.value.includes("true");
+
+  //       setLightOpenOrClose(lightOn, matchDevice.device_guid);
+  //       if (lightOn) {
+  //         setLightValues(matchDevice.device_guid, 200, 0xe1cf18);
+  //         // changeColorForHotspot(matchDevice.spriteDbid, null, true)
+  //         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 {
+  //         setLightValues(matchDevice.device_guid, 0, 0xffffff);
+  //         // changeColorForHotspot(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 == "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
+  //     ) {
+  //       //顯示正常燈號
+  //       $(`#${matchDevice.device_number}_status`)
+  //         .attr("data-light-type", "normal")
+  //         .data("light-type", "normal");
+  //     } else if (
+  //       data.point_name == cloDevPoiName &&
+  //       data.value == matchDevice.device_close_point_value
+  //     ) {
+  //       $(`#${matchDevice.device_number}_status`)
+  //         .attr("data-light-type", "close")
+  //         .data("light-type", "close");
+  //     } else if (
+  //       data.point_name == errDevPoiName &&
+  //       data.value == matchDevice.device_error_point_value
+  //     ) {
+  //       $(`#${matchDevice.device_number}_status`)
+  //         .attr("data-light-type", "error")
+  //         .data("light-type", "error");
+  //     }
+  //     if (
+  //       allDevList.length ===
+  //       lightOnHotColorArr.length + lightOffHotColorArr.length
+  //     ) {
+  //       changeColorForHotspot(
+  //         lightOnHotColorArr.map(({ spriteDbid }) => spriteDbid),
+  //         null,
+  //         true
+  //       );
+  //       changeColorForHotspot(
+  //         lightOffHotColorArr.map(({ spriteDbid }) => spriteDbid),
+  //         null,
+  //         false
+  //       );
+
+  //     }
+  //     $(loadEle).Loading("close");
+
+  //     setLightColor();
+  //     setForgeHotSpotColor(matchDevice);
+  //     lightDevForgeSpotLig(matchDevice);
+  //     // 從設備訂閱更新每個設備卡片即時點位
+  //     setDevItemPoiValBySub(data);
+  //   });
+
+  //   myBaja.setSubscribeDeviceEndCallBack(function (data) {
+  //     endPageLoading();
+  //     if (data.findIndex((x) => x.point_name == "Temp") != -1) {
+  //       // 顯示溫度條
+  //       showHeat("[name=forgeHeatBar]");
+  //     }
+  //   });
+  // }
 
   function lightDevForgeSpotLig(devObj) { }
 

Frontend/_sysMonFloor.html

@@ -16,8 +16,10 @@
 </div> -->
 <div class="d-flex">
   <div class="col-6 my-3">
-    <div id="floChart"
+    <div
-         style="height: 100%; width: 100%; background-color: #fff"></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%">
@@ -25,9 +27,11 @@
           </div>
         </div> -->
     <div id="forgeViewer" class="position-relative" style="height: 80vh">
-      <div id="forgeHeatBarDiv"
+      <div
+        id="forgeHeatBarDiv"
         class="d-flex mb-4 position-absolute"
-           style="gap: 15px"></div>
+        style="gap: 15px"
+      ></div>
     </div>
   </div>
 </div>
@@ -565,7 +569,7 @@
           ? parseInt(data.value)
           : 0;
       }
-      if (data.point_name == "ONOFF" && pageAct.sysSubTag === "L1") {
+      if (data.point_name == "SSC" && pageAct.sysSubTag === "L1") {
         const lightOn = data.value.includes("true");
         setLightOpenOrClose(lightOn, matchDevice.device_guid);
         if (lightOn && matchDevice.spriteDbid) {

FrontendWebApi/ApiControllers/DeviceManageController.cs

@@ -716,7 +716,7 @@ namespace FrontendWebApi.ApiControllers
                             join auth_page p on p.AuthCode = a.AuthCode
                             where u.account = N'{role.Account}'
                             and p.SubName = N'編輯設備名稱'
-                            and p.building_guid = N'{role.Building_guid}'";
+                            and p.building_tag = N'{role.Building_tag}'";
                 var have = await backendRepository.GetOneAsync<string>(sql);
                 if (have == null)
                 {

FrontendWebApi/ApiControllers/HistoryController.cs

@@ -1160,7 +1160,7 @@ namespace FrontendWebApi.ApiControllers
                         var device_item_info = device_item_infos.Where(x => x.Device_number == device_number && x.Points == point).FirstOrDefault();
 
                         var sql = $@"select '{device_item_info.Building_name}' as Building_name, '{device_item_info.Main_system_name}' as Main_system_name,
-                                            '{device_item_info.Sub_system_name}' as Sub_system_name', {device_item_info.Device_number}' as Device_number, 
+                                            '{device_item_info.Sub_system_name}' as Sub_system_name, '{device_item_info.Device_number}' as Device_number, 
                                             '{device_item_info.Device_name}' as Device_name, '{device_item_info.Item_name}' as Item_name, '{device_item_info.Points}' as Points,
                                             '{device_item_info.Unit}' as Unit, timestamp as Timestamp, round(value, 2) as Value
                                     from FIC_CENTER_{device_number}_{point}

FrontendWebApi/ApiControllers/LoginController.cs

@@ -120,9 +120,9 @@ namespace FrontendWebApi.ApiControllers
                     //取得當前登入使用者資訊
                     EDFunction edFunction = new EDFunction();
                     HttpContext.Session.SetString("MyApiAccount", edFunction.AESEncrypt(myUser.account)); //將帳號透過AES加密
-                    //}
+                    //
                 }
-
+                apiResult.Data = myUser?.exp.ToString() + "_"+ HttpContext.Session.GetString("MyApiAccount") ?? null;
                 apiResult.Code = "0000";
             }
             catch (Exception exception)

FrontendWebApi/Models/EmergencyDevice.cs

@@ -212,7 +212,7 @@ namespace FrontendWebApi.Models
     public class ChangeNameRole
     {
         public string Account { get; set; }
-        public string Building_guid { get; set; }
+        public string Building_tag { get; set; }
     }
     public class SaveGrouping
     {