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

[Frontend] 修改首頁系統異常閃爍條件(跟隨棟別) | 異常維修名稱欄位 undefined 修正

Browse Source
This commit is contained in:
Celeste 2023-10-13 11:38:16 +08:00
parent c2bb9cb199
commit fa81c4df0f
4 changed files with 6202 additions and 6179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3054
Frontend/_alert.html
View File

File diff suppressed because it is too large Load Diff

4595
Frontend/_operation.html
View File

File diff suppressed because it is too large Load Diff

4717
Frontend/index.html
View File

File diff suppressed because it is too large Load Diff

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

@ -241,12 +241,11 @@ function getOneDeviceAlarmTop10ByBaja(devicePath, callback) {
) )
var _msgText = record.get("alarmData").get("msgText"); // == 1 ? _occurrenceTime : "未確認"; var _msgText = record.get("alarmData").get("msgText"); // == 1 ? _occurrenceTime : "未確認";
var _ackText =
record.get("ackState")
_ss.push({ _ss.push({
uuid: _resultUuid[0], uuid: _resultUuid[0],
msgText: _msgText, msgText: _msgText,
ackState: _ackText, ackState: record.get("ackState"),
timestamp: _occurrenceTime, timestamp: _occurrenceTime,
normalTime: _normalTime, normalTime: _normalTime,
ackedTime: _ackTime ackedTime: _ackTime
@ -592,13 +591,9 @@ function getSystemAlarmByBaja(callback) {
var _index = 0; var _index = 0;
require(["baja!"], function (baja) { require(["baja!"], function (baja) {
// console.log("local:|foxs:"+ port +"|alarm:|bql:select alarmClass where isAlarm") /* console.log(`local:|foxs:${port}|alarm:|bql:select alarmClass where sourceState='offnormal' and alarmData.sourceName like '%${pageAct.AreaTag}_${pageAct.buiTag}%'`)*/
//baja.Ord.make("local:|foxs:|alarm:|bql:select timestamp, ackState, alarmClass, alarmClassDisplayName, alarmValue, alarmData, alarmData.sourceName, uuid, alarmData.msgText, alarmData.numericValue, alarmData.presentValue, alarmData.status, alarmData.toState, normalTime where isAlarm").get() baja.Ord.make(`local:|foxs:${port}|alarm:|bql:select alarmClass where sourceState='offnormal' and alarmData.sourceName like '%${pageAct.AreaTag}_${pageAct.buiTag}%'`)
baja.Ord.make(
"local:|foxs:" +
port +
"|alarm:|bql:select alarmClass where sourceState = 'offnormal'"
)
.get() .get()
.then(function (table) { .then(function (table) {
return table.cursor({ return table.cursor({