From 53473bcffe094cb7317a08e1082e1ca71397fa1c Mon Sep 17 00:00:00 2001
From: dev02 <dev02@yourteam.tw>
Date: Fri, 4 Aug 2023 10:24:05 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=89=8D=E7=AB=AF]=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Frontend/_alert.html     | 9 +++++----
 Frontend/_operation.html | 5 +++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Frontend/_alert.html b/Frontend/_alert.html
index 54c8da9..1553e7b 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);
 					}
 				});
 			}
diff --git a/Frontend/_operation.html b/Frontend/_operation.html
index ae880e7..b77a094 100644
--- a/Frontend/_operation.html
+++ b/Frontend/_operation.html
@@ -1314,7 +1314,7 @@
 				//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("description", $(pageAct.work_type == "1" ? '#inpDescription' : '#inpDescription_2').val() || '');
 
 				//let sendData = {
 				//	location: $('#inpArea option:selected').text() + $('#inpBuilding option:selected').text() + $('#inpFloor option:selected').text(),
@@ -1366,6 +1366,7 @@
 			clearOpeRecPageAct();
 			selUser();
 			selDevice();
+			selOpeFir();
 
 			$('#ope_forImage').html('');
 			$('#ope_forFile').html('');
@@ -1403,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) {