diff --git a/src/components/flight/NewFlightApprovalsReport.js b/src/components/flight/NewFlightApprovalsReport.js
index 0086d257..154e9f0b 100644
--- a/src/components/flight/NewFlightApprovalsReport.js
+++ b/src/components/flight/NewFlightApprovalsReport.js
@@ -31,6 +31,13 @@ export default function NewFlightApprovalsReport(props) {
}
};
+ const handlerChange = e => {
+ if (e.target.type === 'select-one') {
+ props.setFilterArea(e.target.value);
+ } else {
+ props.setFilterId(e.target.value);
+ }
+ };
return (
@@ -64,7 +71,7 @@ export default function NewFlightApprovalsReport(props) {
bsSize='sm'
placeholder='신청번호 또는 검토결과를 입력해주세요.'
value={props.filterId}
- onChange={e => props.setFilterId(`${e.target.value}`)}
+ onChange={e => props.setFilterId(e.target.value)}
onKeyPress={handleKeyDown}
/>
@@ -78,7 +85,6 @@ export default function NewFlightApprovalsReport(props) {
props.setFilterArea(e.target.value)}
diff --git a/src/components/flight/NewFlightApprovalsTable.js b/src/components/flight/NewFlightApprovalsTable.js
index 733d7019..65cae26b 100644
--- a/src/components/flight/NewFlightApprovalsTable.js
+++ b/src/components/flight/NewFlightApprovalsTable.js
@@ -259,6 +259,8 @@ export default function NewFlightApprovalsTable(props) {
<>
비행
반경
+
+ (m)
>
),
dataIndex: 'bufferZone',
@@ -272,8 +274,10 @@ export default function NewFlightApprovalsTable(props) {
{
title: (
<>
- 해발
+ 신청
고도
+
+ (m)
>
),
dataIndex: 'fltElev',
@@ -289,7 +293,7 @@ export default function NewFlightApprovalsTable(props) {
<>
최고비행
- 해발고도
+ 해발고도 (m)
>
),
dataIndex: 'fltElevMax',
@@ -534,7 +538,7 @@ export default function NewFlightApprovalsTable(props) {
const lon = record.lon;
return (
<>
- {lat.toFixed(5)} /
+ {lat.toFixed(5)},
{lon.toFixed(5)}
>
);
@@ -763,7 +767,9 @@ export default function NewFlightApprovalsTable(props) {
dispatch(
openModal({
header: header,
- body: body
+ body: body,
+ isHistoryBack: false,
+ isRefresh: true
})
);
};
@@ -837,12 +843,20 @@ export default function NewFlightApprovalsTable(props) {
try {
const fileDetails = {
pdf: {
- url: `${HOST}api/bas/dos/plan/download/pdf?searchStDt=${props.startDate}&searchEndDt=${props.endDate}&selectZone=${props.filterArea}&approvalCd=${props.filterId}`,
- name: '비행승인결과.pdf'
+ url: `${HOST}api/bas/dos/plan/download/pdf?searchStDt=${
+ props.startDate
+ }&searchEndDt=${props.endDate}&selectZone=${props.filterArea}${
+ props.filterId ? '&approvalCd=${props.filterId}' : ''
+ }`,
+ name: '비행승인 관련 검토결과.pdf'
},
excel: {
- url: `${HOST}api/bas/dos/plan/download/excel?searchStDt=${props.startDate}&searchEndDt=${props.endDate}&selectZone=${props.filterArea}&approvalCd=${props.filterId}`,
- name: '비행승인결과.xlsx'
+ url: `${HOST}api/bas/dos/plan/download/excel?searchStDt=${
+ props.startDate
+ }&searchEndDt=${props.endDate}&selectZone=${props.filterArea}${
+ props.filterId ? '&approvalCd=${props.filterId}' : ''
+ }`,
+ name: '비행승인 검토.xlsx'
}
};