From 6b90cd4721dda6b7ca82ed25cb32de99afa455f3 Mon Sep 17 00:00:00 2001 From: sanguu516 Date: Mon, 26 Aug 2024 14:08:03 +0900 Subject: [PATCH] =?UTF-8?q?fix/=EC=B6=94=EA=B0=80=20=EC=9A=94=EA=B5=AC?= =?UTF-8?q?=EC=82=AC=ED=95=AD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flight/ControlApprovalsTable.js | 65 +++++++------------ .../flight/NewFlightApprovalsReport.js | 2 +- .../flight/OperationApprovalsTable.js | 35 ++-------- 3 files changed, 32 insertions(+), 70 deletions(-) diff --git a/src/components/flight/ControlApprovalsTable.js b/src/components/flight/ControlApprovalsTable.js index 807cabfa..0901f437 100644 --- a/src/components/flight/ControlApprovalsTable.js +++ b/src/components/flight/ControlApprovalsTable.js @@ -433,13 +433,7 @@ export default function ControlApprovalsTable(props) { } }, { - title: ( - <> - LAANC -
- 검토 결과 - - ), + title: <>검토 결과, dataIndex: 'approvalCd', align: 'center', width: '140px', @@ -458,13 +452,7 @@ export default function ControlApprovalsTable(props) { } }, { - title: ( - <> - 관제과 -
- 확인결과 - - ), + title: <>관제통신과, dataIndex: 'reviewedProcType', align: 'center', width: '130px', @@ -507,33 +495,25 @@ export default function ControlApprovalsTable(props) { ); } }, - { - title: ( - <> - 운항과 -
- 확인 -
- 결과 - - ), - dataIndex: 'reviewedType', - align: 'center', - width: '130px', - render: (reviewedType, record) => { - return reviewedType !== 'R' ? ( - <>{handlerReviewed(reviewedType, 'operation')} - ) : ( - - ); - } - }, + // { + // title: <>안전운항과, + // dataIndex: 'reviewedType', + // align: 'center', + // width: '130px', + // render: (reviewedType, record) => { + // return reviewedType !== 'R' ? ( + // <>{handlerReviewed(reviewedType, 'operation')} + // ) : ( + // + // ); + // } + // }, { title: ( <> @@ -945,6 +925,9 @@ export default function ControlApprovalsTable(props) { scroll={{ x: 1700 }} + pagination={{ + position: ['bottomLeft'] + }} rowHoverable={false} expandIconColumnIndex={-1} onChange={(pagination, filters, sorter, extra) => { diff --git a/src/components/flight/NewFlightApprovalsReport.js b/src/components/flight/NewFlightApprovalsReport.js index 8f0ae2d0..e7db416d 100644 --- a/src/components/flight/NewFlightApprovalsReport.js +++ b/src/components/flight/NewFlightApprovalsReport.js @@ -225,7 +225,7 @@ export default function NewFlightApprovalsReport(props) {
-

지역

+

신청구역

diff --git a/src/components/flight/OperationApprovalsTable.js b/src/components/flight/OperationApprovalsTable.js index 133e8abe..8f976da6 100644 --- a/src/components/flight/OperationApprovalsTable.js +++ b/src/components/flight/OperationApprovalsTable.js @@ -443,13 +443,7 @@ export default function OperationApprovalsTable(props) { } }, { - title: ( - <> - 운항과 -
- 확인결과 - - ), + title: <>안전운항과, dataIndex: 'reviewedType', align: 'center', width: '130px', @@ -496,13 +490,7 @@ export default function OperationApprovalsTable(props) { } }, { - title: ( - <> - 관제과 -
- 확인결과 - - ), + title: <>관제통신과, dataIndex: 'reviewedProcType', align: 'center', width: '130px', @@ -525,18 +513,6 @@ export default function OperationApprovalsTable(props) { return Math.random() < 0.5 ? '전송' : '미전송'; } }, - { - title: ( - <> - 재검토
- 사유 - - ), - dataIndex: 'reviewedReason', - width: '70px', - align: 'center', - render: reviewedReason => reviewedReason ?? '-' - }, { title: '비고', dataIndex: 'planAreaSno', @@ -860,9 +836,9 @@ export default function OperationApprovalsTable(props) { - + */} @@ -952,6 +928,9 @@ export default function OperationApprovalsTable(props) { onChange={(pagination, filters, sorter, extra) => { handlePageChange(); }} + pagination={{ + position: ['bottomLeft'] + }} />