diff --git a/Frontend/_alert.html b/Frontend/_alert.html index 47b2381..c5478e6 100644 --- a/Frontend/_alert.html +++ b/Frontend/_alert.html @@ -230,11 +230,11 @@ if (!pageAct.selAllSysSub) { console.log(this); pageAct.selAllSysSub = true; - + $.each($('input[type=checkbox][data-type=sub]:checked'), function (i, v) { $(v).click(); }); - + if (pageAct.SysType == "all") { if (!$(this).is(':checked')) { $(this).prop('checked', true); @@ -470,7 +470,6 @@ $('#confirmed').addClass('btn-info'); $('#unconfirmed').addClass('btn-secondary'); } - if (!first) getData(); } @@ -509,7 +508,7 @@ // 全部類別 // `; //} - + //$.each(res.data.history_Main_Systems, function (i, v) { // if (pageAct.mainStatus) { // mainStrHtml += `
@@ -619,7 +618,7 @@ } function callBackFromAllDeviceAlert(res) { - res = JSON.parse(res); + refTable(res.data); if (historyTable != null) { let t = $('#alertTable').dataTable(); @@ -850,9 +849,7 @@ } function chgAck(devUuid) { - $.post(window.location.origin + '/obix/alarm/' + devUuid + '/ack', '', function () { - - }, "text"); + $.post(window.location.origin + '/obix/alarm/' + devUuid + '/ack', '', null, "text"); getData(); } \ No newline at end of file diff --git a/Frontend/_dashboard.html b/Frontend/_dashboard.html index 1c59f01..5082f32 100644 --- a/Frontend/_dashboard.html +++ b/Frontend/_dashboard.html @@ -483,11 +483,6 @@ x: { offset: true, grid: { color: color.fusion._500 }, - ticks: { - callback: function (value, index, ticks) { - return value - } - }, }, y: { beginAtZero: true, @@ -572,11 +567,6 @@ x: { offset: true, grid: { color: color.fusion._500 }, - ticks: { - callback: function (value, index, ticks) { - return value - } - }, }, y: { beginAtZero: true, @@ -598,7 +588,7 @@ } }, } - + console.log(eveWeekElecChartData) if (eveWeekElecChart == null) { eveWeekElecChart = new Chart(eveWeekElecChartCanvas, { data: eveWeekElecChartData, diff --git a/Frontend/_graphManagement.html b/Frontend/_graphManagement.html index 8ecee15..6a829fe 100644 --- a/Frontend/_graphManagement.html +++ b/Frontend/_graphManagement.html @@ -577,9 +577,7 @@ let graMyDesDiaFile = uploader["graMyDesignDiagram"][0].dropzone.files.filter(x => x.accepted == true)[0]; /*let graMyAsBuiFile = uploader["graMyAsBuilt"][0].dropzone.files.filter(x => x.accepted == true)[0];*/ let fd = new FormData(); - fd.append("code", $("#graPicNum").val()); fd.append("layer_id", curLayerId); - fd.append("name", $("#graPicName").val()); fd.append("oriOrgName", graMyDesDiaFile?.name ?? null); /*fd.append("donOrgName", graMyAsBuiFile?.name ?? null);*/ fd.append("oriSavName", graMyDesDiaFile?.savename ?? null); diff --git a/Frontend/_historyData.html b/Frontend/_historyData.html index 677335d..37004a3 100644 --- a/Frontend/_historyData.html +++ b/Frontend/_historyData.html @@ -197,7 +197,7 @@