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

[Frontend] 即時功率去除 , | 告警系統僅顯示電表系統跟通訊系統

Browse Source
This commit is contained in:
Celeste 2023-09-08 12:33:07 +08:00
parent 25559996ab
commit 40fcbb3f8d
3 changed files with 940 additions and 555 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1325
Frontend/_alert.html
View File

File diff suppressed because it is too large Load Diff

8
Frontend/_dashboard.html
View File

@ -441,11 +441,11 @@
let devPath = tarElePath.split("/")[1]?.split("_").slice(0, 8).join("/"); let devPath = tarElePath.split("/")[1]?.split("_").slice(0, 8).join("/");
let tempOrdPath = { devicePath: devPath }; let tempOrdPath = { devicePath: devPath };
let myBaja = new subscriptionElectricmeter(); let myBaja = new subscriptionElectricmeter();
const deviceTag = devPath.split("/")[devPath.split("/").length - 1]
myBaja.setSubscribeElectricmeterByBql(tempOrdPath); myBaja.setSubscribeElectricmeterByBql(tempOrdPath);
myBaja.setSubscribeElectricmeterCallBack(function (data) { myBaja.setSubscribeElectricmeterCallBack(function (data) {
if (data.point_name == "P") { if (data.point_name === "P" && data.device_number === deviceTag) {
let value = parseFloat(data.value).roundDecimal(2); let value = parseFloat(data.value.replaceAll(",", "")).roundDecimal(2);
$("#insPower").text(value); $("#insPower").text(value);
// $("#insPowerPer").text((value / 4).roundDecimal(2)); // $("#insPowerPer").text((value / 4).roundDecimal(2));
$("#insPowerPer").text((value / contractCapacity).roundDecimal(2)); $("#insPowerPer").text((value / contractCapacity).roundDecimal(2));

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

@ -99,20 +99,32 @@ function getAlarmByBaja(
var _index = 0; var _index = 0;
var _recoverState = isRecover ? "= 'normal'" : "= 'offnormal'"; var _recoverState = isRecover ? "= 'normal'" : "= 'offnormal'";
var _ackState = isAck ? "= 'acked'" : "= 'unacked'"; var _ackState = isAck ? "= 'acked'" : "= 'unacked'";
//console.log("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 alarmClass = '" + alarmClass + "' and timestamp.millis > " + startDate_millisecond + " and timestamp.millis < " + endDate_millisecond + " and normalTime " + _recoverState + " and ackState " + _ackState + " order by timestamp asc") // console.log('@@@@@@@@@',
// "local:|foxs:|alarm:|bql:select timestamp, ackTime, ackState, alarmClass, alarmClassDisplayName, alarmValue, alarmData, alarmData.sourceName, uuid, alarmData.msgText, alarmData.numericValue, alarmData.presentValue, alarmData.status, alarmData.toState, normalTime where alarmClass = '" +
// alarmClass +
// "' and timestamp.millis > " +
// startDate_millisecond +
// " and timestamp.millis < " +
// endDate_millisecond +
// " and sourceState " +
// _recoverState +
// " and ackState " +
// _ackState +
// " order by timestamp asc"
// );
require(["baja!"], function (baja) { require(["baja!"], function (baja) {
baja.Ord.make( baja.Ord.make(
"local:|foxs:|alarm:|bql:select timestamp, ackTime, ackState, alarmClass, alarmClassDisplayName, alarmValue, alarmData, alarmData.sourceName, uuid, alarmData.msgText, alarmData.numericValue, alarmData.presentValue, alarmData.status, alarmData.toState, normalTime where alarmClass = '" + "local:|foxs:|alarm:|bql:select timestamp, ackTime, ackState, alarmClass, alarmClassDisplayName, alarmValue, alarmData, alarmData.sourceName, uuid, alarmData.msgText, alarmData.numericValue, alarmData.presentValue, alarmData.status, alarmData.toState, normalTime where alarmClass = '" +
alarmClass + alarmClass +
"' and timestamp.millis > " + "' and timestamp.millis > " +
startDate_millisecond + startDate_millisecond +
" and timestamp.millis < " + " and timestamp.millis < " +
endDate_millisecond + endDate_millisecond +
" and sourceState " + " and sourceState " +
_recoverState + _recoverState +
" and ackState " + " and ackState " +
_ackState + _ackState +
" order by timestamp asc" " order by timestamp asc"
) )
.get() .get()
.then(function (table) { .then(function (table) {
@ -121,25 +133,24 @@ function getAlarmByBaja(
const alarmDisplayName = const alarmDisplayName =
record.get("alarmData").get("sourceName").split(":")[1] ?? record.get("alarmData").get("sourceName").split(":")[1] ??
record.get("alarmData").get("sourceName").split(":")[0]; record.get("alarmData").get("sourceName").split(":")[0];
//console.log(alarmDisplayName)
_sourceTmp = alarmDisplayName.split("_"); _sourceTmp = alarmDisplayName.split("_");
_bfName = _sourceTmp[1] + "-" + _sourceTmp[4]; _bfName = _sourceTmp[1] + "-" + _sourceTmp[4];
_sourceName = _sourceTmp.slice(0, 8).join("_"); _sourceName = _sourceTmp.slice(0, 8).join("_");
_sourceTmp = _sourceTmp[7] + "-" + _sourceTmp[8]; _sourceTmp = _sourceTmp[7] + "-" + _sourceTmp[8];
if (!_sourceTmp.includes("undefined")) { // if (!_sourceTmp.includes("undefined")) {
_ss.push({ _ss.push({
buildingFloorName_zh: _bfName, buildingFloorName_zh: _bfName,
uuid: record.get("uuid"), uuid: record.get("uuid"),
timestamp: record.get("timestamp").$cEncStr, timestamp: record.get("timestamp").$cEncStr,
alarmClass: record.get("alarmClass"), alarmClass: record.get("alarmClass"),
sourceName_zh: _sourceName, sourceName_zh: _sourceName,
sourceTmp: _sourceTmp, sourceTmp: _sourceTmp,
msgText: record.get("alarmData").get("msgText"), msgText: record.get("alarmData").get("msgText"),
ackState: record.get("ackState"), ackState: record.get("ackState"),
normalTime: record.get("normalTime"), normalTime: record.get("normalTime"),
ackedTime: record.get("ackTime").$cEncStr, ackedTime: record.get("ackTime").$cEncStr,
}); });
} // }
_index++; _index++;
}, },
after: function () { after: function () {
@ -202,8 +213,8 @@ function getOneDeviceAlarmTop10ByBaja(devicePath, callback) {
require(["baja!"], function (baja) { require(["baja!"], function (baja) {
baja.Ord.make( baja.Ord.make(
"local:|foxs:|alarm:|bql:select top 10 timestamp, ackState, alarmData, alarmData.sourceName, sourceState, uuid, alarmData.msgText, normalTime where alarmData.sourceName like '%" + "local:|foxs:|alarm:|bql:select top 10 timestamp, ackState, alarmData, alarmData.sourceName, sourceState, uuid, alarmData.msgText, normalTime where alarmData.sourceName like '%" +
devicePath + devicePath +
"%' order by timestamp desc" "%' order by timestamp desc"
) )
.get() .get()
.then(function (table) { .then(function (table) {
@ -262,7 +273,6 @@ function getOneDeviceAlarmTop10ByBaja(devicePath, callback) {
}) })
.catch(() => { .catch(() => {
$(loadEle).Loading("close"); $(loadEle).Loading("close");
}); });
}); });
} }
@ -305,8 +315,8 @@ function getOneSystemAlarmStateByBaja(systemPath, callback) {
require(["baja!"], function (baja) { require(["baja!"], function (baja) {
baja.Ord.make( baja.Ord.make(
"local:|foxs:|alarm:|bql:select alarmData, alarmData.sourceName, sourceState, uuid where alarmData.sourceName like '%" + "local:|foxs:|alarm:|bql:select alarmData, alarmData.sourceName, sourceState, uuid where alarmData.sourceName like '%" +
systemPath + systemPath +
"%' order by timestamp desc" "%' order by timestamp desc"
) )
.get() .get()
.then(function (table) { .then(function (table) {
@ -360,10 +370,10 @@ function getOneSystemStateByBaja(systemPath, callback) {
require(["baja!"], function (baja) { require(["baja!"], function (baja) {
baja.Ord.make( baja.Ord.make(
"local:|foxs:" + "local:|foxs:" +
port + port +
"|alarm:|bql:select top 1 alarmData, alarmData.sourceName, sourceState where alarmData.sourceName like '%" + "|alarm:|bql:select top 1 alarmData, alarmData.sourceName, sourceState where alarmData.sourceName like '%" +
systemPath + systemPath +
"%' order by timestamp desc" "%' order by timestamp desc"
) )
.get() .get()
.then(function (table) { .then(function (table) {
@ -420,8 +430,8 @@ function getAlarmCountByBaja(callback) {
require(["baja!"], function (baja) { require(["baja!"], function (baja) {
baja.Ord.make( baja.Ord.make(
"local:|foxs:" + "local:|foxs:" +
port + port +
"|alarm:|bql:select COUNT(*) where sourceState = 'offnormal'" "|alarm:|bql:select COUNT(*) where sourceState = 'offnormal'"
) )
.get() .get()
.then(function (table) { .then(function (table) {
@ -468,8 +478,8 @@ function getRecoverCountByBaja(callback) {
require(["baja!"], function (baja) { require(["baja!"], function (baja) {
baja.Ord.make( baja.Ord.make(
"local:|foxs:" + "local:|foxs:" +
port + port +
"|alarm:|bql:select COUNT(*) where normalTime != null" "|alarm:|bql:select COUNT(*) where normalTime != null"
) )
.get() .get()
.then(function (table) { .then(function (table) {
@ -515,8 +525,8 @@ function getCheckedAckedCountByBaja(callback) {
require(["baja!"], function (baja) { require(["baja!"], function (baja) {
baja.Ord.make( baja.Ord.make(
"local:|foxs:" + "local:|foxs:" +
port + port +
"|alarm:|bql:select COUNT(*) where ackState='acked'" "|alarm:|bql:select COUNT(*) where ackState='acked'"
) )
.get() .get()
.then(function (table) { .then(function (table) {
@ -562,8 +572,8 @@ function getUnCheckedAckedCountByBaja(callback) {
require(["baja!"], function (baja) { require(["baja!"], function (baja) {
baja.Ord.make( baja.Ord.make(
"local:|foxs:" + "local:|foxs:" +
port + port +
"|alarm:|bql:select COUNT(*) where ackState='unacked'" "|alarm:|bql:select COUNT(*) where ackState='unacked'"
) )
.get() .get()
.then(function (table) { .then(function (table) {
@ -593,8 +603,8 @@ function getSystemAlarmByBaja(callback) {
//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:|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( baja.Ord.make(
"local:|foxs:" + "local:|foxs:" +
port + port +
"|alarm:|bql:select alarmClass where sourceState = 'offnormal'" "|alarm:|bql:select alarmClass where sourceState = 'offnormal'"
) )
.get() .get()
.then(function (table) { .then(function (table) {
@ -709,8 +719,8 @@ function getOneDeviceAlarmByBaja(devicePath, callback) {
// console.log("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 alarmData.sourceName like '%" + devicePath + "%' order by timestamp desc"); // console.log("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 alarmData.sourceName like '%" + devicePath + "%' order by timestamp desc");
baja.Ord.make( 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 alarmData.sourceName like '%" + "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 alarmData.sourceName like '%" +
devicePath + devicePath +
"%' order by timestamp desc" "%' order by timestamp desc"
) )
.get() .get()
.then(function (table) { .then(function (table) {
@ -770,6 +780,18 @@ function getOtherAlarmByBaja(
console.log( console.log(
"告警2", "告警2",
"local:|foxs:|alarm:|bql:select timestamp, ackTime, priority ,ackState, alarmClass, alarmClassDisplayName, alarmValue, alarmData, alarmData.sourceName, uuid, alarmData.msgText, alarmData.numericValue, alarmData.presentValue, alarmData.status, alarmData.toState, normalTime where " + "local:|foxs:|alarm:|bql:select timestamp, ackTime, priority ,ackState, alarmClass, alarmClassDisplayName, alarmValue, alarmData, alarmData.sourceName, uuid, alarmData.msgText, alarmData.numericValue, alarmData.presentValue, alarmData.status, alarmData.toState, normalTime where " +
startUrl +
"timestamp.millis <= " +
endDate_millisecond +
" and sourceState " +
_recoverState +
" and ackState " +
_ackState +
" order by timestamp desc"
);
require(["baja!"], function (baja) {
baja.Ord.make(
"local:|foxs:|alarm:|bql:select timestamp, ackTime, priority ,ackState, alarmClass, alarmClassDisplayName, alarmValue, alarmData, alarmData.sourceName, uuid, alarmData.msgText, alarmData.numericValue, alarmData.presentValue, alarmData.status, alarmData.toState, normalTime where " +
startUrl + startUrl +
"timestamp.millis <= " + "timestamp.millis <= " +
endDate_millisecond + endDate_millisecond +
@ -778,18 +800,6 @@ function getOtherAlarmByBaja(
" and ackState " + " and ackState " +
_ackState + _ackState +
" order by timestamp desc" " order by timestamp desc"
);
require(["baja!"], function (baja) {
baja.Ord.make(
"local:|foxs:|alarm:|bql:select timestamp, ackTime, priority ,ackState, alarmClass, alarmClassDisplayName, alarmValue, alarmData, alarmData.sourceName, uuid, alarmData.msgText, alarmData.numericValue, alarmData.presentValue, alarmData.status, alarmData.toState, normalTime where " +
startUrl +
"timestamp.millis <= " +
endDate_millisecond +
" and sourceState " +
_recoverState +
" and ackState " +
_ackState +
" order by timestamp desc"
) )
.get() .get()
.then(function (table) { .then(function (table) {
@ -868,14 +878,14 @@ function getAllDeviceAlarmByBaja(
require(["baja!"], function (baja) { require(["baja!"], function (baja) {
baja.Ord.make( baja.Ord.make(
"local:|foxs:|alarm:|bql:select timestamp, ackTime, priority ,ackState, alarmClass, alarmClassDisplayName, alarmValue, alarmData, alarmData.sourceName, uuid, alarmData.msgText, alarmData.numericValue, alarmData.presentValue, alarmData.status, alarmData.toState, normalTime where " + "local:|foxs:|alarm:|bql:select timestamp, ackTime, priority ,ackState, alarmClass, alarmClassDisplayName, alarmValue, alarmData, alarmData.sourceName, uuid, alarmData.msgText, alarmData.numericValue, alarmData.presentValue, alarmData.status, alarmData.toState, normalTime where " +
startUrl + startUrl +
"timestamp.millis <= " + "timestamp.millis <= " +
endDate_millisecond + endDate_millisecond +
" and sourceState " + " and sourceState " +
_recoverState + _recoverState +
" and ackState " + " and ackState " +
_ackState + _ackState +
" order by timestamp desc" " order by timestamp desc"
) )
.get() .get()
.then(function (table) { .then(function (table) {
@ -951,14 +961,14 @@ function getDeviceAlarmCardByBaja(
require(["baja!"], function (baja) { require(["baja!"], function (baja) {
baja.Ord.make( baja.Ord.make(
"local:|foxs:|alarm:|bql:select timestamp, ackTime, priority ,ackState, alarmClass, alarmClassDisplayName, alarmValue, alarmData, alarmData.sourceName, uuid, alarmData.msgText, alarmData.numericValue, alarmData.presentValue, alarmData.status, alarmData.toState, normalTime where " + "local:|foxs:|alarm:|bql:select timestamp, ackTime, priority ,ackState, alarmClass, alarmClassDisplayName, alarmValue, alarmData, alarmData.sourceName, uuid, alarmData.msgText, alarmData.numericValue, alarmData.presentValue, alarmData.status, alarmData.toState, normalTime where " +
startUrl + startUrl +
"timestamp.millis <= " + "timestamp.millis <= " +
endDate_millisecond + endDate_millisecond +
" and sourceState " + " and sourceState " +
_recoverState + _recoverState +
" and ackState " + " and ackState " +
_ackState + _ackState +
" order by timestamp desc" " order by timestamp desc"
) )
.get() .get()
.then(function (table) { .then(function (table) {