+ strHtml += `
`;
@@ -697,17 +707,59 @@
})
$("#sysSubBtnList").html(strHtml);
getAlarmSub();
+
}
}, null, "POST").send();
}
- function getAlarmSub() {
- $(".dev-group").each((idx, ele) => {
- let path = $(ele).data("id");
- getOneSystemStateByBaja(path, (data) => {
- console.log(data)
- })
+ function getFirstEletric() {
+ let url = baseApiUrl + "/api/Device/GetDeviceList";
+ let sendData = {
+ sub_system_tag: "E4",
+ building_tag: pageAct.buiTag,
+ };
+ objSendData.Data = sendData;
+ ytAjax = new YourTeam.Ajax(url, objSendData, function (res) {
+ if (!res || res.code != "0000" || !res.data) {
+
+ } else {
+
+ $.each(res.data, (index, floObj) => {
+ $.each(floObj.device_list, (index2, devObj) => {
+ tarElePath = devObj.device_number;
+ })
+ })
+
+ getElectricBaja();
+ }
+ }, null, "POST").send();
+ }
+
+ function getElectricBaja() {
+ let devPath = tarElePath.split("_").slice(0, 8).join("_");
+
+ let today = displayDate(new Date, "date").replaceAll("/", "-") + "T00:00:00";
+ let tomorrow = displayDate(new Date(new Date(today).getTime() + (24 * 60 * 60 * 1000)), "date").replaceAll("/", "-") + "T00:00:00";
+
+ getElectricMeterDayDataByBaja(devPath + "_KWH", "Mitsubishi_Sup", today, tomorrow, (data) => {
+ console.log(data)
})
+ }
+
+ function getAlarmSub() {
+
+
+ //$(".dev-group").each((idx, ele) => {
+ // let path = $(ele).data("id");
+ // let start = (new Date()).getTime();
+ // console.log("path enter baja:", path);
+ // getOneSystemStateByBaja(path, (data) => {
+ // let end = (new Date()).getTime();
+ // console.log("執行時間 :" + (end - start) / 1000 + " 秒","path : " + path, "輸出結果 :"+ data)
+
+
+ // })
+ //})
}
\ No newline at end of file
diff --git a/Frontend/_sysElevator.html b/Frontend/_sysElevator.html
index 5d206ab..47c96d5 100644
--- a/Frontend/_sysElevator.html
+++ b/Frontend/_sysElevator.html
@@ -861,7 +861,7 @@
var subSeviceData = []; //每個設備訂閱點位值
var floList = []; //每個樓層
var elevObj = null; //左側 2D 電梯物件
- var viewer3DNodeIds = [233, 228, 223];
+ var viewer3DNodeIds = [758, 753, 748];
var elev3DBind = {};
var elev3DOption = {};
var elev3DObj = [];
@@ -2395,7 +2395,7 @@
function load3DModel() {
- launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dGEzaHFzZmZ6cWJub3V4a3BsZGt1a3NldzRzajIxdzUtYmltc19tb2RlbHMvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDLm53ZA==', (viewer) => {
+ launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dGEzaHFzZmZ6cWJub3V4a3BsZGt1a3NldzRzajIxdzUtYmltc19tb2RlbHMvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDMjAyMjEyMDEubndk', (viewer) => {
$.each(viewer3DNodeIds, function (idx, node) {
let options = {
element: $("#forgeViewer"),
diff --git a/Frontend/index.html b/Frontend/index.html
index d8da4e7..7f6ab0b 100644
--- a/Frontend/index.html
+++ b/Frontend/index.html
@@ -1417,8 +1417,8 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
+
+
-->
@@ -1518,11 +1518,6 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
+ 賦歸數量
+ 未確認異常
+ 
+ 
+