From 67a441b98b6c2127b95b4f9e45a3c3a0488f0c3d Mon Sep 17 00:00:00 2001 From: dev02 Date: Fri, 4 Aug 2023 12:01:56 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=89=8D=E7=AB=AF]=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Frontend/_alert.html | 13 +++++----- Frontend/_historyData.html | 51 +++++++++++--------------------------- Frontend/_operation.html | 8 +++--- 3 files changed, 25 insertions(+), 47 deletions(-) diff --git a/Frontend/_alert.html b/Frontend/_alert.html index 54c8da9..8406a1f 100644 --- a/Frontend/_alert.html +++ b/Frontend/_alert.html @@ -774,10 +774,11 @@ function getData(type = null) { dataAlarm = []; $(loadEle).Loading("start"); - let enddate = new Date(new Date().setDate(new Date(pageAct.alr_enddate).getDate() + 1)).getTime(); + let enddate = new Date(pageAct.alr_enddate + " 23:59:59").getTime(); + let startdate = new Date(pageAct.alr_startdate + " 00:00:00").getTime(); if (pageAct.SysType == "all") { - getAllDeviceAlarmByBaja(new Date(pageAct.alr_startdate).getTime(), enddate, pageAct.return, pageAct.confirm, callBackFromAllDeviceAlert); + getAllDeviceAlarmByBaja(startdate, enddate, pageAct.return, pageAct.confirm, callBackFromAllDeviceAlert); } else { let elem = $('input[type=checkbox][data-type=sub]:checked'); @@ -788,12 +789,12 @@ elem.each(function (i, v) { if (v?.id === "other") { console.log(v?.id) - getOtherAlarmByBaja(new Date(pageAct.alr_startdate).getTime(), enddate, pageAct.return, pageAct.confirm, stackData); + getOtherAlarmByBaja(startdate, enddate, pageAct.return, pageAct.confirm, stackData); } else { pageAct.selSysMain = $(v).parent().data('main'); pageAct.selSysSub = $(v).prop('id'); - getAlarmByBaja(new Date(pageAct.alr_startdate).getTime(), enddate, pageAct.return, pageAct.confirm, pageAct.selSysMain + "_" + pageAct.selSysSub + "_AlarmClass", stackData); + getAlarmByBaja(startdate, enddate, pageAct.return, pageAct.confirm, pageAct.selSysMain + "_" + pageAct.selSysSub + "_AlarmClass", stackData); } }); } @@ -875,7 +876,7 @@ { "title": "設備名稱", "data": "sourceName_zh", - "render" : function (data) { + "render": function (data) { return allDevices.find(d => d.device_number === data)?.full_name || "" } }, @@ -921,7 +922,7 @@ ]; historyTable = new YourTeam.JqDataTables.getTableByStatic(tag, data, columns, column_defs, null, null, null, null, "tpi"); - $('#alertTable').DataTable().order([ 5, 'desc']); + $('#alertTable').DataTable().order([5, 'desc']); $(loadEle).Loading("close"); } diff --git a/Frontend/_historyData.html b/Frontend/_historyData.html index 8d81d4e..3a1a282 100644 --- a/Frontend/_historyData.html +++ b/Frontend/_historyData.html @@ -284,19 +284,7 @@ $('#devPointsList').html(strHtml); if (!hisFirst) { - let start = new Date($('#his_startdate').val()); - let end = new Date(new Date().setDate(new Date($('#his_enddate input').val()).getDate() + 1)); - - if (pageAct.dateType == "today" || pageAct.dateType == "day" || pageAct.dateType == "ytd") - end = new Date(new Date(start.valueOf()).setDate(start.getDate() + 1)); - else if (pageAct.dateType == "month") { - start = new Date($('#getmonth').val()); - end = new Date(new Date(start.valueOf()).setDate(start.getDate() + 30)); - } - else if (pageAct.dateType != "range") - return; - - getData(formatDate(start, "date", true), formatDate(end, "date", true)); + searchDate(); } } ytAjax = new YourTeam.Ajax(url, objSendData, success, null, "POST").send(); @@ -306,8 +294,8 @@ $(loadEle).Loading("start"); var sdt = new Date(); var edt = new Date(new Date().setDate(sdt.getDate() + 1)); - start = start ?? sdt.toLocaleDateString(); - end = end ?? edt.toLocaleDateString(); + start = start + " 00:00:00" ?? sdt.toLocaleDateString(); + end = end + " 23:59:59" ?? edt.toLocaleDateString(); let sendData = { device_number: pageAct.deviceNumber, @@ -356,19 +344,7 @@ pageAct.devicePoiName = $(elem).text(); pageAct.deviceItem = deviceItem; - let start = new Date($('#his_startdate').val()); - let end = new Date(new Date().setDate(new Date($('#his_enddate input').val()).getDate() + 1)); - - if (pageAct.dateType == "today" || pageAct.dateType == "day" || pageAct.dateType == "ytd") - end = new Date(new Date(start.valueOf()).setDate(start.getDate() + 1)); - else if (pageAct.dateType == "month") { - start = new Date($('#getmonth').val()); - end = new Date(new Date(start.valueOf()).setDate(start.getDate() + 30)); - } - else if (pageAct.dateType != "range") - return; - - getData(formatDate(start, "date", true), formatDate(end, "date", true)); + searchDate(); } } @@ -387,10 +363,10 @@ $('#getmonth').css('display', 'none'); $('#his_startdate').val(date); - if (type == "today") - getData(formatDate(now, "date", true), formatDate(tmr, "date", true)); - else if (type == "ytd") - getData(formatDate(ytd, "date", true), formatDate(now, "date", true)); + if (type == "today") + getData(formatDate(now, "date", true), formatDate(now, "date", true)); + else if (type == "ytd") + getData(formatDate(ytd, "date", true), formatDate(ytd, "date", true)); else { $(`[onclick="setDateType('today', this)"]`).removeClass('btn-secondary'); $(`[onclick="setDateType('today', this)"]`).addClass('btn-info'); @@ -426,14 +402,15 @@ } function searchDate() { - let start = new Date($('#his_startdate').val()); - let end = new Date(new Date().setDate(new Date($('#his_enddate input').val()).getDate() + 1)); + let start = new Date($('#his_startdate').val()); + let end = new Date($('#his_enddate input').val()); if (pageAct.dateType == "today" || pageAct.dateType == "day" || pageAct.dateType == "ytd") - end = new Date(new Date(start.valueOf()).setDate(start.getDate() + 1)); + end = start; else if (pageAct.dateType == "month") { - start = new Date($('#getmonth').val()); - end = new Date(new Date(start.valueOf()).setDate(start.getDate() + 30)); + start = new Date($('#getmonth').val()); + end = new Date(start.valueOf()).setMonth(start.getMonth() + 1); + end = new Date(new Date(end).setDate(new Date(end).getDate() - 1)); } else if (pageAct.dateType != "range") return; diff --git a/Frontend/_operation.html b/Frontend/_operation.html index e58d435..2a4fbf9 100644 --- a/Frontend/_operation.html +++ b/Frontend/_operation.html @@ -1014,7 +1014,6 @@ startdate: pageAct.startdate == undefined ? null : pageAct.startdate, enddate: pageAct.enddate == undefined ? null : pageAct.enddate, }; - console.log("data", objSendData.Data) ytAjax = new YourTeam.Ajax(url, objSendData, function (rel) { if (rel.code == "0000") location.href = baseApiUrl + "/api/df?path=" + rel.data.split('/')[0] + "&fileName=" + rel.data.split('/')[1] + "&token=" + cookies.get("JWT-Authorization"); @@ -1314,8 +1313,8 @@ //fd.append("end_time", ($('#inpEndTime').val() || null) == null ? $('#inpEndTime').val() : new Date($('#inpEndTime').val()).toISOString()); //fd.append("work_time", ($('#inpWorTime').val() || null) == null ? $('#inpWorTime').val() : new Date($('#inpWorTime').val()).toISOString()); fd.append("finish_time", (parseInt($('#' + (pageAct.work_type == '1' ? 'inpStatus' : 'inpStatus_2') + ' [name=' + (pageAct.work_type == '1' ? 'inpSta' : 'inpSta_2') + ']:checked').data('value'))) == 1 ? new Date(Date.now()).toISOString() : null); - fd.append("notice", $(pageAct.work_type == "1" ? '#inpNotice' : '#inpNotice_2').val() || null); - fd.append("description", $(pageAct.work_type == "1" ? '#inpDescription' : '#inpDescription_2').val() || null); + fd.append("notice", $(pageAct.work_type == "1" ? '#inpNotice' : '#inpNotice_2').val() || ''); + fd.append("description", $(pageAct.work_type == "1" ? '#inpDescription' : '#inpDescription_2').val() || ''); //let sendData = { // location: $('#inpArea option:selected').text() + $('#inpBuilding option:selected').text() + $('#inpFloor option:selected').text(), @@ -1367,6 +1366,7 @@ clearOpeRecPageAct(); selUser(); selDevice(); + selOpeFir(); $('#ope_forImage').html(''); $('#ope_forFile').html(''); @@ -1404,7 +1404,7 @@ $(pageAct.work_type == "1" ? '#inpDescription' : '#inpDescription_2').val(res.data.description); let elemSel = $(pageAct.work_type == "1" ? '#inpFixDoCode' : '#inpFixDoCode_2').find('option:selected');; pageAct.number = elemSel.val(); - selOpeFir(); + ope_imgHtml = null; $.each(res.data.lorf, function (i, v) {