jay.chang/ibms-dome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[前端] 修改前端程序

Browse Source
This commit is contained in:
dev02 2023-08-04 10:24:05 +08:00
parent eed3e1fc9f
commit 53473bcffe
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Frontend/_alert.html
View File

@ -774,10 +774,11 @@
function getData(type = null) { function getData(type = null) {
dataAlarm = []; dataAlarm = [];
$(loadEle).Loading("start"); $(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") { 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 { else {
let elem = $('input[type=checkbox][data-type=sub]:checked'); let elem = $('input[type=checkbox][data-type=sub]:checked');
@ -788,12 +789,12 @@
elem.each(function (i, v) { elem.each(function (i, v) {
if (v?.id === "other") { if (v?.id === "other") {
console.log(v?.id) 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 { else {
pageAct.selSysMain = $(v).parent().data('main'); pageAct.selSysMain = $(v).parent().data('main');
pageAct.selSysSub = $(v).prop('id'); 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);
} }
}); });
} }

5
Frontend/_operation.html
View File

@ -1314,7 +1314,7 @@
//fd.append("work_time", ($('#inpWorTime').val() || null) == null ? $('#inpWorTime').val() : new Date($('#inpWorTime').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("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("notice", $(pageAct.work_type == "1" ? '#inpNotice' : '#inpNotice_2').val() || null);
fd.append("description", $(pageAct.work_type == "1" ? '#inpDescription' : '#inpDescription_2').val() || null); fd.append("description", $(pageAct.work_type == "1" ? '#inpDescription' : '#inpDescription_2').val() || '');
//let sendData = { //let sendData = {
// location: $('#inpArea option:selected').text() + $('#inpBuilding option:selected').text() + $('#inpFloor option:selected').text(), // location: $('#inpArea option:selected').text() + $('#inpBuilding option:selected').text() + $('#inpFloor option:selected').text(),
@ -1366,6 +1366,7 @@
clearOpeRecPageAct(); clearOpeRecPageAct();
selUser(); selUser();
selDevice(); selDevice();
selOpeFir();
$('#ope_forImage').html(''); $('#ope_forImage').html('');
$('#ope_forFile').html(''); $('#ope_forFile').html('');
@ -1403,7 +1404,7 @@
$(pageAct.work_type == "1" ? '#inpDescription' : '#inpDescription_2').val(res.data.description); $(pageAct.work_type == "1" ? '#inpDescription' : '#inpDescription_2').val(res.data.description);
let elemSel = $(pageAct.work_type == "1" ? '#inpFixDoCode' : '#inpFixDoCode_2').find('option:selected');; let elemSel = $(pageAct.work_type == "1" ? '#inpFixDoCode' : '#inpFixDoCode_2').find('option:selected');;
pageAct.number = elemSel.val(); pageAct.number = elemSel.val();
selOpeFir();
ope_imgHtml = null; ope_imgHtml = null;
$.each(res.data.lorf, function (i, v) { $.each(res.data.lorf, function (i, v) {