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-06 16:43:54 +08:00
commit b49177cd5f
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Frontend/index.html
View File

@ -1152,7 +1152,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
getAlarmSub(data); getAlarmSub(data);
} }
alarmIconBlink(); alarmIconBlink(data);
}); });
getAlarm(); getAlarm();
}); });

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

@ -780,7 +780,7 @@ function getOtherAlarmByBaja(
startUrl + startUrl +
"timestamp.millis <= " + "timestamp.millis <= " +
endDate_millisecond + endDate_millisecond +
" and normalTime " + " and sourceState " +
_recoverState + _recoverState +
" and ackState " + " and ackState " +
_ackState + _ackState +
@ -820,10 +820,10 @@ function getOtherAlarmByBaja(
main.ackedTime = record.get("ackTime").$cEncStr; main.ackedTime = record.get("ackTime").$cEncStr;
main.ackState = record.get("ackState").$ordinal; main.ackState = record.get("ackState").$ordinal;
if (_sourceTmp.includes("undefined")) { if (_sourceTmp.includes("undefined")) {
main.buildingFloorName_zh = "無"; main.buildingFloorName_zh = "";
main.alarmClass = "系統/設備異常"; //main.alarmClass = "系統異常";
main.sourceTmp = "無"; main.sourceTmp = "";
main.msgText = ""; //main.msgText = "";
_result.data.push(main); _result.data.push(main);
} }
@ -901,10 +901,10 @@ function getAllDeviceAlarmByBaja(
main.ackState = record.get("ackState").$ordinal; main.ackState = record.get("ackState").$ordinal;
if (_sourceTmp.includes("undefined")) { if (_sourceTmp.includes("undefined")) {
// console.log(main.ackState) // console.log(main.ackState)
main.buildingFloorName_zh = "無"; main.buildingFloorName_zh = "";
main.alarmClass = "系統/設備異常"; //main.alarmClass = "系統異常";
main.sourceTmp = "無"; main.sourceTmp = "";
main.msgText = ""; //main.msgText = "";
} }
_result.data.push(main); _result.data.push(main);
_index++; _index++;