From fb3fd0a1d1a7eb7ebe9d0f86bb729073de754347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?sanguu516=28=EB=B0=95=EC=83=81=ED=98=84=29?= Date: Tue, 26 Sep 2023 12:45:08 +0900 Subject: [PATCH] =?UTF-8?q?=EB=93=9C=EB=A1=A0=20=EA=B4=80=EC=A0=9C=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=9D=B4=EB=8F=99=EC=8B=9C=20?= =?UTF-8?q?=EC=A7=80=EB=8F=84=20=EB=9D=84=EC=9A=B0=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/containers/laanc/LaancContainer.js | 23 ++++++++++++++++++---- src/containers/laanc/LaancPlanContainer.js | 7 ++++--- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/containers/laanc/LaancContainer.js b/src/containers/laanc/LaancContainer.js index 8458255..1fc4759 100644 --- a/src/containers/laanc/LaancContainer.js +++ b/src/containers/laanc/LaancContainer.js @@ -1,6 +1,6 @@ import React, { useEffect, useState } from 'react'; +import { useHistory, useLocation } from 'react-router-dom'; import moment from 'moment'; -import { useHistory } from 'react-router-dom'; import FlightPlanGrid from '../../components/basis/flight/plan/FlightPlanGrid'; import { CustomMainLayout } from '../../components/layout/CustomMainLayout'; import FlightPlanSearch from '../../components/basis/flight/plan/FlightPlanSearch'; @@ -29,6 +29,7 @@ export default function LaancContainer() { const dispatch = useDispatch(); const history = useHistory(); const [open, setOpen] = useState(false); + const [currentParm, setCurrentParm] = useState(false); const [searchData, setSerchData] = useState(initSearchData); const { list: planListData, @@ -42,7 +43,6 @@ export default function LaancContainer() { state => state.groupState ); const { user } = useSelector(state => state.authState, shallowEqual); - const [params, setParams] = useState({}); //비행계획서 신청 버튼 활성/비활성 제어 const [isMyGroup, setIsMyGroup] = useState(); @@ -50,6 +50,15 @@ export default function LaancContainer() { // useEffect(() => { // handlerGroupCancel(); // }, []); + const location = useLocation(); + const queryParams = new URLSearchParams(location.search); + const mapParam = queryParams.get('map'); + + useEffect(() => { + // URL 쿼리 파라미터 중 'map' 값을 가져옵니다. + setOpen(mapParam); + }, [location]); + useEffect(() => { if (user?.cstmrSno) { if (user.authId === 'SUPER' || user.authId === 'ADMIN') { @@ -107,6 +116,10 @@ export default function LaancContainer() { dispatch(FlightAction.FLIGHT_PLAN_LIST.request({ ...data, page: 1 })); }; + const handleApply = () => { + setOpen(!open); + setCurrentParm(true); + }; const handleChangeSearchData = values => { setSerchData(prevState => ({ ...prevState, @@ -186,12 +199,14 @@ export default function LaancContainer() { - {open ? : null} + {open ? ( + + ) : null} {/* step-2 */} diff --git a/src/containers/laanc/LaancPlanContainer.js b/src/containers/laanc/LaancPlanContainer.js index 342feed..f55cf26 100644 --- a/src/containers/laanc/LaancPlanContainer.js +++ b/src/containers/laanc/LaancPlanContainer.js @@ -1,7 +1,8 @@ +import { useEffect, useState } from 'react'; +import { useHistory, useParams, useLocation } from 'react-router-dom'; import LaancStep1 from '../../views/laanc/LaancStep1'; // laanc step 1 import LaancStep2 from '../../views/laanc/LaancStep2'; // laanc step 2 import LaancStep3 from '../../views/laanc/LaacnStep3'; // laanc step 3 -import { useEffect, useState } from 'react'; import moment from 'moment'; import { WeatherContainer } from '../basis/flight/plan/WeatherContainer'; import { ErrorModal } from '../../components/modal/ErrorModal'; @@ -23,11 +24,10 @@ import { Input } from 'reactstrap'; -export default function LaancPlanContainer() { +export default function LaancPlanContainer({ currentParm }) { const [step, setStep] = useState(1); const [detailData, setDetailData] = useState(initFlightBas.initDetail); const [centeredModal, setCenteredModal] = useState(false); - const [formModal, setFormModal] = useState(false); const [disabledAnimation, setDisabledAnimation] = useState(true); const [modal2, setModal2] = useState({ @@ -215,6 +215,7 @@ export default function LaancPlanContainer() { disabledAnimation={disabledAnimation} centeredModal={centeredModal} setCenteredModal={setCenteredModal} + currentParm={currentParm} /> )}