Browse Source

드론 관제 페이지 이동시 지도 띄우기

pull/2/head
sanguu516(박상현) 1 year ago
parent
commit
fb3fd0a1d1
  1. 23
      src/containers/laanc/LaancContainer.js
  2. 7
      src/containers/laanc/LaancPlanContainer.js

23
src/containers/laanc/LaancContainer.js

@ -1,6 +1,6 @@
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import { useHistory, useLocation } from 'react-router-dom';
import moment from 'moment'; import moment from 'moment';
import { useHistory } from 'react-router-dom';
import FlightPlanGrid from '../../components/basis/flight/plan/FlightPlanGrid'; import FlightPlanGrid from '../../components/basis/flight/plan/FlightPlanGrid';
import { CustomMainLayout } from '../../components/layout/CustomMainLayout'; import { CustomMainLayout } from '../../components/layout/CustomMainLayout';
import FlightPlanSearch from '../../components/basis/flight/plan/FlightPlanSearch'; import FlightPlanSearch from '../../components/basis/flight/plan/FlightPlanSearch';
@ -29,6 +29,7 @@ export default function LaancContainer() {
const dispatch = useDispatch(); const dispatch = useDispatch();
const history = useHistory(); const history = useHistory();
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
const [currentParm, setCurrentParm] = useState(false);
const [searchData, setSerchData] = useState(initSearchData); const [searchData, setSerchData] = useState(initSearchData);
const { const {
list: planListData, list: planListData,
@ -42,7 +43,6 @@ export default function LaancContainer() {
state => state.groupState state => state.groupState
); );
const { user } = useSelector(state => state.authState, shallowEqual); const { user } = useSelector(state => state.authState, shallowEqual);
const [params, setParams] = useState({});
//비행계획서 신청 버튼 활성/비활성 제어 //비행계획서 신청 버튼 활성/비활성 제어
const [isMyGroup, setIsMyGroup] = useState(); const [isMyGroup, setIsMyGroup] = useState();
@ -50,6 +50,15 @@ export default function LaancContainer() {
// useEffect(() => { // useEffect(() => {
// handlerGroupCancel(); // handlerGroupCancel();
// }, []); // }, []);
const location = useLocation();
const queryParams = new URLSearchParams(location.search);
const mapParam = queryParams.get('map');
useEffect(() => {
// URL 쿼리 파라미터 중 'map' 값을 가져옵니다.
setOpen(mapParam);
}, [location]);
useEffect(() => { useEffect(() => {
if (user?.cstmrSno) { if (user?.cstmrSno) {
if (user.authId === 'SUPER' || user.authId === 'ADMIN') { if (user.authId === 'SUPER' || user.authId === 'ADMIN') {
@ -107,6 +116,10 @@ export default function LaancContainer() {
dispatch(FlightAction.FLIGHT_PLAN_LIST.request({ ...data, page: 1 })); dispatch(FlightAction.FLIGHT_PLAN_LIST.request({ ...data, page: 1 }));
}; };
const handleApply = () => {
setOpen(!open);
setCurrentParm(true);
};
const handleChangeSearchData = values => { const handleChangeSearchData = values => {
setSerchData(prevState => ({ setSerchData(prevState => ({
...prevState, ...prevState,
@ -186,12 +199,14 @@ export default function LaancContainer() {
<Button <Button
color='primary' color='primary'
className='laanc-pop-btn' className='laanc-pop-btn'
onClick={() => setOpen(!open)} onClick={() => handleApply()}
> >
LAANC 신청하기 LAANC 신청하기
</Button> </Button>
{open ? <LaancPlanContainer open={open} /> : null} {open ? (
<LaancPlanContainer open={open} currentParm={currentParm} />
) : null}
</div> </div>
{/* step-2 */} {/* step-2 */}

7
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 LaancStep1 from '../../views/laanc/LaancStep1'; // laanc step 1
import LaancStep2 from '../../views/laanc/LaancStep2'; // laanc step 2 import LaancStep2 from '../../views/laanc/LaancStep2'; // laanc step 2
import LaancStep3 from '../../views/laanc/LaacnStep3'; // laanc step 3 import LaancStep3 from '../../views/laanc/LaacnStep3'; // laanc step 3
import { useEffect, useState } from 'react';
import moment from 'moment'; import moment from 'moment';
import { WeatherContainer } from '../basis/flight/plan/WeatherContainer'; import { WeatherContainer } from '../basis/flight/plan/WeatherContainer';
import { ErrorModal } from '../../components/modal/ErrorModal'; import { ErrorModal } from '../../components/modal/ErrorModal';
@ -23,11 +24,10 @@ import {
Input Input
} from 'reactstrap'; } from 'reactstrap';
export default function LaancPlanContainer() { export default function LaancPlanContainer({ currentParm }) {
const [step, setStep] = useState(1); const [step, setStep] = useState(1);
const [detailData, setDetailData] = useState(initFlightBas.initDetail); const [detailData, setDetailData] = useState(initFlightBas.initDetail);
const [centeredModal, setCenteredModal] = useState(false); const [centeredModal, setCenteredModal] = useState(false);
const [formModal, setFormModal] = useState(false); const [formModal, setFormModal] = useState(false);
const [disabledAnimation, setDisabledAnimation] = useState(true); const [disabledAnimation, setDisabledAnimation] = useState(true);
const [modal2, setModal2] = useState({ const [modal2, setModal2] = useState({
@ -215,6 +215,7 @@ export default function LaancPlanContainer() {
disabledAnimation={disabledAnimation} disabledAnimation={disabledAnimation}
centeredModal={centeredModal} centeredModal={centeredModal}
setCenteredModal={setCenteredModal} setCenteredModal={setCenteredModal}
currentParm={currentParm}
/> />
</> </>
)} )}

Loading…
Cancel
Save