diff --git a/src/components/flight/ControlApprovalsTable.js b/src/components/flight/ControlApprovalsTable.js
index 3bacdbc0..33877679 100644
--- a/src/components/flight/ControlApprovalsTable.js
+++ b/src/components/flight/ControlApprovalsTable.js
@@ -255,7 +255,8 @@ export default function ControlApprovalsTable(props) {
{
title: (
<>
- 중심 좌표
+ 중심 좌표
+
(위도, 경도)
>
),
@@ -352,11 +353,7 @@ export default function ControlApprovalsTable(props) {
}
},
{
- title: (
- <>
- 세부 사항
- >
- ),
+ title: <>세부 사항>,
dataIndex: 'dtl',
align: 'center',
editable: true,
@@ -366,11 +363,7 @@ export default function ControlApprovalsTable(props) {
}
},
{
- title: (
- <>
- 비행 목적
- >
- ),
+ title: <>비행 목적>,
dataIndex: 'areaList',
align: 'center',
width: '110px',
@@ -407,11 +400,7 @@ export default function ControlApprovalsTable(props) {
}
},
{
- title: (
- <>
- 검토 결과
- >
- ),
+ title: <>검토 결과>,
dataIndex: 'areaList',
align: 'center',
width: '140px',
@@ -533,12 +522,14 @@ export default function ControlApprovalsTable(props) {
width: '130px',
render: (areaList, record) =>
areaList.length <= 1 ? (
- areaList[0].reviewedType === 'R' ? (
+ areaList[0].reviewedType === 'U' ? (
+ '검토불필요'
+ ) : areaList[0].reviewedType === 'R' ? (
'검토완료'
- ) : areaList[0].reviewedType === 'W' ? (
- '검토대기'
- ) : (
+ ) : areaList[0].reviewedType === 'C' ? (
'검토취소'
+ ) : (
+ '검토대기'
)
) : (
<>->
@@ -776,11 +767,13 @@ export default function ControlApprovalsTable(props) {
align: 'center',
width: '130px',
render: text => {
- return text === 'R'
+ return text === 'U'
+ ? '검토불필요'
+ : text === 'R'
? '검토완료'
- : text === 'W'
- ? '검토대기'
- : '검토취소';
+ : text === 'C'
+ ? '검토취소'
+ : '검토대기';
}
}
];
diff --git a/src/components/flight/OperationApprovalsTable.js b/src/components/flight/OperationApprovalsTable.js
index a04d285d..804dfe10 100644
--- a/src/components/flight/OperationApprovalsTable.js
+++ b/src/components/flight/OperationApprovalsTable.js
@@ -83,7 +83,9 @@ export default function OperationApprovalsTable(props) {
const handlerReviewed = type => {
let text = '검토대기';
- if (!type) {
+ if (type === 'U') {
+ text = '검토불필요';
+ } else if (!type) {
text = '검토대기';
} else {
if (type === 'R') {
@@ -464,7 +466,9 @@ export default function OperationApprovalsTable(props) {
render: areaList => {
const approvalCounts = areaList.reduce(
(counts, item) => {
- if (item.reviewedType === 'R') {
+ if (item.reviewedType === 'U') {
+ counts.unapproved += 1;
+ } else if (item.reviewedType === 'R') {
counts.reviewed += 1;
} else if (item.reviewedType === 'W') {
counts.wait += 1;
@@ -473,7 +477,7 @@ export default function OperationApprovalsTable(props) {
}
return counts;
},
- { reviewed: 0, wait: 0, cancel: 0 }
+ { reviewed: 0, wait: 0, cancel: 0, unapproved: 0 }
);
return (
@@ -484,6 +488,9 @@ export default function OperationApprovalsTable(props) {
검토대기:{approvalCounts.wait}건
검토취소:
{approvalCounts.cancel}건
+
+ 검토불필요:
+ {approvalCounts.unapproved}건
>
) : (
<>{handlerReviewed(areaList[0].reviewedType)}>
@@ -704,11 +711,13 @@ export default function OperationApprovalsTable(props) {
align: 'center',
width: '130px',
render: text => {
- return text === 'R'
+ return text === 'U'
+ ? '검토불필요'
+ : text === 'R'
? '검토완료'
- : text === 'W'
- ? '검토대기'
- : '검토취소';
+ : text === 'C'
+ ? '검토취소'
+ : '검토대기';
}
},
{