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

Frontend/_sysMonAll.html

@@ -198,7 +198,7 @@
 
       if (
         data.point_name == norDevPoiName &&
-                data.value == matchDevice.device_normal_point_value &&
+        (data.value == matchDevice.device_normal_point_value || norDevPoiName === errDevPoiName) &&
         !deviceNormalArr.some(
           ({ device_number }) => device_number === matchDevice.device_number
         )

Frontend/_sysMonFloor.html

@@ -624,7 +624,7 @@
 
       if (
         data.point_name == norDevPoiName &&
-                data.value == matchDevice.device_normal_point_value &&
+        (data.value == matchDevice.device_normal_point_value || norDevPoiName === errDevPoiName) &&
         !deviceScatterNormalArr.some(
           ({ device_number }) => data.device_number_full === device_number
         )

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;