Merge remote-tracking branch 'refs/remotes/origin/master'

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}

src/components/flight/FlightApprovalsTable.js

@@ -116,9 +116,13 @@ export default function FlightApprovalsTable(props) {
       width: '180px',
       sortable: true,
       cell: row => {
-        return `${row.areaList[0].lat.toFixed(5)}/${row.areaList[0].lon.toFixed(
+        return (
-          5
+          <>
-        )}`;
+            {row.areaList[0].lat.toFixed(5)} /
+            <br />
+            {row.areaList[0].lon.toFixed(5)}
+          </>
+        );
       }
     },
     {
@@ -172,6 +176,7 @@ export default function FlightApprovalsTable(props) {
           : '미승인';
       }
     },
+
     {
       name: '더보기',
       selector: row => row.areaList,
@@ -224,7 +229,6 @@ export default function FlightApprovalsTable(props) {
       selector: row => row.applyNo,
       center: true,
       cell: row => {
-        // return row.applyNo; 6/7 서버 작업 끝나면 주석 풀것
         return '240503-0001';
       }
     },
@@ -250,7 +254,13 @@ export default function FlightApprovalsTable(props) {
       width: '180px',
       sortable: true,
       cell: row => {
-        return `${row.lat.toFixed(5)}/${row.lon.toFixed(5)}`;
+        return (
+          <>
+            {row.lat.toFixed(5)} /
+            <br />
+            {row.lon.toFixed(5)}
+          </>
+        );
       }
     },
     {
@@ -281,7 +291,22 @@ export default function FlightApprovalsTable(props) {
           : '미승인';
       }
     },
-
+    {
+      selector: row => row.approvalCd,
+      center: true,
+      cell: row => {
+        return (
+          <Button
+            color='flat-dark'
+            onClick={() =>
+              handlerOpenModal(row.approvalCd, row.fltElev, row.fltElevMax)
+            }
+          >
+            사유보기
+          </Button>
+        );
+      }
+    },
     {
       selector: row => row.approvalCd,
       center: true,
@@ -294,16 +319,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]);
     // 여기에 클릭 이벤트를 처리하는 코드를 작성하세요.
   };
@@ -368,8 +387,7 @@ export default function FlightApprovalsTable(props) {
       <div className='layer-ti d-flex justify-content-between align-items-center'>
         <h4>비행승인 신청 검토결과 목록</h4>
         <span className='search-case'>
-          {formatDate(props.startDate)}
+          {formatDate(props.startDate)} 총{' '}
-          {props.endDate ? '~' + formatDate(props.endDate) : null} 총{' '}
           {approvalCdValue.S + approvalCdValue.F + approvalCdValue.U}건
         </span>
       </div>