diff --git a/src/containers/laanc/LaancContainer.js b/src/containers/laanc/LaancContainer.js index a7cb907..ac98f09 100644 --- a/src/containers/laanc/LaancContainer.js +++ b/src/containers/laanc/LaancContainer.js @@ -5,6 +5,8 @@ import moment from 'moment'; import { useDispatch, useSelector, shallowEqual } from 'react-redux'; import { CustomMainLayout } from '../../components/layout/CustomMainLayout'; import * as FlightAction from '../../modules/basis/flight/actions/basisFlightAction'; +import * as LaancAction from '../../modules/laanc/actions/laancActions'; +import { drawTypeChangeAction } from '../../modules/control/map/actions/controlMapActions'; import { JOIN_LIST, GROUP_LIST @@ -118,6 +120,8 @@ export default function LaancContainer() { }; const handleApply = () => { + dispatch(drawTypeChangeAction('')); + dispatch(LaancAction.LAANC_APPROVAL_INIT()); setDisabledAnimation(true); setCurrentParm(true); }; diff --git a/src/containers/laanc/LaancPlanContainer.js b/src/containers/laanc/LaancPlanContainer.js index 62ad157..a13f74a 100644 --- a/src/containers/laanc/LaancPlanContainer.js +++ b/src/containers/laanc/LaancPlanContainer.js @@ -47,6 +47,11 @@ export default function LaancPlanContainer({ }; }, []); + // useEffect(() => { + // if (disabledAnimation) { + // setStep(1); + // } + // }, [disabledAnimation]); //비행 방식 직접 입력칸 작성 시 api 호출 부분 useEffect(() => { if (Object.getOwnPropertyNames(finalDetailData).length != 0) { @@ -56,7 +61,9 @@ export default function LaancPlanContainer({ // laanc 승인 api 200 시 step 이동 useEffect(() => { - if (laancApply) setStep(2); + if (laancApply) { + setStep(2); + } }, [laancApply]); // step 핸들러 @@ -204,8 +211,6 @@ export default function LaancPlanContainer({ } }; - console.log('>>>', detailData); - // 스텝 1 다음 버튼 이벤트 const handlerNext = () => { const reg_email = @@ -389,6 +394,7 @@ export default function LaancPlanContainer({ }; const handlerLaancClose = () => { + setStep(1); setDisabledAnimation(!disabledAnimation); dispatch(AREA_DETAIL_INIT()); }; diff --git a/src/modules/laanc/actions/laancActions.ts b/src/modules/laanc/actions/laancActions.ts index 732de15..9eb09f5 100644 --- a/src/modules/laanc/actions/laancActions.ts +++ b/src/modules/laanc/actions/laancActions.ts @@ -22,6 +22,9 @@ const LAANC_FLIGHT_APPROVAL_FAILURE = 'laanc/approval/FAILURE'; const LAANC_FLIGHT_CREATE_REQUEST = 'laanc/create/REQUEST'; const LAANC_FLIGHT_CREATE_SUCCESS = 'laanc/create/SUCCESS'; const LAANC_FLIGHT_CREATE_FAILURE = 'laanc/create/FAILURE'; + +// laanc 초기화 +const INIT_LAANC = 'laanc/init'; // laanc 공문 pdf 다운로드 export const laancPdfAction = createAsyncAction( LAANC_PDF_REQUEST, @@ -36,6 +39,8 @@ export const LAANC_FLIGHT_Approval = createAsyncAction( LAANC_FLIGHT_APPROVAL_FAILURE )(); +export const LAANC_APPROVAL_INIT = createAction(INIT_LAANC)(); + // laanc 비행계획서 생성 export const LAANC_FLIGHT_CREATE = createAsyncAction( LAANC_FLIGHT_CREATE_REQUEST, @@ -46,6 +51,7 @@ export const LAANC_FLIGHT_CREATE = createAsyncAction( const actions = { laancPdfAction, LAANC_FLIGHT_Approval, - LAANC_FLIGHT_CREATE + LAANC_FLIGHT_CREATE, + LAANC_APPROVAL_INIT }; export type LaancAction = ActionType; diff --git a/src/modules/laanc/reducers/laancReducers.ts b/src/modules/laanc/reducers/laancReducers.ts index 5f01016..a6ba8d8 100644 --- a/src/modules/laanc/reducers/laancReducers.ts +++ b/src/modules/laanc/reducers/laancReducers.ts @@ -30,6 +30,12 @@ export const laancReducer = createReducer( draft.laancPdf = data; // draft.detail = initFlightBas.initDetail; }) + ) + .handleAction(Actions.LAANC_APPROVAL_INIT, (state, action) => + produce(state, draft => { + draft.laancApply = undefined; + // draft.detail = initFlightBas.initDetail; + }) ); // handleAction(Actions.laancFlightApproval.success, (state, action) => diff --git a/src/views/laanc/LaacnStep3.js b/src/views/laanc/LaacnStep3.js index 4598675..afe4454 100644 --- a/src/views/laanc/LaacnStep3.js +++ b/src/views/laanc/LaacnStep3.js @@ -56,16 +56,10 @@ export default function LaacnStep3({ const handlerClose = () => { setFormModal(!formModal); }; - const handlerPdfDownload = e => { - const url = localStorage.getItem('pdfUrl'); - - if (url !== 'undefined') { - console.log('@?@?@?@?'); + if (laancPdf.pdfUrl) { let alink = document.createElement('a'); - alink.href = `http://211.253.11.189:8080${localStorage.getItem( - 'pdfUrl' - )}`; + alink.href = `http://211.253.11.189:8080${laancPdf.pdfUrl}`; alink.download = 'SamplePDF.pdf'; alink.click(); } @@ -235,7 +229,7 @@ export default function LaacnStep3({ -
+ {/*
승인 공문
@@ -260,7 +254,7 @@ export default function LaacnStep3({ -
+
*/} @@ -283,11 +277,46 @@ export default function LaacnStep3({ setCenteredModal2(!centeredModal2)} - className='modal-dialog-centered document-pop' + className='modal-dialog-centered' + style={{ maxWidth: '650px', margin: '0 auto' }} > setCenteredModal2(!centeredModal2)}> 비행 승인 완료 + + +
+ {Array.from(new Array(numPages), (el, index) => ( + + ))} +
+ {/* */} +
+ + + + +
+ + + + +
+ setFormModal(!formModal)} + className='modal-dialog-centered document-pop' + > + setFormModal(!formModal)}> + 비행 승인 완료 +
@@ -306,60 +335,10 @@ export default function LaacnStep3({ onClick={() => setDisabledAnimation(!disabledAnimation)} > 확인 - {' '} + - - 공문 미리보기 - - {/* */} - -
- {Array.from(new Array(numPages), (el, index) => ( - - ))} -
- {/* */} -
- {/*
- - - {pageNum} / {numPages} - - -
*/} -
- - - -
); } diff --git a/src/views/laanc/LaancStep1.js b/src/views/laanc/LaancStep1.js index cb8c73e..91c43e3 100644 --- a/src/views/laanc/LaancStep1.js +++ b/src/views/laanc/LaancStep1.js @@ -193,6 +193,7 @@ export default function LaancStep1({ isOpen={popoverCommercial} target='commercial' toggle={() => toggle('commercial')} + placement='bottom' > 항공기대여업, 항공레저스포츠사업, 초경량비행장치 @@ -241,6 +242,7 @@ export default function LaancStep1({ isOpen={popoverSchFltStDt} target='schFltStDt' toggle={() => toggle('schFltStDt')} + placement='bottom' > 비행 시작 일자는 오늘기준 90일 이내까지만 선택 @@ -248,7 +250,6 @@ export default function LaancStep1({ - toggle('schFltEndDt')} + placement='bottom' > 비행 종료 일자는 오늘기준 6개월 이내까지만 선택 diff --git a/src/views/laanc/LaancStep2.js b/src/views/laanc/LaancStep2.js index 0d8d522..dc52853 100644 --- a/src/views/laanc/LaancStep2.js +++ b/src/views/laanc/LaancStep2.js @@ -86,9 +86,6 @@ export default function LaancStep2({ else if (laancApply?.valid) setLancIsCheck(false); }, [laancApply]); - useEffect(() => { - console.log('>>>>', laancIsCheck); - }, [laancIsCheck]); useEffect(() => { if (flightData && Object.keys(flightData).length > 0) { dispatch(LaancAction.LAANC_FLIGHT_CREATE.request(flightData)); @@ -115,7 +112,6 @@ export default function LaancStep2({ ], validatedRs: laancApply }); - console.log('>>>', flightData); // dispatch(LaancAction.LAANC_FLIGHT_CREATE.request(flightData)); };