From 092c055c2ea372282561647ad9a7975fa5ef3a0f Mon Sep 17 00:00:00 2001 From: Celeste Date: Tue, 14 Feb 2023 15:16:11 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=89=8D=E5=8F=B0]=E7=B3=BB=E7=B5=B1=E7=9B=A3?= =?UTF-8?q?=E6=8E=A7=E8=A9=B3=E7=B4=B0=E8=B3=87=E6=96=99=20zoom=20in=20=20?= =?UTF-8?q?|=20=E6=84=9F=E6=B8=AC=E8=A8=AD=E5=82=99=E9=9A=A8=E9=9B=BB?= =?UTF-8?q?=E6=A2=AF=E7=A7=BB=E5=8B=95=E5=8F=8A=E6=BA=AB=E5=BA=A6=E8=AE=8A?= =?UTF-8?q?=E5=8C=96=20|=20=20=E7=B3=BB=E7=B5=B1=E7=9B=A3=E6=8E=A7=20pop?= =?UTF-8?q?=20=E5=B0=8F=E5=8D=A1=20icon=20=E5=8A=9F=E8=83=BD=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Frontend/_sysElevator.html | 72 +++- Frontend/_sysMonAll.html | 159 ++++---- Frontend/img/forge/sensor_circle.svg | 7 + Frontend/index.html | 51 ++- Frontend/js/forge/forgemodel.js | 140 +++++--- Frontend/js/site.js | 519 +++++++++++++-------------- 6 files changed, 546 insertions(+), 402 deletions(-) create mode 100644 Frontend/img/forge/sensor_circle.svg diff --git a/Frontend/_sysElevator.html b/Frontend/_sysElevator.html index 1f6330f..18f02c4 100644 --- a/Frontend/_sysElevator.html +++ b/Frontend/_sysElevator.html @@ -1,25 +1,61 @@
@@ -215,7 +251,7 @@
+ title="即時狀態"> @@ -899,7 +935,7 @@ setBuildFloor(); setCards(); - + setEleManTable(); show3D(); }) @@ -2374,7 +2410,7 @@ // ↑ 樓層平面圖 ↑ //===================================================================== - // 設置 模型隱藏或透明 + // 設置 模型隱藏或透明 function setInviForge(type, devDbIds) { console.log("devDbIds", devDbIds) if (type == "Hide") { @@ -2402,8 +2438,8 @@ //載入3D模型 function load3DModel() { launchViewer(pageAct.urn, (viewer) => { - - + + let elevOption = { selector: "#forgeViewer", viewer: viewer, @@ -2427,8 +2463,8 @@ subDeviceSetStatus(data); } forge3DElev.init(); - - + + }); } diff --git a/Frontend/_sysMonAll.html b/Frontend/_sysMonAll.html index e30f7d3..4c12cd9 100644 --- a/Frontend/_sysMonAll.html +++ b/Frontend/_sysMonAll.html @@ -11,7 +11,8 @@
-