[Frontend] 修改首頁系統異常閃爍條件(跟隨棟別) | 異常維修名稱欄位 undefined 修正
This commit is contained in:
parent
c2bb9cb199
commit
fa81c4df0f
3054
Frontend/_alert.html
3054
Frontend/_alert.html
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
4717
Frontend/index.html
4717
Frontend/index.html
File diff suppressed because it is too large
Load Diff
@ -241,12 +241,11 @@ function getOneDeviceAlarmTop10ByBaja(devicePath, callback) {
|
||||
)
|
||||
|
||||
var _msgText = record.get("alarmData").get("msgText"); // == 1 ? _occurrenceTime : "未確認";
|
||||
var _ackText =
|
||||
record.get("ackState")
|
||||
|
||||
_ss.push({
|
||||
uuid: _resultUuid[0],
|
||||
msgText: _msgText,
|
||||
ackState: _ackText,
|
||||
ackState: record.get("ackState"),
|
||||
timestamp: _occurrenceTime,
|
||||
normalTime: _normalTime,
|
||||
ackedTime: _ackTime
|
||||
@ -592,13 +591,9 @@ function getSystemAlarmByBaja(callback) {
|
||||
var _index = 0;
|
||||
|
||||
require(["baja!"], function (baja) {
|
||||
// console.log("local:|foxs:"+ port +"|alarm:|bql:select alarmClass where isAlarm")
|
||||
//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'"
|
||||
)
|
||||
/* 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:${port}|alarm:|bql:select alarmClass where sourceState='offnormal' and alarmData.sourceName like '%${pageAct.AreaTag}_${pageAct.buiTag}%'`)
|
||||
|
||||
.get()
|
||||
.then(function (table) {
|
||||
return table.cursor({
|
||||
|
Loading…
Reference in New Issue
Block a user