From e269e45ba5a1ad9d0976e339bc88848c739a1e63 Mon Sep 17 00:00:00 2001 From: sanguu516 Date: Wed, 5 Jun 2024 16:52:20 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=83=89=EC=83=81=20=EB=A1=A4=EB=B0=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/custom.css | 4 ++-- src/components/flight/FlightApprovalsTable.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/assets/css/custom.css b/src/assets/css/custom.css index 23b7b80a..1119799e 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 d0d49238..863f647c 100644 --- a/src/components/flight/FlightApprovalsTable.js +++ b/src/components/flight/FlightApprovalsTable.js @@ -203,6 +203,7 @@ export default function FlightApprovalsTable(props) { selector: row => row.applyNo, center: true, cell: row => { + // return row.applyNo; 6/7 서버 작업 끝나면 주석 풀것 return '240503-0001'; } }, From 460d7892d5fe4060e9ca954e0971d0371b2ffca9 Mon Sep 17 00:00:00 2001 From: sanguu516 Date: Wed, 5 Jun 2024 16:58:40 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EB=82=A0=EC=A7=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/flight/FlightApprovalsTable.js | 3 ++- src/containers/flight/flightApprovalsContainer.js | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/flight/FlightApprovalsTable.js b/src/components/flight/FlightApprovalsTable.js index 863f647c..916b55af 100644 --- a/src/components/flight/FlightApprovalsTable.js +++ b/src/components/flight/FlightApprovalsTable.js @@ -356,7 +356,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() { From 33d166218d659e615a4beb125c81584324f0f33f Mon Sep 17 00:00:00 2001 From: sanguu516 Date: Wed, 5 Jun 2024 17:16:15 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=82=AC=EC=9C=A0=EB=B3=B4=EA=B8=B0=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/flight/FlightApprovalsTable.js | 45 ++++--------------- 1 file changed, 8 insertions(+), 37 deletions(-) diff --git a/src/components/flight/FlightApprovalsTable.js b/src/components/flight/FlightApprovalsTable.js index 916b55af..f70a49ee 100644 --- a/src/components/flight/FlightApprovalsTable.js +++ b/src/components/flight/FlightApprovalsTable.js @@ -130,27 +130,7 @@ export default function FlightApprovalsTable(props) { : '미승인'; } }, - { - name: '사유보기', - selector: row => row.areaList[0].approvalCd, - center: true, - cell: row => { - return ( - - ); - } - }, + { name: '더보기', selector: row => row.areaList, @@ -260,22 +240,7 @@ export default function FlightApprovalsTable(props) { : '미승인'; } }, - { - selector: row => row.approvalCd, - center: true, - cell: row => { - return ( - - ); - } - }, + { selector: row => row.approvalCd, center: true, @@ -288,10 +253,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]); // 여기에 클릭 이벤트를 처리하는 코드를 작성하세요. };