jay.chang/ibms-dome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
dev02 2023-06-02 18:02:20 +08:00
commit e5b20132ad
4 changed files with 3064 additions and 2796 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Frontend/_sysMonAll.html
View File

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

2
Frontend/_sysMonFloor.html
View File

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

1
Frontend/js/forge/forgemodel.js
View File

@ -910,6 +910,7 @@ async function testNewLight(dataList) {
//------------------- 加入熱點 ----------------- //------------------- 加入熱點 -----------------
async function addHotPoint(data) { async function addHotPoint(data) {
if (pageAct.sysMainTag == null && pageAct.sysSubTag == null) return
var viewer = data.target ? data.target : data; var viewer = data.target ? data.target : data;
const dataVizExtn = await viewer.loadExtension("Autodesk.DataVisualization"); const dataVizExtn = await viewer.loadExtension("Autodesk.DataVisualization");
const DataVizCore = Autodesk.DataVisualization.Core; const DataVizCore = Autodesk.DataVisualization.Core;

667
Frontend/js/n4js/alarmbaja.js
View File

File diff suppressed because it is too large Load Diff