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 = ``; $("#lightSchBlock").html(iframe); } @@ -564,7 +565,7 @@ $.each(floObj.device_list, (index2, devObj) => { allDevList.push(devObj); let devItem = getRiserPoiObj(); - strHtml += `
@@ -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