Browse Source

비행계획 groupId session storage 보관

feature/flight-plan
노승철 2 years ago
parent
commit
6dbc64678c
  1. 3
      src/components/basis/flight/plan/FlightPlanArcrft.js
  2. 11
      src/components/basis/flight/plan/FlightPlanForm.js
  3. 3
      src/containers/basis/flight/plan/FlightPlanArcrftContainer.js
  4. 5
      src/containers/basis/flight/plan/FlightPlanContainer.js
  5. 6
      src/containers/basis/flight/plan/FlightPlanPilotContainer.js

3
src/components/basis/flight/plan/FlightPlanArcrft.js

@ -91,8 +91,7 @@ const FlightPlanArcrft = ({ arcrftList, handleSelectArcrft }) => {
<div className='invoice-list-wrapper'> <div className='invoice-list-wrapper'>
<Card> <Card>
<div className='invoice-list-dataTable'> <div className='invoice-list-dataTable'>
<GridDatabase <GridDatabase
title={'조종사목록'}
data={arcrftList} data={arcrftList}
count={arcrftList ? arcrftList.length : 0} count={arcrftList ? arcrftList.length : 0}
columns={columns} columns={columns}

11
src/components/basis/flight/plan/FlightPlanForm.js

@ -21,7 +21,7 @@ import { X } from 'react-feather';
const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDelete, modal, handleDeleteArray }) => { const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDelete, modal, handleDeleteArray }) => {
const {groupId ,areaList, pilotList, arcrftList} = data; const {areaList, pilotList, arcrftList} = data;
return ( return (
<Row> <Row>
@ -335,8 +335,7 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
</Col> </Col>
<SelectModal <SelectModal
modal={modal} modal={modal}
handleModal={handleModal} handleModal={handleModal}
groupId={groupId}
/> />
</Row> </Row>
) )
@ -344,7 +343,7 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
export default FlightPlanForm; export default FlightPlanForm;
const SelectModal = ({handleModal, modal, groupId}) => { const SelectModal = ({handleModal, modal}) => {
let title = ''; let title = '';
let description = ''; let description = '';
let type = ''; let type = '';
@ -354,14 +353,14 @@ const SelectModal = ({handleModal, modal, groupId}) => {
isOpen = modal.pilot; isOpen = modal.pilot;
title = '조종사 조회'; title = '조종사 조회';
type = 'pilot'; type = 'pilot';
description = <FlightPlanPilotContainer handleModal={handleModal} type={type} groupId={groupId} /> description = <FlightPlanPilotContainer handleModal={handleModal} type={type} />
} }
if(modal.arcrft) { if(modal.arcrft) {
isOpen = modal.arcrft; isOpen = modal.arcrft;
title = '기체 조회'; title = '기체 조회';
type = 'arcrft'; type = 'arcrft';
description = <FlightPlanArcrftContainer handleModal={handleModal} type={type} groupId={groupId} />; description = <FlightPlanArcrftContainer handleModal={handleModal} type={type} />;
} }
if(modal.area) { if(modal.area) {

3
src/containers/basis/flight/plan/FlightPlanArcrftContainer.js

@ -4,13 +4,14 @@ import FlightPlanArcrft from '../../../../components/basis/flight/plan/FlightPla
import * as Actions from '../../../../modules/basis/flight/actions/basisFlightAction'; import * as Actions from '../../../../modules/basis/flight/actions/basisFlightAction';
// import FlightPlanPilot from '../../../../components/basis/flight/plan/FlightPlanPilot'; // import FlightPlanPilot from '../../../../components/basis/flight/plan/FlightPlanPilot';
const FlightPlanArcrftContainer = ({handleModal, type, groupId}) => { const FlightPlanArcrftContainer = ({handleModal, type}) => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const { arcrftList } = useSelector(state => state.flightState); const { arcrftList } = useSelector(state => state.flightState);
/* 기체 조회 */ /* 기체 조회 */
const handleSearch = () => { const handleSearch = () => {
const groupId = sessionStorage.getItem('groupId');
if(groupId) { if(groupId) {
dispatch(Actions.FLIGHT_PLAN_ARCRFT_LIST.request(groupId)); dispatch(Actions.FLIGHT_PLAN_ARCRFT_LIST.request(groupId));

5
src/containers/basis/flight/plan/FlightPlanContainer.js

@ -1,5 +1,5 @@
import React, {useEffect, useState} from 'react'; import React, {useEffect, useState} from 'react';
import moment from 'moment'; import moment, { suppressDeprecationWarnings } from 'moment';
import {Link, Redirect, useHistory} from 'react-router-dom'; import {Link, Redirect, 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';
@ -63,6 +63,9 @@ const FlightPlanContainer = () => {
dispatch(FlightAction.FLIGHT_PLAN_GROUP_SELECT( {cstmrSno: user.cstmrSno, groupId: groupId, groupNm: groupNm} )); dispatch(FlightAction.FLIGHT_PLAN_GROUP_SELECT( {cstmrSno: user.cstmrSno, groupId: groupId, groupNm: groupNm} ));
// groupId sessionStorage에 보관 (1 브라우저 1 tab에만 유효)
sessionStorage.setItem('groupId', groupId);
setSerchData(prevState => { setSerchData(prevState => {
return { return {
...prevState, ...prevState,

6
src/containers/basis/flight/plan/FlightPlanPilotContainer.js

@ -3,13 +3,15 @@ import {useDispatch, useSelector} from 'react-redux';
import * as Actions from '../../../../modules/basis/flight/actions/basisFlightAction'; import * as Actions from '../../../../modules/basis/flight/actions/basisFlightAction';
import FlightPlanPilot from '../../../../components/basis/flight/plan/FlightPlanPilot'; import FlightPlanPilot from '../../../../components/basis/flight/plan/FlightPlanPilot';
const FlightPlanPilotContainer = ({handleModal, type, groupId}) => { const FlightPlanPilotContainer = ({handleModal, type}) => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const { pilotList, selectGroup } = useSelector(state => state.flightState); const { pilotList, selectGroup } = useSelector(state => state.flightState);
/* 조종사 조회 */ /* 조종사 조회 */
const handleSearch = () => { const handleSearch = () => {
const groupId = sessionStorage.getItem('groupId');
if(groupId) { if(groupId) {
dispatch(Actions.FLIGHT_PLAN_PILOT_LIST.request(groupId)); dispatch(Actions.FLIGHT_PLAN_PILOT_LIST.request(groupId));
} }

Loading…
Cancel
Save