diff --git a/Frontend/js/forge/forgemodel.js b/Frontend/js/forge/forgemodel.js index 7021e65..34ed5a5 100644 --- a/Frontend/js/forge/forgemodel.js +++ b/Frontend/js/forge/forgemodel.js @@ -762,37 +762,22 @@ async function loadHeatmaps(model) { //取三個空調設備的位置打點 const devices = [ - //{ - // id: "Oficina 5", - // position: { x: -4.93, y: -20.61, z: 16.86 }, // x: 0, y: 25, z: -2.5 - // sensorTypes: ["temperature", "humidity"] - //}, - //{ - // id: "Oficina 4", - // position: { x: 23.94, y: -3.85, z: 16.86 }, // x: 0, y: 25.03, z: -2.52 - // sensorTypes: ["temperature", "humidity"] - //}, - //{ - // id: "Oficina 3", - // position: { x: -4.93, y: -3.85, z: 16.86 }, // x: 0, y: 25.03, z: -2.52 - // sensorTypes: ["temperature", "humidity"] - //} { id: "Oficina 5", //name: "Oficina-", - position: { x: 3.35, y: -4.81, z: 12.88 }, // x: 0, y: 25, z: -2.5 (3.35, -4.81, 12.88 + position: { x: 6.98, y: -19.00, z: 16.86 }, // x: 0, y: 25, z: -2.5 (-4.93, -20.61, 16.86) sensorTypes: ["temperature", "humidity"] }, { id: "Oficina 4", //name: "Oficina-", - position: { x: 37.03, y: -4.81, z: 12.88 }, // x: 0, y: 25.03, z: -2.52 (37.03, -4.81, 12.88) + position: { x: 35.85, y: -2.24, z: 16.86 }, // x: 0, y: 25.03, z: -2.52 (23.94, -3.85, 16.86) sensorTypes: ["temperature", "humidity"] }, { id: "Oficina 3", //name: "Oficina-", - position: { x: 2.83, y: -22.60, z: 12.88 }, // x: 0, y: 25.03, z: -2.52 (2.83, -22.60, 12.88) + position: { x: 6.98, y: -2.24, z: 16.86 }, // x: 0, y: 25.03, z: -2.52 (-4.93, -3.85, 16.86) sensorTypes: ["temperature", "humidity"] } ]; @@ -805,9 +790,7 @@ async function loadHeatmaps(model) { } const roomDbIds = []; - roomDbIds.push(8181);//房間的dbid 七樓的 Room3-5 792 - roomDbIds.push(8183); - roomDbIds.push(8185); + roomDbIds.push(7567); const { SurfaceShadingData,