From e43389724fca5a5bba83321c570244dd500959ba Mon Sep 17 00:00:00 2001 From: dev01 Date: Wed, 18 Jan 2023 17:49:25 +0800 Subject: [PATCH] =?UTF-8?q?[Frontend]=20=E5=91=8A=E8=AD=A6=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=BE=9E=20niagara=20=E5=8F=96=E8=B3=87=E6=96=99?= =?UTF-8?q?=E4=B8=A6=E5=8F=AF=E4=BB=A5=E7=99=BC=E9=80=81ack=E7=A2=BA?= =?UTF-8?q?=E8=AA=8D=E7=A8=8B=E5=BA=8F=E5=BB=BA=E7=BD=AE=20|=20[=E5=84=80?= =?UTF-8?q?=E9=8C=B6=E6=9D=BF]=20=E5=9C=96=E8=A1=A8=20x=20=E8=BB=B8?= =?UTF-8?q?=E6=96=87=E5=AD=97=E8=AA=BF=E6=95=B4=20|=20[=E5=8D=B3=E6=99=82?= =?UTF-8?q?=E5=91=8A=E8=AD=A6]=20=E4=BF=AE=E5=BE=A9=E5=85=A8=E9=81=B8?= =?UTF-8?q?=E8=B3=87=E6=96=99=E5=87=BA=E4=B8=8D=E4=BE=86=E5=95=8F=E9=A1=8C?= =?UTF-8?q?=20|=20[=E5=9C=96=E8=B3=87=E7=AE=A1=E7=90=86]=20=E4=BF=AE?= =?UTF-8?q?=E5=BE=A9=E4=B8=8A=E5=82=B3=E7=85=A7=E7=89=87=E6=9C=89=E8=AA=A4?= =?UTF-8?q?=E5=95=8F=E9=A1=8C=20|=20[=E6=AD=B7=E5=8F=B2=E8=B3=87=E6=96=99]?= =?UTF-8?q?=20active=20=E5=91=88=E7=8F=BE=E7=A8=8B=E5=BA=8F=E5=BB=BA?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Frontend/_alert.html | 13 +- Frontend/_dashboard.html | 12 +- Frontend/_graphManagement.html | 2 - Frontend/_historyData.html | 8 +- Frontend/index.html | 208 +++++++++++++++----------- Frontend/js/n4js/alarmbaja.js | 51 ++++--- Frontend/js/n4js/electricmeterbaja.js | 1 + Frontend/js/site.js | 4 + 8 files changed, 169 insertions(+), 130 deletions(-) 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 @@