From 458fd8ec279c306fa412459d944f96b6216b6694 Mon Sep 17 00:00:00 2001 From: sanguu516 Date: Mon, 8 Jul 2024 15:07:47 +0900 Subject: [PATCH] =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=B8=94=20=EC=BB=AC?= =?UTF-8?q?=EB=9F=BC=EB=AA=85=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EC=9E=A5?= =?UTF-8?q?=EC=95=A0=EB=AC=BC=20=ED=91=9C=ED=98=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flight/NewFlightApprovalsTable.js | 55 ++++++++++++++++--- 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/src/components/flight/NewFlightApprovalsTable.js b/src/components/flight/NewFlightApprovalsTable.js index c3b17bb2..68ae6d33 100644 --- a/src/components/flight/NewFlightApprovalsTable.js +++ b/src/components/flight/NewFlightApprovalsTable.js @@ -236,6 +236,29 @@ export default function NewFlightApprovalsTable(props) { : '-'; } }, + { + title: ( + <> + 장애물
+ 제한 +
+ 표면 +
+ + ), + dataIndex: 'areaList', + width: '100px', + align: 'center', + render: areaList => { + return areaList.length <= 1 + ? areaList[0].fltElevMax === 120 + ? '원추' + : areaList[0].fltElevMax > 45 && areaList[0].fltElevMax < 100 + ? '수평' + : '-' + : '-'; + } + }, { title: ( <> @@ -264,12 +287,12 @@ export default function NewFlightApprovalsTable(props) { 비행
반경
- (m) + (m이내) ), dataIndex: 'bufferZone', align: 'center', - width: '70px', + width: '80px', editable: true, render: (text, record) => { return text ? text : '-'; @@ -281,12 +304,12 @@ export default function NewFlightApprovalsTable(props) { 신청
고도
- (m) + (m이하) ), dataIndex: 'fltElev', align: 'center', - width: '70px', + width: '80px', editable: true, render: (text, record) => { return text ? text : '-'; @@ -373,7 +396,7 @@ export default function NewFlightApprovalsTable(props) { ), dataIndex: 'areaList', align: 'center', - width: '110px', + width: '120px', render: areaList => { const approvalCounts = areaList.reduce( (counts, item) => { @@ -540,6 +563,22 @@ export default function NewFlightApprovalsTable(props) { return text ? text : <>-; } }, + + { + dataIndex: 'fltElevMax', + align: 'center', + width: '100px', + render: text => { + return text + ? text === 120 + ? '원추' + : text > 45 && text < 100 + ? '수평' + : '-' + : '-'; + } + }, + { align: 'center', width: '85px', @@ -559,13 +598,13 @@ export default function NewFlightApprovalsTable(props) { dataIndex: 'bufferZone', align: 'center', editable: true, - width: '70px' + width: '80px' }, { dataIndex: 'fltElev', align: 'center', editable: true, - width: '70px' + width: '80px' }, { dataIndex: 'fltElevMax', @@ -613,7 +652,7 @@ export default function NewFlightApprovalsTable(props) { { dataIndex: 'approvalCd', align: 'center', - width: '110px', + width: '120px', render: text => ( <> {text === 'U'