From 8b52d5405cfb5e8483140222c4782d7989213be4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?= Date: Tue, 8 Nov 2022 10:13:58 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EB=B9=84=ED=96=89=EA=B3=84=ED=9A=8D?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=EA=B7=B8=EB=A3=B9=EC=84=A0=ED=83=9D=20?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=B6=84=EB=A6=AC=EC=9E=91?= =?UTF-8?q?=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flight/aprv/FlightPlanAprvContainer.js | 30 ++++++++++++------- .../basis/flight/plan/FlightPlanContainer.js | 21 ++++++++----- .../basis/flight/actions/basisFlightAction.ts | 14 +++++++++ .../basis/flight/models/basisFlightModel.ts | 14 ++++++++- .../flight/reducers/basisFlightReducer.ts | 15 ++++++++++ 5 files changed, 75 insertions(+), 19 deletions(-) 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 => { From a3999eb9be262bb7299aff012dd91e3b6a3cb96a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?= Date: Tue, 8 Nov 2022 11:27:56 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EA=B8=B0=EC=B4=88=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=EA=B7=B8=EB=A3=B9=EC=84=A0=ED=83=9D=20?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=B6=84=EB=A6=AC=EC=9E=91?= =?UTF-8?q?=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basis/dron/BasisDronContainer.js | 12 ++++---- .../group/BasisGroupApprovalContainer.js | 29 ++++++++++++------- .../basis/group/BasisGroupUsersContainer.js | 29 +++++++++++-------- .../basis/group/actions/basisGroupAction.ts | 9 +++++- .../basis/group/models/basisGroupModel.ts | 7 ++++- .../basis/group/reducers/basisGroupReducer.ts | 12 ++++++++ 6 files changed, 68 insertions(+), 30 deletions(-) diff --git a/src/containers/basis/dron/BasisDronContainer.js b/src/containers/basis/dron/BasisDronContainer.js index 1d88e925..c7c34cc4 100644 --- a/src/containers/basis/dron/BasisDronContainer.js +++ b/src/containers/basis/dron/BasisDronContainer.js @@ -173,12 +173,12 @@ export const BasisDronContainer = props => { // return; // }; - useEffect(() => { - handlerCancel(); - // if (selectData) { - // handlerDronSearch(); - // } - }, []); + // useEffect(() => { + // handlerCancel(); + // // if (selectData) { + // // handlerDronSearch(); + // // } + // }, []); useEffect(() => { if (user?.cstmrSno) { diff --git a/src/containers/basis/group/BasisGroupApprovalContainer.js b/src/containers/basis/group/BasisGroupApprovalContainer.js index 16c2ac75..ce3962a8 100644 --- a/src/containers/basis/group/BasisGroupApprovalContainer.js +++ b/src/containers/basis/group/BasisGroupApprovalContainer.js @@ -17,7 +17,8 @@ export const BasisGroupApprovalContainer = props => { joinListCount, groupList, groupListCount, - selectData, + // selectData, + aprvSelect, total } = useSelector(state => state.groupState); @@ -71,7 +72,8 @@ export const BasisGroupApprovalContainer = props => { // width: '100px', sortable: true, cell: row => { - return selectData?.groupId === row?.groupId ? ( + // return selectData?.groupId === row?.groupId ? ( + return aprvSelect?.groupId === row?.groupId ? ( { (user.authId === 'USER' && groupAuthCd === 'MASTER') || (user.authId === 'USER' && aprvlYn === 'Y' && groupAuthCd === 'LEADER') ) { - dispatch(Actions.SELECT({ groupId: groupId, groupNm: groupNm })); + // dispatch(Actions.SELECT({ groupId: groupId, groupNm: groupNm })); + dispatch( + Actions.GROUP_APRV_SELECT({ groupId: groupId, groupNm: groupNm }) + ); if (user?.cstmrSno) { setParams({ @@ -138,7 +143,8 @@ export const BasisGroupApprovalContainer = props => { }; const handlerCancel = () => { - dispatch(Actions.SELECT()); + // dispatch(Actions.SELECT()); + dispatch(Actions.GROUP_APRV_SELECT()); setParams({ ...params, @@ -152,7 +158,8 @@ export const BasisGroupApprovalContainer = props => { setParams({ ...params, cstmrSno: user?.cstmrSno, - groupId: selectData?.groupId, + // groupId: selectData?.groupId, + groupId: aprvSelect?.groupId, aprvYn: '' }); if (user.authId === 'SUPER' || user.authId === 'ADMIN') { @@ -161,7 +168,8 @@ export const BasisGroupApprovalContainer = props => { dispatch( Actions.JOIN_LIST.request({ cstmrSno: user?.cstmrSno, - groupId: selectData?.groupId + // groupId: selectData?.groupId + groupId: aprvSelect?.groupId }) ); } @@ -307,9 +315,9 @@ export const BasisGroupApprovalContainer = props => { } }; - useEffect(() => { - handlerCancel(); - }, []); + // useEffect(() => { + // handlerCancel(); + // }, []); const handlerSearch = () => { const param = params; @@ -391,7 +399,8 @@ export const BasisGroupApprovalContainer = props => { )} - {!selectData ? ( + {/* {!selectData ? ( */} + {!aprvSelect ? (
그룹 목록에서 상세보기를 클릭하세요.
diff --git a/src/containers/basis/group/BasisGroupUsersContainer.js b/src/containers/basis/group/BasisGroupUsersContainer.js index 3bf26c19..384a07fa 100644 --- a/src/containers/basis/group/BasisGroupUsersContainer.js +++ b/src/containers/basis/group/BasisGroupUsersContainer.js @@ -16,9 +16,9 @@ export const BasisGroupUsersContainer = props => { joinListCount, groupList, groupListCount, - selectData, + // selectData, + userSelect, userCount, - userList, count, total @@ -90,7 +90,8 @@ export const BasisGroupUsersContainer = props => { name: '', sortable: true, cell: row => { - return selectData?.groupId === row?.groupId ? ( + // return selectData?.groupId === row?.groupId ? ( + return userSelect?.groupId === row?.groupId ? ( { } ]; - useEffect(() => { - // handlerSearch(); - handlerCancel(); - }, []); + // useEffect(() => { + // // handlerSearch(); + // handlerCancel(); + // }, []); const handlerSearch = () => { if (params.cstmrSno && user?.cstmrSno) { @@ -312,7 +313,8 @@ export const BasisGroupUsersContainer = props => { dispatch( Actions.JOIN_LIST.request({ cstmrSno: user.cstmrSno, - groupId: selectData?.groupId + // groupId: selectData?.groupId + groupId: userSelect?.groupId }) ); } @@ -326,7 +328,8 @@ export const BasisGroupUsersContainer = props => { const handlerDetail = (groupId, groupNm, groupAuthCd, aprvlYn) => { //권한 상관없이 조회 가능 - dispatch(Actions.SELECT({ groupId: groupId, groupNm, groupNm })); + // dispatch(Actions.SELECT({ groupId: groupId, groupNm, groupNm })); + dispatch(Actions.GROUP_USER_SELECT({ groupId: groupId, groupNm, groupNm })); const param = params; param.groupId = groupId; param.memberNm = ''; @@ -340,7 +343,8 @@ export const BasisGroupUsersContainer = props => { }; const handlerCancel = () => { - dispatch(Actions.SELECT()); + // dispatch(Actions.SELECT()); + dispatch(Actions.GROUP_USER_SELECT()); setParams({ ...params, groupId: '', @@ -473,7 +477,7 @@ export const BasisGroupUsersContainer = props => { {/* */} - {selectData ? ( + {userSelect ? ( <> { {/* */} - {selectData ? ( + {/* {selectData ? ( */} + {userSelect ? ( (); export const SELECT = createAction(SELECT_GROUP)(); +export const GROUP_APRV_SELECT = createAction(APRV_GROUP_SELECT)(); +export const GROUP_USER_SELECT = createAction(USER_GROUP_SELECT)(); const actions = { MY_LIST, @@ -241,7 +245,10 @@ const actions = { USER_DELEGATE, GROUP_MYLIST, GROUP_MAIN_LIST, - SELECT + + SELECT, + GROUP_APRV_SELECT, + GROUP_USER_SELECT }; export type GroupAction = ActionType; diff --git a/src/modules/basis/group/models/basisGroupModel.ts b/src/modules/basis/group/models/basisGroupModel.ts index d4483c30..a7c92854 100644 --- a/src/modules/basis/group/models/basisGroupModel.ts +++ b/src/modules/basis/group/models/basisGroupModel.ts @@ -8,7 +8,6 @@ export interface GroupState { groupList: GroupData[] | undefined; aprvList: AprvGroupData[] | undefined; userList: UserGroupData[] | undefined; - selectData: SelectData | undefined; groupId: string | ''; newGroupId: String | ''; searchParams: string | ''; @@ -23,6 +22,10 @@ export interface GroupState { groupListCount: number | 0; aprvCount: number | 0; userCount: number | 0; + + selectData: SelectData | undefined; + aprvSelect: SelectData | undefined; + userSelect: SelectData | undefined; } export interface GroupSearchData { @@ -123,6 +126,8 @@ export const initGroup = { searchParams: '', error: undefined, selectData: undefined, + aprvSelect: undefined, + userSelect: undefined, page: 1, total: 0, count: 0 diff --git a/src/modules/basis/group/reducers/basisGroupReducer.ts b/src/modules/basis/group/reducers/basisGroupReducer.ts index dff516dc..aaec57e3 100644 --- a/src/modules/basis/group/reducers/basisGroupReducer.ts +++ b/src/modules/basis/group/reducers/basisGroupReducer.ts @@ -106,4 +106,16 @@ export const groupReducer = createReducer( const selectData = action.payload; draft.selectData = selectData; }) + ) + .handleAction(Actions.GROUP_APRV_SELECT, (state, action) => + produce(state, draft => { + const selectData = action.payload; + draft.aprvSelect = selectData; + }) + ) + .handleAction(Actions.GROUP_USER_SELECT, (state, action) => + produce(state, draft => { + const selectData = action.payload; + draft.userSelect = selectData; + }) ); From 84eca90e02a59346012d7c5de3f26d8dba908bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?= Date: Tue, 8 Nov 2022 11:28:23 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=9D=B4=EB=A0=A5?= =?UTF-8?q?=ED=98=84=ED=99=A9=20=EA=B7=B8=EB=A3=B9=EC=84=A0=ED=83=9D=20?= =?UTF-8?q?=EC=B4=88=EA=B8=B0=ED=99=94=20=EB=A1=A4=EB=B0=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/containers/analysis/history/AnalysisHistoryContainer.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/containers/analysis/history/AnalysisHistoryContainer.js b/src/containers/analysis/history/AnalysisHistoryContainer.js index dfeda6fe..0b197e0e 100644 --- a/src/containers/analysis/history/AnalysisHistoryContainer.js +++ b/src/containers/analysis/history/AnalysisHistoryContainer.js @@ -87,9 +87,9 @@ export const AnalysisHistoryContainer = props => { }); }, [searchData.groupId]); - useEffect(() => { - handlerGroupCancel(); - }, []); + // useEffect(() => { + // handlerGroupCancel(); + // }, []); const onKeyPress = e => { if (e.key == 'Enter') { From 949342a4a4d069e251ffbe29f4c477cb5d72d26e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?= Date: Tue, 8 Nov 2022 11:30:36 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EB=B9=84=ED=96=89=EA=B3=84=ED=9A=8D?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=ED=83=AD=20=EC=9D=B4=EB=8F=99=EC=8B=9C=20?= =?UTF-8?q?=EA=B2=80=EC=83=89=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basis/flight/aprv/FlightPlanAprvContainer.js | 8 ++++++++ .../basis/flight/plan/FlightPlanContainer.js | 13 ++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js index 1c0756d6..368f4068 100644 --- a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js +++ b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js @@ -189,6 +189,13 @@ const FlightPlanAprvContainer = () => { // handlerGroupCancel(); // // handleSearch(searchData); // }, []); + + useEffect(() => { + if (searchData?.groupId) { + handleSearch(searchData); + } + }, [searchData]); + useEffect(() => { if (user?.cstmrSno) { if (user.authId === 'SUPER' || user.authId === 'ADMIN') { @@ -202,6 +209,7 @@ const FlightPlanAprvContainer = () => { } } }, [user]); + useEffect(() => { if (aprvProc && aprvProc.result > 0) { handleSearch(searchData); diff --git a/src/containers/basis/flight/plan/FlightPlanContainer.js b/src/containers/basis/flight/plan/FlightPlanContainer.js index a39020a3..c1c6a5bb 100644 --- a/src/containers/basis/flight/plan/FlightPlanContainer.js +++ b/src/containers/basis/flight/plan/FlightPlanContainer.js @@ -129,6 +129,16 @@ const FlightPlanContainer = () => { ); }; + // useEffect(() => { + // handlerGroupCancel(); + // }, []); + + useEffect(() => { + if (searchData?.groupId) { + handleSearch(searchData); + } + }, [searchData]); + useEffect(() => { if (user?.cstmrSno) { if (user.authId === 'SUPER' || user.authId === 'ADMIN') { @@ -143,9 +153,6 @@ const FlightPlanContainer = () => { } }, [user]); - // useEffect(() => { - // handlerGroupCancel(); - // }, []); const onChangePage = page => { dispatch(FlightAction.FLIGHT_PLAN_LIST.request({ ...searchData, page })); };