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 = ({
- +
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 ( -
+ {/*
*/} +
{/* { handlerGroupCancel={handlerGroupCancel} /> */} - + {/* */} + + {user ? ( <> { selectGroup={selectGroup} handleGroupSelect={handleGroupSelect} handlerGroupCancel={handlerGroupCancel} + pagination={true} + /> ) : ( <> )} - + {/* */} + {selectGroup.cstmrSno !== 0 ? ( <> { /> ) : ( -
+ //
+
그룹 목록에서 상세보기를 클릭하세요.
)} - + {/* */} + {selectGroup.cstmrSno !== 0 ? ( <> { return ( -
+ {/*
*/} +
{/* { columns={columns} /> */} - + {/* */} + + {user ? ( <> { <> )} - + {/* */} + {selectGroup.cstmrSno !== 0 ? ( <> { handleChangeSelected={handleChangeSelected} selPlanSnoList={selPlanSnoList} setSelPlanSnoList={setSelPlanSnoList} - // handleChangeCheckbox={handleChangeCheckbox} + // handleChangeCheckbox={handleChangeCheckbox} /> ) : ( -
+ //
+
그룹 목록에서 상세보기를 클릭하세요.
)} 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 ( -
+ {/*
*/} +
{/* { handlerGroupCancel={handlerGroupCancel} /> */} - + {/* */} + {user ? ( <> { {...(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} /> ) : ( <> )} + - + {/* */} + {selectGroup.cstmrSno !== 0 ? ( <> { ) : ( -
+ //
+
그룹 목록에서 상세보기를 클릭하세요.
)}