diff --git a/src/assets/css/custom.css b/src/assets/css/custom.css index 57d31ee4..c59226f0 100644 --- a/src/assets/css/custom.css +++ b/src/assets/css/custom.css @@ -1196,8 +1196,8 @@ caption {overflow: hidden; line-height: 0;text-indent: -2000px;} .flight-approval-layer .layer-content-list dl dt strong{font-size:0.875rem;font-weight:600;color:#333} .flight-approval-layer .layer-content-list dl dt .badge{font-size:0.8rem;min-width:120px} -.bg-color .flight-not-approval-row div{background-color:rgba(252, 3, 3, 0.4); } -.bg-color .flight-approval-row div{background-color:rgba(63, 172, 225, 0.4);} +.flight-not-approval-row {background-color:rgba(252, 3, 3, 0.4); } +.flight-approval-row {background-color:rgba(63, 172, 225, 0.4);} .flight-approval-layer .layer-content-list button{padding:0;font-size: 0.8rem;} .flight-approval-layer .react-dataTable.pal-dateTable .rdt_TableBody .rdt_TableRow .rdt_TableCell{padding:0;} diff --git a/src/components/flight/FlightApprovalsTable.js b/src/components/flight/FlightApprovalsTable.js index c829b5e1..932990ec 100644 --- a/src/components/flight/FlightApprovalsTable.js +++ b/src/components/flight/FlightApprovalsTable.js @@ -134,27 +134,7 @@ export default function FlightApprovalsTable(props) { : '미승인'; } }, - { - name: '사유보기', - selector: row => row.areaList[0].approvalCd, - center: true, - cell: row => { - return ( - - ); - } - }, + { name: '더보기', selector: row => row.areaList, @@ -207,6 +187,7 @@ export default function FlightApprovalsTable(props) { selector: row => row.applyNo, center: true, cell: row => { + // return row.applyNo; 6/7 서버 작업 끝나면 주석 풀것 return '240503-0001'; } }, @@ -269,22 +250,7 @@ export default function FlightApprovalsTable(props) { : '미승인'; } }, - { - selector: row => row.approvalCd, - center: true, - cell: row => { - return ( - - ); - } - }, + { selector: row => row.approvalCd, center: true, @@ -297,10 +263,16 @@ 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]); // 여기에 클릭 이벤트를 처리하는 코드를 작성하세요. }; @@ -365,7 +337,8 @@ export default function FlightApprovalsTable(props) {

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

- {formatDate(props.startDate)} 총{' '} + {formatDate(props.startDate)} + {props.endDate ? '~' + formatDate(props.endDate) : null} 총{' '} {approvalCdValue.S + approvalCdValue.F + approvalCdValue.U}건
diff --git a/src/containers/flight/flightApprovalsContainer.js b/src/containers/flight/flightApprovalsContainer.js index 24a80af4..15b1cf0a 100644 --- a/src/containers/flight/flightApprovalsContainer.js +++ b/src/containers/flight/flightApprovalsContainer.js @@ -43,6 +43,7 @@ export default function FlightApprovalsContainer() { // const [startDate, setStartDate] = useState(dayjs().format('YYYY-MM-DD')); + const [endDate, setEndDate] = useState(); // 미니맵 레이어 const [previewLayer, setPreviewLayer] = useState(); @@ -84,6 +85,7 @@ export default function FlightApprovalsContainer() { const handlerSearch = (search, searchDate) => { setStartDate(searchDate.startDate); + setEndDate(searchDate.endDate); if ( search != '' && @@ -227,6 +229,7 @@ export default function FlightApprovalsContainer() {