From 500c2badfea0747a37589b29940cf83c7f540ee3 Mon Sep 17 00:00:00 2001
From: dev01 <dev01@yourteam.tw>
Date: Wed, 12 Jul 2023 09:46:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=87=20=E5=90=AB=E6=9C=89/=E7=9A=84deviceN?=
 =?UTF-8?q?umber=20=E5=88=A4=E6=96=B7buildingtag=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=9C=89=E6=95=B8=E5=AD=97=E9=96=8B=E9=A0=AD=EF=BC=8C=E8=A3=9C?=
 =?UTF-8?q?=E4=B8=8A$3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Frontend/_sysMonAll.html |  4 +++-
 Frontend/js/site.js      | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Frontend/_sysMonAll.html b/Frontend/_sysMonAll.html
index f7a261f..ecb41c1 100644
--- a/Frontend/_sysMonAll.html
+++ b/Frontend/_sysMonAll.html
@@ -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">
@@ -695,6 +696,7 @@
   // Card 即時狀態
   function drawStateTabBlo(devNum) {
     let devPath = devNum.replaceAll("_", "/");
+    devPath = deviceNumberOnProcess(devPath);
     let position =
       $(`.card.device-wrap[data-number=${deviceNumber(devNum)}]`).data("position") || "left";
     let width = buildMenuData[position + "_icon_click_url_width"]
diff --git a/Frontend/js/site.js b/Frontend/js/site.js
index 8b1c4f4..243efe6 100644
--- a/Frontend/js/site.js
+++ b/Frontend/js/site.js
@@ -1275,4 +1275,15 @@ function deviceNumber(devNum){
   }
   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;
+
 }
\ No newline at end of file