From aac4a560c3a84b28422233a601acd7057b3ab84c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=83=81=ED=98=84?= Date: Thu, 7 Dec 2023 14:25:23 +0900 Subject: [PATCH] =?UTF-8?q?laanc=20state=20=EC=A3=BC=EC=84=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/laanc/list/LaancDetail.js | 2 ++ src/components/laanc/list/LaancGrid.js | 4 +++- src/components/laanc/list/LaancSearch.js | 2 +- src/components/laanc/step/LaacnStep3.js | 7 ++++++- src/components/laanc/step/LaancStep1.js | 10 ++++++++++ src/components/laanc/step/LaancStep2.js | 6 ++++++ src/containers/laanc/LaancContainer.js | 6 ++++-- src/containers/laanc/LaancPlanContainer.js | 10 ++++++++-- 8 files changed, 40 insertions(+), 7 deletions(-) diff --git a/src/components/laanc/list/LaancDetail.js b/src/components/laanc/list/LaancDetail.js index 904de477..3837a1f1 100644 --- a/src/components/laanc/list/LaancDetail.js +++ b/src/components/laanc/list/LaancDetail.js @@ -30,7 +30,9 @@ export default function LaancDetail({ data, handlerLaancClose }) { 11: '25kg초과' } }; + // 로그인 정보 const { user } = useSelector(state => state.authState); + // 약관 정보 const { termsList } = useSelector(state => state.accountState); // Laanc 약관 동의 diff --git a/src/components/laanc/list/LaancGrid.js b/src/components/laanc/list/LaancGrid.js index 5adcf7ed..4a305bfe 100644 --- a/src/components/laanc/list/LaancGrid.js +++ b/src/components/laanc/list/LaancGrid.js @@ -19,11 +19,13 @@ pdfjs.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/$ export default function LaancGrid() { const dispatch = useDispatch(); + // 상세보기 모달 const [isAnimation, setIsAnimation] = useState(false); - + // Laanc 승인 신청 목록 const { laancSearchData, laancDetail } = useSelector( state => state.laancState ); + // 로딩 상태 const { loading } = useSelector(state => state.loadingReducer); // Laanc 승인 신청 목록 조회 diff --git a/src/components/laanc/list/LaancSearch.js b/src/components/laanc/list/LaancSearch.js index d61a03d6..7a4edea6 100644 --- a/src/components/laanc/list/LaancSearch.js +++ b/src/components/laanc/list/LaancSearch.js @@ -8,7 +8,7 @@ import * as LaancAction from '../../../modules/laanc/actions/laancActions'; function LaancSearch() { const dispatch = useDispatch(); - + // 날짜 데이터 const [date, setDate] = useState({ createStDate: moment().subtract(0, 'day').format('YYYY-MM-DD'), createEndDate: moment().subtract(-7, 'day').format('YYYY-MM-DD') diff --git a/src/components/laanc/step/LaacnStep3.js b/src/components/laanc/step/LaacnStep3.js index aaeab817..3121f2fd 100644 --- a/src/components/laanc/step/LaacnStep3.js +++ b/src/components/laanc/step/LaacnStep3.js @@ -41,10 +41,15 @@ export default function LaacnStep3({ } }; + // 성공 모달 const [confirmModal, setConfirmModal] = useState(false); + // 공문 모달 const [formModal, setFormModal] = useState(false); - const [numPages, setNumPages] = useState(null); // total + // total + const [numPages, setNumPages] = useState(null); + // 로그인 정보 const { user } = useSelector(state => state.authState); + // pdf 데이터 const { laancPdf } = useSelector(state => state.laancState); // PDF 다운로드 diff --git a/src/components/laanc/step/LaancStep1.js b/src/components/laanc/step/LaancStep1.js index 9dddaf6c..fb1e45dd 100644 --- a/src/components/laanc/step/LaancStep1.js +++ b/src/components/laanc/step/LaancStep1.js @@ -36,22 +36,32 @@ export default function LaancStep1({ }) { const dispatch = useDispatch(); + // 로그인 정보 const { user } = useSelector(state => state.authState); + // 비행 구역 정보 const { areaCoordList } = useSelector(state => state.flightState); + // 일물 일출, 고도 정보, 관제권안 정보 const { laancSun, laancElev, laancArea } = useSelector( state => state.laancState ); + + // LAANC 폼 제어 const fltElevRef = useRef(null); const bufferZoneRef = useRef(null); const schFltStDtRef = useRef(null); const schFltEndDtRef = useRef(null); + + // 마운트 시 지도 표출 여부 const location = useLocation(); const queryParams = new URLSearchParams(location.search); const mapParam = queryParams.get('map'); + // 아이콘 팝오버 const [popoverCommercial, setPopoverCommercial] = useState(false); const [popoverSchFltStDt, setPopoverSchFltStDt] = useState(false); const [popoverSchFltEndDt, setPopoverSchFltEndDt] = useState(false); + + // 모달 const [isErrorModal, setIsErrorModal] = useState({ isOpen: false, title: '', diff --git a/src/components/laanc/step/LaancStep2.js b/src/components/laanc/step/LaancStep2.js index e6880e54..0939b3c0 100644 --- a/src/components/laanc/step/LaancStep2.js +++ b/src/components/laanc/step/LaancStep2.js @@ -40,11 +40,17 @@ export default function LaancStep2({ 11: '25kg초과' } }; + // 약관 동의 const [isterms, setIsterms] = useState(false); + // 약관 팝업 const [isPopUp, setIsPopUp] = useState(false); + // 비행 승인 요청 데이터 const [flightData, setFlightData] = useState({}); + // 로그인 정보 const { user } = useSelector(state => state.authState); + // 약관 동의 데이터 const { termsList } = useSelector(state => state.accountState); + // pdf 데이터 const { laancPdf } = useSelector(state => state.laancState); const dispatch = useDispatch(); diff --git a/src/containers/laanc/LaancContainer.js b/src/containers/laanc/LaancContainer.js index afa2f65d..202c6052 100644 --- a/src/containers/laanc/LaancContainer.js +++ b/src/containers/laanc/LaancContainer.js @@ -13,11 +13,13 @@ import LaancGrid from '../../components/laanc/list/LaancGrid'; export default function LaancContainer() { const dispatch = useDispatch(); - const location = useLocation(); - + // map 컴포넌트 표출 여부 const [currentParm, setCurrentParm] = useState(false); + //LAANC 신청하기 모달 const [disabledAnimation, setDisabledAnimation] = useState(false); + // 마운트 시 지도 표출 여부 + const location = useLocation(); const queryParams = new URLSearchParams(location.search); const mapParam = queryParams.get('map'); diff --git a/src/containers/laanc/LaancPlanContainer.js b/src/containers/laanc/LaancPlanContainer.js index 18dbbd94..2e77166d 100644 --- a/src/containers/laanc/LaancPlanContainer.js +++ b/src/containers/laanc/LaancPlanContainer.js @@ -23,14 +23,20 @@ export default function LaancPlanContainer({ setDisabledAnimation }) { const dispatch = useDispatch(); - + // 비행 구역 정보 const { areaCoordList } = useSelector(state => state.flightState); + // 로그인 정보 const { user } = useSelector(state => state.authState); + // 관제권안 정보,고도 정보 const { laancArea, laancElev } = useSelector(state => state.laancState); - + // laanc step const [step, setStep] = useState(1); + // laanc 초기값 const [detailData, setDetailData] = useState(initFlightBas.initDetail); + // 비행 구역 보달 const [centeredModal, setCenteredModal] = useState(false); + + // 모달 const [isErrorModal, setIsErrorModal] = useState({ isOpen: false, title: '',