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

1135
Frontend/_alert.html
View File

File diff suppressed because it is too large Load Diff

6
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));

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

@ -99,7 +99,19 @@ 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 = '" +
@ -121,12 +133,11 @@ 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"),
@ -139,7 +150,7 @@ function getAlarmByBaja(
normalTime: record.get("normalTime"), normalTime: record.get("normalTime"),
ackedTime: record.get("ackTime").$cEncStr, ackedTime: record.get("ackTime").$cEncStr,
}); });
} // }
_index++; _index++;
}, },
after: function () { after: function () {
@ -262,7 +273,6 @@ function getOneDeviceAlarmTop10ByBaja(devicePath, callback) {
}) })
.catch(() => { .catch(() => {
$(loadEle).Loading("close"); $(loadEle).Loading("close");
}); });
}); });
} }