From 9ec6366fd39af32cc5878137988109c9dd9c6896 Mon Sep 17 00:00:00 2001
From: sanguu516 <sanguu516@naver.com>
Date: Wed, 3 Apr 2024 18:05:42 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EA=B0=9C=EB=B0=9C=EC=9E=90=20=EC=BD=98?=
 =?UTF-8?q?=EC=86=94=20=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flight/FlightApprovalsReport.js           | 15 +----
 src/components/flight/FlightApprovalsTable.js | 56 +++++++++----------
 .../flight/flightApprovalsContainer.js        |  5 +-
 3 files changed, 33 insertions(+), 43 deletions(-)

diff --git a/src/components/flight/FlightApprovalsReport.js b/src/components/flight/FlightApprovalsReport.js
index 48e025f2..59967142 100644
--- a/src/components/flight/FlightApprovalsReport.js
+++ b/src/components/flight/FlightApprovalsReport.js
@@ -23,23 +23,14 @@ export default function FlightApprovalsReport(props) {
         className='layer-search layer-search-form'
         style={{ width: '480px' }}
       >
-        <InputGroup
-          style={{
-            display: 'flex',
-            flexDirection: 'row',
-            alineItems: 'center',
-            borderRadius: '12px'
-          }}
-        >
-          <div style={{ position: 'relative', display: 'inline-block' }}>
+        <InputGroup>
+          <div style={{ position: 'relative' }}>
             <Input
               type='text'
               placeholder={`민원 번호 또는 승인 결과를 입력해 주세요.`}
               value={filterId}
               style={{
-                width: '480px',
-                borderRadius: '12px',
-                paddingRight: '30px' // Search 아이콘을 위한 공간 확보
+                width: '480px'
               }}
               onKeyPress={handlerKeyPress}
               onChange={e => setFilterId(`${e.target.value}`)}
diff --git a/src/components/flight/FlightApprovalsTable.js b/src/components/flight/FlightApprovalsTable.js
index a04b38de..ab264c6f 100644
--- a/src/components/flight/FlightApprovalsTable.js
+++ b/src/components/flight/FlightApprovalsTable.js
@@ -31,7 +31,6 @@ export default function FlightApprovalsTable(props) {
     } else if (props.filter === '') {
       setSearchResults(props.data);
     }
-    console.log('>>>', results);
   }, [props.filter]);
 
   const handlerOpenModal = (approval, reason) => {
@@ -63,7 +62,6 @@ export default function FlightApprovalsTable(props) {
   };
 
   const handleRowClick = row => {
-    console.log('Clicked row: ', row);
     props.handlerDetail(row.planSno);
     // 여기에 클릭 이벤트를 처리하는 코드를 작성하세요.
   };
@@ -198,33 +196,35 @@ export default function FlightApprovalsTable(props) {
   };
 
   return (
-     <div className='layer-content'>
-        <div className='layer-ti d-flex justify-content-between align-items-center'>
-         <h4>비행승인 신청 결과 목록</h4>
-          <span className='search-case'>
-            {dayjs().format('YYYY년 MM월 DD일')} 총 {results?.length} 건
-            결과
-          </span>
-          </div>
-          <div className='invoice-list-wrapper'>
-            <Card>
-              <div className='invoice-list-dataTable flight-approval' style={{ width: '100%' }}>
-                {results?.length > 0 ? (
-                  <GridDatabase
-                    title={'비행이력'}
-                    data={results}
-                    //   count={laancSearchData?.size}
-                    columns={columns}
-                    // handlerPageChange={props.handlerPageChange}
-                    pagination={true}
-                    customStyles={customStyles}
-                    conditionalRowStyles={conditionalRowStyles}
-                    handleRowClick={handleRowClick}
-                  />
-                ) : null}
-              </div>
-            </Card>
+    <div className='layer-content'>
+      <div className='layer-ti d-flex justify-content-between align-items-center'>
+        <h4>비행승인 신청 결과 목록</h4>
+        <span className='search-case'>
+          {dayjs().format('YYYY년 MM월 DD일')} 총 {results?.length} 건 결과
+        </span>
+      </div>
+      <div className='invoice-list-wrapper'>
+        <Card>
+          <div
+            className='invoice-list-dataTable flight-approval'
+            style={{ width: '100%' }}
+          >
+            {results?.length > 0 ? (
+              <GridDatabase
+                title={'비행이력'}
+                data={results}
+                //   count={laancSearchData?.size}
+                columns={columns}
+                // handlerPageChange={props.handlerPageChange}
+                pagination={true}
+                customStyles={customStyles}
+                conditionalRowStyles={conditionalRowStyles}
+                handleRowClick={handleRowClick}
+              />
+            ) : null}
           </div>
+        </Card>
+      </div>
     </div>
   );
 }
diff --git a/src/containers/flight/flightApprovalsContainer.js b/src/containers/flight/flightApprovalsContainer.js
index 8823d3a7..527742c9 100644
--- a/src/containers/flight/flightApprovalsContainer.js
+++ b/src/containers/flight/flightApprovalsContainer.js
@@ -226,7 +226,7 @@ export default function FlightApprovalsContainer() {
 
   const handlerMapInit = () => {
     if (map.getSource('preview')) {
-      map.removeSource('preview');
+      // map.removeSource('preview');
     } else {
       map.addSource('preview', {
         type: 'geojson',
@@ -308,7 +308,6 @@ export default function FlightApprovalsContainer() {
           //지도 줌 좌표 설정
           fitZoomPaths = paths.concat();
         }
-        console.log('>>>', fitZoomPaths);
 
         handlerFitBounds(
           mapObject,
@@ -318,7 +317,7 @@ export default function FlightApprovalsContainer() {
           'flight'
         );
 
-        mapObject.setPaintProperty('waypoint', 'circle-radius', 10);
+        // mapObject.setPaintProperty('waypoint', 'circle-radius', 10);
         mapObject.getSource('preview').setData(previewGeo2);
       }
     }

From c74d2a1284a3e14a1f1cb9d9d745d4b15c340adc Mon Sep 17 00:00:00 2001
From: sanguu516 <sanguu516@naver.com>
Date: Wed, 3 Apr 2024 19:01:08 +0900
Subject: [PATCH 2/2] =?UTF-8?q?report=20=EB=A1=A4=EB=B0=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/flight/FlightApprovalsReport.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/flight/FlightApprovalsReport.js b/src/components/flight/FlightApprovalsReport.js
index 59967142..65337088 100644
--- a/src/components/flight/FlightApprovalsReport.js
+++ b/src/components/flight/FlightApprovalsReport.js
@@ -21,16 +21,17 @@ export default function FlightApprovalsReport(props) {
       </div>
       <div
         className='layer-search layer-search-form'
-        style={{ width: '480px' }}
+        style={{ width: '490px' }}
       >
         <InputGroup>
-          <div style={{ position: 'relative' }}>
+          <div style={{ position: 'relative', borderRadius: '12px' }}>
             <Input
               type='text'
               placeholder={`민원 번호 또는 승인 결과를 입력해 주세요.`}
               value={filterId}
               style={{
-                width: '480px'
+                width: '490px',
+                borderRadius: '12px'
               }}
               onKeyPress={handlerKeyPress}
               onChange={e => setFilterId(`${e.target.value}`)}
@@ -38,7 +39,7 @@ export default function FlightApprovalsReport(props) {
             <Search
               style={{
                 position: 'absolute',
-                right: '5px',
+                right: '6px',
                 top: '50%',
                 transform: 'translateY(-50%)',
                 cursor: 'pointer',