From b173d7f4314d5129f6539a35c234af334057e661 Mon Sep 17 00:00:00 2001
From: sanguu <sanguu516@naver.com>
Date: Thu, 6 Oct 2022 16:36:13 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=20=EC=9D=B4=EB=A0=A5,=20?=
 =?UTF-8?q?=EB=B9=84=ED=96=89=20=EA=B3=84=ED=9A=8D-=EB=94=94=EC=9E=90?=
 =?UTF-8?q?=EC=9D=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basis/flight/plan/FlightPlanGroupGrid.js  |  9 +++++++--
 .../history/AnalysisHistoryContainer.js       | 18 ++++++++++++-----
 .../flight/aprv/FlightPlanAprvContainer.js    | 15 +++++++++-----
 .../basis/flight/plan/FlightPlanContainer.js  | 20 ++++++++++++++-----
 4 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/src/components/basis/flight/plan/FlightPlanGroupGrid.js b/src/components/basis/flight/plan/FlightPlanGroupGrid.js
index 8b16fd7..e19acab 100644
--- a/src/components/basis/flight/plan/FlightPlanGroupGrid.js
+++ b/src/components/basis/flight/plan/FlightPlanGroupGrid.js
@@ -7,7 +7,9 @@ const FlightPlanGroupGrid = ({
   count,
   selectGroup,
   handlerGroupCancel,
-  handleGroupSelect
+  handleGroupSelect,
+  paginationRowsPerPageOptions,
+  paginationperpage
 }) => {
   const columns = [
     {
@@ -68,7 +70,10 @@ const FlightPlanGroupGrid = ({
       <div className='invoice-list-wrapper'>
         <Card>
           <div className='invoice-list-dataTable'>
-            <GridDatabase data={data} count={count} columns={columns} />
+            <GridDatabase data={data} count={count} columns={columns}
+              paginationperpage={paginationperpage}
+              paginationRowsPerPageOptions={paginationRowsPerPageOptions}
+            />
           </div>
         </Card>
       </div>
diff --git a/src/containers/analysis/history/AnalysisHistoryContainer.js b/src/containers/analysis/history/AnalysisHistoryContainer.js
index d9b57db..80f937d 100644
--- a/src/containers/analysis/history/AnalysisHistoryContainer.js
+++ b/src/containers/analysis/history/AnalysisHistoryContainer.js
@@ -296,7 +296,8 @@ export const AnalysisHistoryContainer = props => {
   };
   return (
     <CustomMainLayout title={titleName}>
-      <div className='pal-card-box'>
+      {/* <div className='pal-card-box'> */}
+      <div className='mt-2 pal-card-box'>
         <Row>
           {/* <Col sm='4'>
             <FlightPlanGroupGrid
@@ -307,7 +308,9 @@ export const AnalysisHistoryContainer = props => {
               handlerGroupCancel={handlerGroupCancel}
             />
           </Col> */}
-          <Col sm='4'>
+          {/* <Col sm='4'> */}
+          <Col sm='12' lg='12'>
+
             {user ? (
               <>
                 <FlightPlanGroupGrid
@@ -320,13 +323,16 @@ export const AnalysisHistoryContainer = props => {
                   selectGroup={selectGroup}
                   handleGroupSelect={handleGroupSelect}
                   handlerGroupCancel={handlerGroupCancel}
+                  pagination={true}
+
                 />
               </>
             ) : (
               <></>
             )}
           </Col>
-          <Col sm='8'>
+          {/* <Col sm='8'> */}
+          <Col sm='12' lg='12'>
             {selectGroup.cstmrSno !== 0 ? (
               <>
                 <AnalysisHistorySearch
@@ -342,12 +348,14 @@ export const AnalysisHistoryContainer = props => {
                 />
               </>
             ) : (
-              <div className='no-dataTable'>
+              // <div className='no-dataTable'>
+              <div className='mt-2 no-dataTable'>
                 그룹 목록에서 상세보기를 클릭하세요.
               </div>
             )}
           </Col>
-          <Col sm='12'>
+          {/* <Col sm='12'> */}
+          <Col sm='12' lg='12'>
             {selectGroup.cstmrSno !== 0 ? (
               <>
                 <AnalysisHistoryGrid
diff --git a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js
index 2001aee..0b87dd6 100644
--- a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js
+++ b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js
@@ -231,7 +231,8 @@ const FlightPlanAprvContainer = () => {
 
   return (
     <CustomMainLayout title={'비행계획서 승인'}>
-      <div className='pal-card-box'>
+      {/* <div className='pal-card-box'> */}
+      <div className='mt-2 pal-card-box'>
         <Row>
           {/* <Col sm='12'>
             <FlightPlanAprvSearch
@@ -260,7 +261,9 @@ const FlightPlanAprvContainer = () => {
               columns={columns}
             />
           </Col> */}
-          <Col sm='4'>
+          {/* <Col sm='4'> */}
+          <Col sm='12' lg='12'>
+
             {user ? (
               <>
                 <FlightPlanAprvGroupGrid
@@ -277,7 +280,8 @@ const FlightPlanAprvContainer = () => {
               <></>
             )}
           </Col>
-          <Col sm='8'>
+          {/* <Col sm='8'> */}
+          <Col sm='12' lg='12'>
             {selectGroup.cstmrSno !== 0 ? (
               <>
                 <FlightPlanAprvSearch
@@ -296,11 +300,12 @@ const FlightPlanAprvContainer = () => {
                   handleChangeSelected={handleChangeSelected}
                   selPlanSnoList={selPlanSnoList}
                   setSelPlanSnoList={setSelPlanSnoList}
-                  // handleChangeCheckbox={handleChangeCheckbox}
+                // handleChangeCheckbox={handleChangeCheckbox}
                 />
               </>
             ) : (
-              <div className='no-dataTable'>
+              // <div className='no-dataTable'>
+              <div className='mt-2 no-dataTable'>
                 그룹 목록에서 상세보기를 클릭하세요.
               </div>
             )}
diff --git a/src/containers/basis/flight/plan/FlightPlanContainer.js b/src/containers/basis/flight/plan/FlightPlanContainer.js
index b96b989..a4d5978 100644
--- a/src/containers/basis/flight/plan/FlightPlanContainer.js
+++ b/src/containers/basis/flight/plan/FlightPlanContainer.js
@@ -123,7 +123,8 @@ const FlightPlanContainer = () => {
 
   return (
     <CustomMainLayout title={'비행계획서 신청'}>
-      <div className='pal-card-box'>
+      {/* <div className='pal-card-box'> */}
+      <div className='mt-2 pal-card-box'>
         <Row>
           {/* <Col sm='4'>
             <FlightPlanGroupGrid
@@ -134,7 +135,8 @@ const FlightPlanContainer = () => {
               handlerGroupCancel={handlerGroupCancel}
             />
           </Col> */}
-          <Col sm='4'>
+          {/* <Col sm='4'> */}
+          <Col sm='12' lg='12'>
             {user ? (
               <>
                 <FlightPlanGroupGrid
@@ -144,16 +146,22 @@ const FlightPlanContainer = () => {
                   {...(user?.authId === 'SUPER' || user?.authId === 'ADMIN'
                     ? { count: groupListCount }
                     : { count: joinListCount })}
+
+                  paginationperpage={5}
+                  paginationRowsPerPageOptions={[5, 10, 15, 20]}
                   selectGroup={selectGroup}
                   handleGroupSelect={handleGroupSelect}
                   handlerGroupCancel={handlerGroupCancel}
+                  pagination={true}
                 />
               </>
             ) : (
               <></>
             )}
+
           </Col>
-          <Col sm='8'>
+          {/* <Col sm='8'> */}
+          <Col sm='12' lg='12'>
             {selectGroup.cstmrSno !== 0 ? (
               <>
                 <FlightPlanSearch
@@ -164,11 +172,13 @@ const FlightPlanContainer = () => {
                 <FlightPlanGrid
                   movePage={moveFlightPlanDetailPage}
                   planListData={planListData}
-                  // columns={columns}
+                  pagination={true}
+                // columns={columns}
                 />
               </>
             ) : (
-              <div className='no-dataTable'>
+              // <div className='no-dataTable'>
+              <div className='mt-2 no-dataTable'>
                 그룹 목록에서 상세보기를 클릭하세요.
               </div>
             )}