diff --git a/Frontend/_sysElevator.html b/Frontend/_sysElevator.html
index 946f971..507484e 100644
--- a/Frontend/_sysElevator.html
+++ b/Frontend/_sysElevator.html
@@ -1964,7 +1964,7 @@
})
.fail(function () {
- toast_warning("查無該樓層地圖")
+ // toast_warning("查無該樓層地圖")
floChart.clear();
});
diff --git a/Frontend/_sysMonAll.html b/Frontend/_sysMonAll.html
index 64c6432..0901c5e 100644
--- a/Frontend/_sysMonAll.html
+++ b/Frontend/_sysMonAll.html
@@ -150,7 +150,7 @@
let cloDevPoiName = matchDevice.device_close_point_name;
let errDevPoiName = matchDevice.device_error_point_name;
- if (data.point_name == "ONOFF" && pageAct.sysSubTag === "L1") {
+ if (data.point_name == "SSC" && pageAct.sysSubTag === "L1") {
const lightOn = data.value.includes("true");
setLightOpenOrClose(lightOn, matchDevice.device_guid);
@@ -254,6 +254,160 @@
}
});
}
+ // function subDevice() {
+ // let myBaja = new subscriptionDevices();
+ // var ordPath = {
+ // area_tag: pageAct.AreaTag,
+ // building_tag: pageAct.buiTag,
+ // system_tag: pageAct.sysMainTag,
+ // name_tag: pageAct.sysSubTag,
+ // };
+ // myBaja.setSubscribeDevicesByBql(ordPath);
+
+ // // 燈熱點用
+ // let lightOnHotColorArr = [];
+ // let lightOffHotColorArr = [];
+ // // 燈光圈用
+ // let lightOnGuidArr = [];
+ // let lightOffGuidArr = [];
+
+ // myBaja.setSubscribeDevicesCallBack(function (data) {
+ // // console.log(data)
+ // let matchDevice = allDevList.filter(
+ // (x) => x.device_number == data.device_number_full
+ // )[0];
+ // if (!matchDevice) {
+ // return false;
+ // }
+
+ // //將訂閱值塞入 subDeviceData
+ // if (
+ // subDeviceData.findIndex(
+ // (x) => x.device_number == matchDevice.device_number
+ // ) == -1
+ // ) {
+ // let obj = {};
+ // obj.device_number = matchDevice.device_number;
+ // obj.dbid = matchDevice.forge_dbid;
+ // subDeviceData.push(obj);
+ // }
+
+ // let subData = subDeviceData.filter(
+ // (x) => x.device_number == matchDevice.device_number
+ // )[0];
+
+ // if (subData) {
+ // subData[data.point_name] = data.value;
+ // }
+
+ // let norDevPoiName = matchDevice.device_normal_point_name;
+ // let cloDevPoiName = matchDevice.device_close_point_name;
+ // let errDevPoiName = matchDevice.device_error_point_name;
+
+ // if (data.point_name == "ONOFF" && pageAct.sysSubTag === "L1") {
+ // const lightOn = data.value.includes("true");
+
+ // setLightOpenOrClose(lightOn, matchDevice.device_guid);
+ // if (lightOn) {
+ // setLightValues(matchDevice.device_guid, 200, 0xe1cf18);
+ // // changeColorForHotspot(matchDevice.spriteDbid, null, true)
+ // if (
+ // !lightOnHotColorArr.some(
+ // ({ spriteDbid }) => spriteDbid === matchDevice.spriteDbid
+ // )
+ // ) {
+ // lightOnHotColorArr.push(matchDevice);
+ // }
+ // lightOffHotColorArr = lightOffHotColorArr.filter(
+ // (light) => light.spriteDbid !== matchDevice.spriteDbid
+ // );
+ // heatMap?.changeTemp(matchDevice.device_number, 40);
+ // } else {
+ // setLightValues(matchDevice.device_guid, 0, 0xffffff);
+ // // changeColorForHotspot(matchDevice.spriteDbid)
+ // if (
+ // !lightOffHotColorArr.some(
+ // ({ spriteDbid }) => spriteDbid === matchDevice.spriteDbid
+ // )
+ // ) {
+ // lightOffHotColorArr.push(matchDevice);
+ // }
+ // lightOnHotColorArr = lightOnHotColorArr.filter(
+ // (light) => light.spriteDbid !== matchDevice.spriteDbid
+ // );
+
+ // heatMap?.changeTemp(matchDevice.device_number, 0);
+ // }
+ // }
+
+ // if (data.point_name == "Temp") {
+ // heatMap?.changeTemp(
+ // data.device_number_full,
+ // !isNaN(parseInt(data.value)) ? parseInt(data.value) : 0
+ // );
+ // let devIdx = allDevList.findIndex(
+ // (x) => x.device_number == data.device_number_full
+ // );
+ // allDevList[devIdx]._temp = !isNaN(parseInt(data.value))
+ // ? parseInt(data.value)
+ // : 0;
+ // }
+ // if (
+ // data.point_name == norDevPoiName &&
+ // data.value == matchDevice.device_normal_point_value
+ // ) {
+ // //顯示正常燈號
+ // $(`#${matchDevice.device_number}_status`)
+ // .attr("data-light-type", "normal")
+ // .data("light-type", "normal");
+ // } else if (
+ // data.point_name == cloDevPoiName &&
+ // data.value == matchDevice.device_close_point_value
+ // ) {
+ // $(`#${matchDevice.device_number}_status`)
+ // .attr("data-light-type", "close")
+ // .data("light-type", "close");
+ // } else if (
+ // data.point_name == errDevPoiName &&
+ // data.value == matchDevice.device_error_point_value
+ // ) {
+ // $(`#${matchDevice.device_number}_status`)
+ // .attr("data-light-type", "error")
+ // .data("light-type", "error");
+ // }
+ // if (
+ // allDevList.length ===
+ // lightOnHotColorArr.length + lightOffHotColorArr.length
+ // ) {
+ // changeColorForHotspot(
+ // lightOnHotColorArr.map(({ spriteDbid }) => spriteDbid),
+ // null,
+ // true
+ // );
+ // changeColorForHotspot(
+ // lightOffHotColorArr.map(({ spriteDbid }) => spriteDbid),
+ // null,
+ // false
+ // );
+
+ // }
+ // $(loadEle).Loading("close");
+
+ // setLightColor();
+ // setForgeHotSpotColor(matchDevice);
+ // lightDevForgeSpotLig(matchDevice);
+ // // 從設備訂閱更新每個設備卡片即時點位
+ // setDevItemPoiValBySub(data);
+ // });
+
+ // myBaja.setSubscribeDeviceEndCallBack(function (data) {
+ // endPageLoading();
+ // if (data.findIndex((x) => x.point_name == "Temp") != -1) {
+ // // 顯示溫度條
+ // showHeat("[name=forgeHeatBar]");
+ // }
+ // });
+ // }
function lightDevForgeSpotLig(devObj) { }
diff --git a/Frontend/_sysMonFloor.html b/Frontend/_sysMonFloor.html
index 63b40e6..ab84263 100644
--- a/Frontend/_sysMonFloor.html
+++ b/Frontend/_sysMonFloor.html
@@ -16,8 +16,10 @@
-->
@@ -565,7 +569,7 @@
? parseInt(data.value)
: 0;
}
- if (data.point_name == "ONOFF" && pageAct.sysSubTag === "L1") {
+ if (data.point_name == "SSC" && pageAct.sysSubTag === "L1") {
const lightOn = data.value.includes("true");
setLightOpenOrClose(lightOn, matchDevice.device_guid);
if (lightOn && matchDevice.spriteDbid) {
@@ -681,8 +685,8 @@
$(loadEle).Loading("close");
} else if (
deviceScatterCloseArr.length +
- deviceScatterNormalArr.length +
- deviceScatterErrorArr.length ===
+ deviceScatterNormalArr.length +
+ deviceScatterErrorArr.length ===
option.series[0].data.length
) {
deviceScatterNormalArr.forEach((device) => {
@@ -759,7 +763,7 @@
viewer: viewer,
nodeId: node,
floorHeight: elev3DOption.floorHeight ?? [],
- inited: function () { },
+ inited: function () {},
};
let elevator3DObj = new elevator3D(options);
let devNum = Object.keys(elev3DBind).filter(
@@ -951,7 +955,7 @@
);
temp_point_value =
allDeviceRowData[device_index].points[
- item.device_normal_point_name
+ item.device_normal_point_name
];
if (temp_point_value == item.device_normal_point_value) {
item_node.device_color = item.device_normal_color;
@@ -960,7 +964,7 @@
if (item.device_close_point_name != null) {
temp_point_value =
allDeviceRowData[device_index].points[
- item.device_close_point_name
+ item.device_close_point_name
];
if (temp_point_value == item.device_close_point_value) {
item_node.device_color = item.device_close_color;
@@ -970,14 +974,14 @@
if (item.device_normal_point_name == "ER") {
temp_point_value =
allDeviceRowData[device_index].points[
- item.device_normal_point_name
+ item.device_normal_point_name
];
if (temp_point_value == "true") {
item_node.device_color = item.device_normal_color;
} else {
temp_point_value =
allDeviceRowData[device_index].points[
- item.device_close_point_name
+ item.device_close_point_name
];
if (temp_point_value == item.device_close_point_value) {
item_node.device_color = item.device_close_color;
@@ -986,14 +990,14 @@
} else if (item.device_close_point_name == "ER") {
temp_point_value =
allDeviceRowData[device_index].points[
- item.device_close_point_name
+ item.device_close_point_name
];
if (temp_point_value == "true") {
item_node.device_color = item.device_close_color;
} else {
temp_point_value =
allDeviceRowData[device_index].points[
- item.device_normal_point_name
+ item.device_normal_point_name
];
if (
temp_point_value == item.device_normal_point_value
@@ -1004,7 +1008,7 @@
} else {
temp_point_value =
allDeviceRowData[device_index].points[
- item.device_normal_point_name
+ item.device_normal_point_name
];
if (temp_point_value == item.device_normal_point_value) {
item_node.device_color = item.device_normal_color;
@@ -1607,23 +1611,23 @@
selector: "#forgeViewer",
elevCb: elevatorShow
? () => {
- let elevOption = {
- selector: "#forgeViewer",
- viewer: viewer,
- ordPath: {
- area_tag: pageAct.AreaTag,
- building_tag: pageAct.buiTag,
- },
- sensorObjs,
- };
+ let elevOption = {
+ selector: "#forgeViewer",
+ viewer: viewer,
+ ordPath: {
+ area_tag: pageAct.AreaTag,
+ building_tag: pageAct.buiTag,
+ },
+ sensorObjs,
+ };
- // 電梯移動訂閱程序載入
- let forge3DElev = new Forge3DElevFull(elevOption);
- forge3DElev.bajaEndCallback = function () {
- endPageLoading();
- };
- forge3DElev.init();
- }
+ // 電梯移動訂閱程序載入
+ let forge3DElev = new Forge3DElevFull(elevOption);
+ forge3DElev.bajaEndCallback = function () {
+ endPageLoading();
+ };
+ forge3DElev.init();
+ }
: null,
curDevice: {
...device,
@@ -1720,10 +1724,10 @@
let name =
lightControl === "node" && pageAct.sysSubTag === "L1"
? currentData.filter(
- (x) => x.device_node_guid == devObj.device_node_guid
- )[0]?.device_node_full_name
+ (x) => x.device_node_guid == devObj.device_node_guid
+ )[0]?.device_node_full_name
: currentData.filter((x) => x.device_guid == devObj.device_guid)[0]
- ?.full_name;
+ ?.full_name;
devObj.full_name = name;
parentEle = crePosPopover(position, devObj);
$(parentEle).click();
diff --git a/Frontend/js/forge/forgemodel.js b/Frontend/js/forge/forgemodel.js
index a0bdaf6..dc5fb0c 100644
--- a/Frontend/js/forge/forgemodel.js
+++ b/Frontend/js/forge/forgemodel.js
@@ -181,7 +181,7 @@ class elevator3D {
this.ele = option.element;
this.viewer = option.viewer;
this.nodeId = option.nodeId;
- this.speed = option.speed ?? 0.07;
+ this.speed = option.speed ?? 0.18;
this.tagValue = option.tagValue ?? "";
this.fragProxys = [];
this.fragProxy = null;