Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS

2023-06-02 18:02:20 +08:00 · 2023-06-02 18:02:20 +08:00 · e5b20132ad
commit e5b20132ad
parent 6458a10215 31aa51985f
4 changed files with 3064 additions and 2796 deletions
--- a/Frontend/_sysMonAll.html
+++ b/Frontend/_sysMonAll.html
--- a/Frontend/_sysMonFloor.html
+++ b/Frontend/_sysMonFloor.html
--- a/Frontend/js/forge/forgemodel.js
+++ b/Frontend/js/forge/forgemodel.js
@ -910,6 +910,7 @@ async function testNewLight(dataList) {

 //------------------- 加入熱點 -----------------
 async function addHotPoint(data) {
+    if (pageAct.sysMainTag == null && pageAct.sysSubTag == null) return
    var viewer = data.target ? data.target : data;
    const dataVizExtn = await viewer.loadExtension("Autodesk.DataVisualization");
    const DataVizCore = Autodesk.DataVisualization.Core;
--- a/Frontend/js/n4js/alarmbaja.js
+++ b/Frontend/js/n4js/alarmbaja.js