diff --git a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js index 398450cc..1c0756d6 100644 --- a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js +++ b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js @@ -33,7 +33,8 @@ const FlightPlanAprvContainer = () => { const { list: aprvList, aprvProc, - selectGroup, + // selectGroup, + aprvSelect, total } = useSelector(state => state.flightState); const { joinList, joinListCount, groupList, groupListCount } = useSelector( @@ -91,7 +92,8 @@ const FlightPlanAprvContainer = () => { name: '', sortable: true, cell: row => { - return selectGroup?.groupId === row?.groupId ? ( + // return selectGroup?.groupId === row?.groupId ? ( + return aprvSelect?.groupId === row?.groupId ? ( { param.groupId = groupId; dispatch( - FlightAction.FLIGHT_PLAN_GROUP_SELECT({ + // FlightAction.FLIGHT_PLAN_GROUP_SELECT({ + // cstmrSno: user.cstmrSno, + // groupId: groupId, + // groupNm: groupNm + // }) + FlightAction.FLIGHT_PLAN_APRV_GROUP_SELECT({ cstmrSno: user.cstmrSno, groupId: groupId, groupNm: groupNm @@ -168,7 +175,8 @@ const FlightPlanAprvContainer = () => { const handlerGroupCancel = () => { dispatch( - FlightAction.FLIGHT_PLAN_GROUP_SELECT({ + // FlightAction.FLIGHT_PLAN_GROUP_SELECT({ + FlightAction.FLIGHT_PLAN_APRV_GROUP_SELECT({ cstmrSno: 0, groupId: '', groupNm: '' @@ -177,10 +185,10 @@ const FlightPlanAprvContainer = () => { }; // 최초 비행계획서 목록 조회 - useEffect(() => { - handlerGroupCancel(); - // handleSearch(searchData); - }, []); + // useEffect(() => { + // handlerGroupCancel(); + // // handleSearch(searchData); + // }, []); useEffect(() => { if (user?.cstmrSno) { if (user.authId === 'SUPER' || user.authId === 'ADMIN') { @@ -284,7 +292,8 @@ const FlightPlanAprvContainer = () => { {/* */} - {selectGroup.cstmrSno !== 0 ? ( + {/* {selectGroup.cstmrSno !== 0 ? ( */} + {aprvSelect.cstmrSno !== 0 ? ( <> { {...(user?.authId === 'SUPER' || user?.authId === 'ADMIN' ? { joinList: groupList } : { joinList: joinList })} - selectGroup={selectGroup} + // selectGroup={selectGroup} + selectGroup={aprvSelect} handleChangeSelected={handleChangeSelected} selPlanSnoList={selPlanSnoList} setSelPlanSnoList={setSelPlanSnoList} diff --git a/src/containers/basis/flight/plan/FlightPlanContainer.js b/src/containers/basis/flight/plan/FlightPlanContainer.js index 266b4732..a39020a3 100644 --- a/src/containers/basis/flight/plan/FlightPlanContainer.js +++ b/src/containers/basis/flight/plan/FlightPlanContainer.js @@ -32,7 +32,8 @@ const FlightPlanContainer = () => { const { list: planListData, detail: planDetailData, - selectGroup, + listSelect, + // selectGroup, areaCoordList, total } = useSelector(state => state.flightState); @@ -79,7 +80,8 @@ const FlightPlanContainer = () => { param.groupId = groupId; dispatch( - FlightAction.FLIGHT_PLAN_GROUP_SELECT({ + // FlightAction.FLIGHT_PLAN_GROUP_SELECT({ + FlightAction.FLIGHT_PLAN_LIST_GROUP_SELECT({ cstmrSno: user.cstmrSno, groupId: groupId, groupNm: groupNm @@ -118,7 +120,8 @@ const FlightPlanContainer = () => { const handlerGroupCancel = () => { dispatch( - FlightAction.FLIGHT_PLAN_GROUP_SELECT({ + // FlightAction.FLIGHT_PLAN_GROUP_SELECT({ + FlightAction.FLIGHT_PLAN_LIST_GROUP_SELECT({ cstmrSno: 0, groupId: '', groupNm: '' @@ -140,9 +143,9 @@ const FlightPlanContainer = () => { } }, [user]); - useEffect(() => { - handlerGroupCancel(); - }, []); + // useEffect(() => { + // handlerGroupCancel(); + // }, []); const onChangePage = page => { dispatch(FlightAction.FLIGHT_PLAN_LIST.request({ ...searchData, page })); }; @@ -160,7 +163,8 @@ const FlightPlanContainer = () => { {...(user?.authId === 'SUPER' || user?.authId === 'ADMIN' ? { count: groupListCount } : { count: joinListCount })} - selectGroup={selectGroup} + // selectGroup={selectGroup} + selectGroup={listSelect} handleGroupSelect={handleGroupSelect} handlerGroupCancel={handlerGroupCancel} pagination={true} @@ -172,7 +176,8 @@ const FlightPlanContainer = () => { )} - {selectGroup.cstmrSno !== 0 ? ( + {/* {selectGroup.cstmrSno !== 0 ? ( */} + {listSelect.cstmrSno !== 0 ? ( <> (); +// 비행 계획서 그룹 선택(목록) +export const FLIGHT_PLAN_LIST_GROUP_SELECT = + createAction(LIST_GROUP_SELECT)(); + +// 비행 계획서 그룹 선택(승인) +export const FLIGHT_PLAN_APRV_GROUP_SELECT = + createAction(APRV_GROUP_SELECT)(); + // 비행 구역 상세 값 초기화 export const AREA_DETAIL_INIT = createAction(AREA_DETAIL_INITIAL)(); @@ -285,6 +297,8 @@ const actions = { AREA_COORDINATE_LIST_SAVE, AREA_DETAIL_LIST_SAVE, FLIGHT_PLAN_GROUP_SELECT, + FLIGHT_PLAN_APRV_GROUP_SELECT, + FLIGHT_PLAN_LIST_GROUP_SELECT, FLIGHT_PLAN_AREA_BUFFER_LIST, AREA_DETAIL_INIT, FLIGHT_APRV_LIST, diff --git a/src/modules/basis/flight/models/basisFlightModel.ts b/src/modules/basis/flight/models/basisFlightModel.ts index 6542442f..400555ee 100644 --- a/src/modules/basis/flight/models/basisFlightModel.ts +++ b/src/modules/basis/flight/models/basisFlightModel.ts @@ -11,7 +11,6 @@ export interface FlightState { arcrftSelect: FlightPlanArcrftData | undefined; areaCoordList: FlightPlanAreaData[] | undefined; areaList: FlightPlanAreaData[] | undefined; - selectGroup: SelectGroupData | undefined; aprvList: [FlightPlanData] | undefined; aprvProc: any | undefined; scheduleList: BasFlightScheduleList[] | []; @@ -19,6 +18,9 @@ export interface FlightState { total: number | 0; conut: number | 0; weather: resweatherData | undefined; + selectGroup: SelectGroupData | undefined; + listSelect: SelectGroupData | undefined; + aprvSelect: SelectGroupData | undefined; } export interface weatherData { serviceKey: string; @@ -242,6 +244,16 @@ export const initFlight = { groupId: '', groupNm: '' }, + listSelect: { + cstmrSno: 0, + groupId: '', + groupNm: '' + }, + aprvSelect: { + cstmrSno: 0, + groupId: '', + groupNm: '' + }, publicAreaList: undefined, flightPlanArea: undefined, list: undefined, diff --git a/src/modules/basis/flight/reducers/basisFlightReducer.ts b/src/modules/basis/flight/reducers/basisFlightReducer.ts index 43493ebc..3f5a3a02 100644 --- a/src/modules/basis/flight/reducers/basisFlightReducer.ts +++ b/src/modules/basis/flight/reducers/basisFlightReducer.ts @@ -105,6 +105,21 @@ export const flightReducer = createReducer( draft.selectGroup = data; }) ) + // 비행 계획서 그룹 선택(목록) + .handleAction(Actions.FLIGHT_PLAN_LIST_GROUP_SELECT, (state, action) => + produce(state, draft => { + const data = action.payload; + draft.listSelect = data; + }) + ) + // 비행 계획서 그룹 선택(목록) + .handleAction(Actions.FLIGHT_PLAN_APRV_GROUP_SELECT, (state, action) => + produce(state, draft => { + const data = action.payload; + draft.aprvSelect = data; + }) + ) + // 비행 계획서 버퍼 영역 조회 .handleAction(Actions.FLIGHT_PLAN_AREA_BUFFER_LIST.success, (state, action) => produce(state, draft => {