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

Backend/appsettings.Development.json

@@ -18,10 +18,10 @@
       "Port": "js2LutKe+rdjzdxMPQUrvQ==",
       //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30  
       //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
-      //"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome
+      "Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome
       //"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel
       //"Database": "iuaY0h0+TWkir44/eZLDqw==", //tpe_dome_office
-      "Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //mcut
+      //"Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //mcut
       //"Database": "2U+9jYGy0dCbMzLaguBXow==", //tpe_dome_mall
       "Root": "SzdxEgaJJ7tcTCrUl2zKsA==",
       "Password": "FVAPxztxpY4gJJKQ/se4bQ=="

Frontend/_dashboard.html

@@ -419,11 +419,11 @@
     let devNum =
       tarElePath.split("/")[0] +
       "/" +
-      tarElePath.split("/")[1].split("_").slice(0, 8).join("_");
+      tarElePath.split("/")[1].split("_").slice(0, 9).join("_");
     let devPath =
       tarElePath.split("/")[0] +
       "/" +
-      tarElePath.split("/")[1].split("_").slice(0, 8).join("_");
+      tarElePath.split("/")[1].split("_").slice(0, 9).join("_");
 
     let today =
       displayDate(new Date(), "date").replaceAll("/", "-") + "T00:00:00";
@@ -439,7 +439,7 @@
 
     // 今日用電量
     getElectricMeterDayDataByBaja(
-      devNum + "_KWH",
+      devNum,
       n4Sup,
       today,
       tomorrow,
@@ -453,7 +453,7 @@
 
     // 今日用電量 (每小時)
     getElectricMeterHourDataByBaja(
-      devNum + "_KWH",
+      devNum,
       n4Sup,
       yesterday,
       tomorrow,
@@ -477,7 +477,7 @@
 
     // 昨日用電量
     getElectricMeterDayDataByBaja(
-      devNum + "_KWH",
+      devNum,
       n4Sup,
       yesterday,
       today,
@@ -491,7 +491,7 @@
 
     // 本週與上週用電量 (每天)
     getElectricMeterDayDataByBaja(
-      devNum + "_KWH",
+      devNum,
       n4Sup,
       prevTwoWeek,
       tomorrow,
@@ -1030,6 +1030,7 @@
 
   onEvent("click", "button[id^=sysSubCardBtn]", function () {
     let subSysTag = $(this).data("id");
-    $(`#subSysBtn${subSysTag}`).click();
+    debugger
+    $(`#subSysBtn${subSysTag}[data-building-tag='${buildingTagOnJquery(pageAct.buiTag)}']`).click();
   });
 </script>

Frontend/_sysMonAll.html

@@ -203,7 +203,7 @@
         )
       ) {
         //顯示正常燈號
-        $(`#${matchDevice.device_number}_status`)
+        $(`#${deviceNumber(matchDevice.device_number)}_status`)
           .attr("data-light-type", "normal")
           .data("light-type", "normal");
 
@@ -218,7 +218,7 @@
           ({ device_number }) => device_number === matchDevice.device_number
         )
       ) {
-        $(`#${matchDevice.device_number}_status`)
+        $(`#${deviceNumber(matchDevice.device_number)}_status`)
           .attr("data-light-type", "close")
           .data("light-type", "close");
 
@@ -236,11 +236,11 @@
         )
       ) {
         if (pageAct.sysSubTag === "L1") {
-          $(`#${matchDevice.device_number}_status`)
+          $(`#${deviceNumber(matchDevice.device_number)}_status`)
             .attr("data-light-error-type", "error")
             .data("light-error-type", "error");
         } else {
-          $(`#${matchDevice.device_number}_status`)
+          $(`#${deviceNumber(matchDevice.device_number)}_status`)
             .attr("data-light-type", "error")
             .data("light-type", "error");
         }
@@ -249,7 +249,7 @@
         data.point_name == errDevPoiName &&
         data.value !== matchDevice.device_error_point_value
       ) {
-        $(`#${matchDevice.device_number}_status`)
+        $(`#${deviceNumber(matchDevice.device_number)}_status`)
           .attr("data-light-error-type", "")
           .data("light-error-type", "");
         alarmDbIdList = alarmDbIdList.filter(
@@ -457,7 +457,7 @@
   // 從設備訂閱更新每個設備卡片即時點位
   function setDevItemPoiValBySub(data) {
     let pointSpan = $(
-      `.card.device-wrap[data-number=${data.device_number_full}] span[name=devItemPoiVal]`
+      `.card.device-wrap[data-number=${deviceNumber(data.device_number_full)}] span[name=devItemPoiVal]`
     );
     if (pointSpan && pointSpan.data("point") == data.point_name) {
       // console.log(data)
@@ -499,6 +499,7 @@
   function setLightSchBlcok(obj) {
     let devNum = $(obj).parents(".device-wrap").data("number");
     let devPath = devNum.replaceAll("_", "/");
+    devPath = deviceNumberOnProcess(devPath);
     let iframe = `<iframe src="/ord?station:%7Cslot:/${devPath}/Sch|view:?fullScreen=true" style="min-height:100px;width:100%;height:100%"></iframe>`;
     $("#lightSchBlock").html(iframe);
   }
@@ -564,7 +565,7 @@
             $.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
+              strHtml += `<div class="card m-1 border device-wrap" data-number="${deviceNumber(devObj.device_number)
                 }" data-position="${position}">
                                         <div class="card-body p-2">
                                             <div class="d-flex mb-2">
@@ -575,20 +576,20 @@
                 devObj.device_image
                 }" class="profile-image rounded-circle" onerror="defDev(this)" alt="...">
                                                     </span>
-                                                    <a name="devItemName" data-number="${devObj.device_number
+                                                    <a name="devItemName" data-number="${deviceNumber(devObj.device_number)
                 }" href="javascript:;">${devObj.full_name
                 }</a>
                                                 </div>
                                             </div>
                                         <div class="d-flex mb-0 mt-2 align-items-center">
-                                                <span id="${devObj.device_number
+                                                <span id="${deviceNumber(devObj.device_number)
                 }_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>
                                                 <a href="javascript:;" name="devItem" data-id="${devObj.device_guid
-                }" data-number="${devObj.device_number
+                }" data-number="${deviceNumber(devObj.device_number)
                 }" data-name="${devObj.full_name
                 }" class=" ml-2 mb-0 " data-toggle="tooltip" title="默认的 Tooltip">詳細資料</a>
                                             </div>
@@ -602,6 +603,7 @@
 
           if (!res.data || res.data.length == 0) {
             endPageLoading();
+            $(loadEle).Loading("close");
           } else {
             // 訂閱 baja 設備
             if (pageAct.sysSubTag !== "L1" && pageAct.sysSubTag !== "M12") {
@@ -694,8 +696,9 @@
   // Card 即時狀態
   function drawStateTabBlo(devNum) {
     let devPath = devNum.replaceAll("_", "/");
+    devPath = deviceNumberOnProcess(devPath);
     let position =
-      $(`.card.device-wrap[data-number=${devNum}]`).data("position") || "left";
+      $(`.card.device-wrap[data-number=${deviceNumber(devNum)}]`).data("position") || "left";
     let width = buildMenuData[position + "_icon_click_url_width"]
       ? buildMenuData[position + "_icon_click_url_width"] + "px"
       : "100%";

Frontend/index.html

@@ -1276,7 +1276,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
               setSysTagForPageAct(this);
               $("#sysMonTopBtn").YTTab("set");
               $(`#subSysBtn${pageAct.sysSubTag}`).YTTab("set");
-              debugger
+
               if (pageAct.isShowBuildingInMenu) {
                 let building_tag = $(this).data("building-tag");
                 $(`#buildTab${building_tag}`).YTTab("set");
@@ -1326,7 +1326,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
             "yt:tab:change",
             "[data-tabname=buildTab]",
             function (e, arg) {
-              pageAct.buiTag = $(this).prop("id").split("buildTab")[1];
+              pageAct.buiTag = buildingTagOnProcess($(this).prop("id").split("buildTab")[1]);
               pageAct.buiName = $(this).text();
               pageAct.urn = $(this).data("urn");
               $(this).parents("ul").find("a").removeClass("active");
@@ -1474,7 +1474,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
                 $(`#subSysBtn${lastPageAct.sysSubTag}`).click();
               } else {
                 $(
-                  `#subSysBtn${lastPageAct.sysSubTag}[data-building-tag=${pageAct.buiTag}]`
+                  `#subSysBtn${lastPageAct.sysSubTag}[data-building-tag=${buildingTagOnJquery(pageAct.buiTag)}]`
                 ).click();
               }
             } else {
@@ -1523,7 +1523,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
                 tbody
                   .find("tr")
                   .eq(0)
-                  .append(creEle("td", res.data.device_number));
+                  .append(creEle("td", deviceNumber(res.data.device_number)));
                 tbody.find("tr").eq(1).append(creEle("td", res.data.full_name));
               }
             },
@@ -1570,7 +1570,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
                 : "";
 
             let option = {
-              html: `<div class="card m-1 border device-wrap" data-number="${devNum}" data-position="left">
+              html: `<div class="card m-1 border device-wrap" data-number="${deviceNumber(devNum)}" data-position="left">
                                           <div class="card-header p-3">
 
                                               <div class="position-absolute mr-5" style="word-break: break-all;">
@@ -1701,10 +1701,12 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
         function devItemNameEvent() {
           onEvent("click", "[name=devItemName]", function () {
             let devNum = $(this).data("number");
-            let devObj = $(`[name=devItem][data-number=${devNum}]`).data(
+            let devObj = $(`[name=devItem][data-number=${deviceNumber(devNum)}]`).data(
               "devobj"
             );
+			if(devObj){
 				moveViewToDevice(devObj.forge_dbid);
+			}
           });
         }
 
@@ -2227,7 +2229,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
                     ""
                   );
                   a.html(
-                    `<span id="buildTab${building.building_tag}" data-tabname="buildTab" data-urn="${building.urn_3D}">${building.building_name}</span>`
+                    `<span id="buildTab${buildingTagOnJquery(building.building_tag)}" data-tabname="buildTab" data-urn="${building.urn_3D}">${building.building_name}</span>`
                   );
                   li.append(a);
                   let ul = creEle("ul", null, null, null, [
@@ -2255,7 +2257,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
                           {
                             page: page,
                             tabname: "systemMonitor",
-                            "building-tag": building.building_tag,
+                            "building-tag": buildingTagOnJquery(building.building_tag),
                           },
                           "topFunBtn"
                         );

Frontend/js/forge/forgemodel.js

@@ -13,7 +13,9 @@ function getAllLeafComponents(viewer, callback) {
   var cbCount = 0;
   var tree;
   var jsData = [];
-
+  if(typeof viewer == 'undefined'){
+	return;
+  }
   function getLeafComponentsRec(current, parent) {
     cbCount++;
     if (tree.getChildCount(current) != 0) {
@@ -833,6 +835,9 @@ async function changeColorForHotspot(dbId, type = null, OnOff = false) {
 
 // 更換 icon
 async function changeScaleForHotspot(dbId, type = true) {
+  if(typeof viewer == 'undefined'){
+	  return;
+  }
   const dataVizExtn = await viewer.loadExtension("Autodesk.DataVisualization");
   let spriteErrIcon = baseForgeApiUrl + "/file/img/forge/sensor_circle.svg";
   if (location.href.indexOf("localhost:5966") != -1) {
@@ -848,6 +853,9 @@ async function changeScaleForHotspot(dbId, type = true) {
 
 // 熱點 更換大小
 async function changeScaleForHotspot(dbId, type = true) {
+	if(typeof viewer == 'undefined'){
+	  return;
+  }
   const dataVizExtn = await viewer.loadExtension("Autodesk.DataVisualization");
   let scale = 1;
   if (type) {
@@ -1266,17 +1274,26 @@ function getHopspotPoint(data) {
 
 //呼叫載入熱圖
 async function toLoadHeatmap(roomArr) {
+	if(typeof viewer == 'undefined'){
+		return;
+	}
   const model = viewer.model;
   loadHeatmaps(model, roomArr);
 }
 
 function setShadowShow(type = false) {
+	if(typeof viewer == 'undefined'){
+		return;
+	}
   viewer.setGroundShadow(type);
   viewer.impl.sceneUpdated(true);
 }
 //============================= end ===================================
 
 function moveViewToDevice(letter) {
+	if(typeof viewer == 'undefined'){
+		return;
+	}
   if (letter != "") {
     viewer.clearSelection();
     viewer.select(letter);

Frontend/js/site.js

@@ -1253,3 +1253,37 @@ function setTopBuildingText(){
 
   })
 }
+
+function buildingTagOnJquery(building_tag){
+  let frontSyntax = building_tag.slice(0,2);
+  if(frontSyntax == "$3"){
+    return building_tag.slice(2,building_tag.length);
+  }
+  return building_tag;
+}
+
+function buildingTagOnProcess(building_tag){
+  if(!isNaN(parseInt(building_tag.slice(0,1)))){
+    building_tag = "$3" + building_tag;
+  }
+  return building_tag;
+}
+
+function deviceNumber(devNum){
+  if(devNum.includes("$3")){
+    devNum = devNum.replaceAll("$3","");
+  }
+  return devNum;
+
+}
+
+function deviceNumberOnProcess(devNum){
+  if(devNum.includes("/")){
+    tags = devNum.split("/");
+    buildingTag = tags[1];
+    buildingTag = buildingTagOnProcess(buildingTag);
+    devNum = tags[0] + "/" + buildingTag + "/" + tags.slice(2,tags.length).join("/")
+  }
+  return devNum;
+
+}