@@ -282,13 +281,28 @@
})
// Niagara 產生 file 開頭字串問題
strHtml = strHtml.replaceAll(`src="/file/`, `src="`);
+
if (!res.data || res.data.length == 0) {
endPageLoading();
} else {
+ // 訂閱 baja 設備
subDevice();
}
+
+ // 繪製 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]);
+ }
+ })
+
+ // 初始化 pop 視窗
initPopover();
+ // 卡片設備名稱點擊事件
+ devItemNameEvent();
}
}, null, "POST").send();
}
@@ -349,9 +363,7 @@
function show3DModel(urn) {
$(loadEle).Loading("start");
- getLightData(allDevList);
launchViewerForHotspot(urn, (viewer, nodeIds) => {
- showHeat("[name=forgeHeatBar]");
let devDbIds = allDevList.map(x => x.forge_dbid);
/*hideAllObjects(devDbIds);*/
@@ -454,42 +466,11 @@
$.extend(item, data);
myDataList.push(item);
})
-
- console.log("1", myDataList)
+
setHotspotPoint(myDataList);
- callback ? callback() : "";
- }
- }, null, "POST").send();
-
- }
-
- async function getLightPoint(callback = null) {
- let url = baseApiUrl + "/api/GetDevNodeForCor";
- 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_node_coordinate_3d != null && isJSON(data.device_node_coordinate_3d)) {
- item.position = JSON.parse(data.device_node_coordinate_3d);
- }
- $.extend(item, data);
- myDataList.push(item);
- })
-
- console.log("2", myDataList)
- setLightPoint(myDataList);
+ if (pageAct.sysMainTag == "LT") {
+ setLightPoint(myDataList);
+ }
callback ? callback() : "";
}
}, null, "POST").send();
@@ -501,7 +482,7 @@
getHopspotPoint(myDataList);
}
- async function setLightPoint(myDataList = []) {
+ function setLightPoint(myDataList = []) {
console.log(myDataList)
getLightData(myDataList);
}
diff --git a/Frontend/_sysMonFloor.html b/Frontend/_sysMonFloor.html
index ff6ff9b..81b429c 100644
--- a/Frontend/_sysMonFloor.html
+++ b/Frontend/_sysMonFloor.html
@@ -18,6 +18,9 @@
