From a4ddd3a0d2bd957776448c1f89926871ba8551ef Mon Sep 17 00:00:00 2001 From: geun <1416geun@naver.com> Date: Wed, 5 Jun 2024 17:19:43 +0900 Subject: [PATCH 1/2] . --- src/assets/css/custom.css | 2 +- src/components/flight/FlightApprovalsTable.js | 24 +++++++++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/assets/css/custom.css b/src/assets/css/custom.css index 23b7b80a..57d31ee4 100644 --- a/src/assets/css/custom.css +++ b/src/assets/css/custom.css @@ -1181,7 +1181,7 @@ caption {overflow: hidden; line-height: 0;text-indent: -2000px;} .flight-approval .rdt_TableHeadRow>div{display:none} .flight-approval .rdt_TableHeadRow .rdt_TableCol{display:block;font-size:0.8rem;} .flight-approval .rdt_TableHeadRow .rdt_TableCol div{font-weight:600} -.flight-approval-layer{width:560px;overflow:scroll;} +.flight-approval-layer{width:700px;overflow:scroll;} .layer-ti-sub{display:block;font-size:0.875rem;color:#777;margin-top:-4px;} .flight-approval-layer .layer-ti-sub{margin-bottom:0.5rem} .flight-approval-layer .calendar-flat svg{color:#8a1c05} diff --git a/src/components/flight/FlightApprovalsTable.js b/src/components/flight/FlightApprovalsTable.js index d0d49238..c829b5e1 100644 --- a/src/components/flight/FlightApprovalsTable.js +++ b/src/components/flight/FlightApprovalsTable.js @@ -89,12 +89,16 @@ export default function FlightApprovalsTable(props) { name: '중심좌표(위도/경도)', selector: row => row.areaList[0].lat, center: true, - width: '180px', + width: '160px', sortable: true, cell: row => { - return `${row.areaList[0].lat.toFixed(5)}/${row.areaList[0].lon.toFixed( - 5 - )}`; + return ( + <> + {row.areaList[0].lat.toFixed(5)} / +
+ {row.areaList[0].lon.toFixed(5)} + + ); } }, { @@ -217,7 +221,7 @@ export default function FlightApprovalsTable(props) { selector: row => row.zoneNo, center: true, sortable: true, - width: '110px', + width: '60px', cell: row => { return row.zoneNo + '번'; } @@ -225,10 +229,16 @@ export default function FlightApprovalsTable(props) { { selector: row => row.lat, center: true, - width: '180px', + width: '160px', sortable: true, cell: row => { - return `${row.lat.toFixed(5)}/${row.lon.toFixed(5)}`; + return ( + <> + {row.lat.toFixed(5)} / +
+ {row.lon.toFixed(5)} + + ); } }, { From 2101354282b3c85623c87d5e6e25025b2007fb4c Mon Sep 17 00:00:00 2001 From: geun <1416geun@naver.com> Date: Wed, 5 Jun 2024 17:21:02 +0900 Subject: [PATCH 2/2] . --- src/components/flight/FlightApprovalsTable.js | 55 ++++++++++++++----- 1 file changed, 41 insertions(+), 14 deletions(-) diff --git a/src/components/flight/FlightApprovalsTable.js b/src/components/flight/FlightApprovalsTable.js index 932990ec..e7d4f1a0 100644 --- a/src/components/flight/FlightApprovalsTable.js +++ b/src/components/flight/FlightApprovalsTable.js @@ -89,7 +89,7 @@ export default function FlightApprovalsTable(props) { name: '중심좌표(위도/경도)', selector: row => row.areaList[0].lat, center: true, - width: '160px', + width: '180px', sortable: true, cell: row => { return ( @@ -134,7 +134,27 @@ export default function FlightApprovalsTable(props) { : '미승인'; } }, - + { + name: '사유보기', + selector: row => row.areaList[0].approvalCd, + center: true, + cell: row => { + return ( + + ); + } + }, { name: '더보기', selector: row => row.areaList, @@ -187,7 +207,6 @@ export default function FlightApprovalsTable(props) { selector: row => row.applyNo, center: true, cell: row => { - // return row.applyNo; 6/7 서버 작업 끝나면 주석 풀것 return '240503-0001'; } }, @@ -202,7 +221,7 @@ export default function FlightApprovalsTable(props) { selector: row => row.zoneNo, center: true, sortable: true, - width: '60px', + width: '110px', cell: row => { return row.zoneNo + '번'; } @@ -210,7 +229,7 @@ export default function FlightApprovalsTable(props) { { selector: row => row.lat, center: true, - width: '160px', + width: '180px', sortable: true, cell: row => { return ( @@ -250,7 +269,22 @@ export default function FlightApprovalsTable(props) { : '미승인'; } }, - + { + selector: row => row.approvalCd, + center: true, + cell: row => { + return ( + + ); + } + }, { selector: row => row.approvalCd, center: true, @@ -263,16 +297,10 @@ export default function FlightApprovalsTable(props) { // 테이블 내부 행 클릭 이벤트 const handleInRowClick = row => { - handlerOpenModal(row.approvalCd, row.fltElev, row.fltElevMax); props.handlerDetail(row); }; // 테이블 행 클릭 이벤트 const handleRowClick = row => { - handlerOpenModal( - row.areaList[0].approvalCd, - row.areaList[0].fltElev, - row.areaList[0].fltElevMax - ); props.handlerDetail(row.areaList[0]); // 여기에 클릭 이벤트를 처리하는 코드를 작성하세요. }; @@ -337,8 +365,7 @@ export default function FlightApprovalsTable(props) {

비행승인 신청 검토결과 목록

- {formatDate(props.startDate)} - {props.endDate ? '~' + formatDate(props.endDate) : null} 총{' '} + {formatDate(props.startDate)} 총{' '} {approvalCdValue.S + approvalCdValue.F + approvalCdValue.U}건