diff --git a/Frontend/_alert.html b/Frontend/_alert.html
index 9a930f1..7ca1713 100644
--- a/Frontend/_alert.html
+++ b/Frontend/_alert.html
@@ -220,6 +220,8 @@
first = true;
let dataAlarm = [];
var historyTable = null;
+ var elemIndex = 0;
+ var index = 0;
$(function () {
initDropzone();
@@ -254,7 +256,7 @@
//});
if (pageAct.SysType == "all") {
- if (!$(this).is(':checked')) {
+ if ($(this).is(':checked')) {
$(this).prop('checked', true);
$(this).click();
}
@@ -639,7 +641,10 @@
}
else {
let elem = $('input[type=checkbox][data-type=sub]:checked');
+ elemIndex = 0;
+ index = 0;
if (elem && elem.length > 0) {
+ elemIndex = elem.length;
elem.each(function (i, v) {
if (v?.id === "other") {
console.log(v?.id)
@@ -663,7 +668,10 @@
res.data.forEach(v => {
dataAlarm.push(v);
});
- callBackFromOneDeviceAlert(dataAlarm);
+ index++;
+
+ if (elemIndex == index)
+ callBackFromOneDeviceAlert(dataAlarm);
}
function callBackFromAllDeviceAlert(res) {