pav
/
pav-fe-kac
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

비행계획서 지도-버그수정

pull/2/head
sanguu 2 years ago
parent
08471a29e9 c1ae711fcb
commit
da62397996
3 changed files with 173 additions and 79 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      src/assets/css/custom.css
  2. 4
      src/components/basis/flight/plan/FlightPlanAreaMap.js
  3. 133
      src/components/basis/flight/plan/FlightPlanForm.js

9
src/assets/css/custom.css
Unescape View File

@ -744,3 +744,12 @@ background-size: 75% auto;
.layer-content-box .history-btn:hover{border-radius:4px;background:#00cfe8;border-color:#00cfe8;transition: 0.3s ease;-webkit-transition: 0.3s ease;} .layer-content-box .history-btn:hover{border-radius:4px;background:#00cfe8;border-color:#00cfe8;transition: 0.3s ease;-webkit-transition: 0.3s ease;}
.historyModal .drone-ti span{font-weight:500;margin-top:6px} .historyModal .drone-ti span{font-weight:500;margin-top:6px}
.historyModal .drone-name{color:#00cfe8;margin:0 10px 0 0;} .historyModal .drone-name{color:#00cfe8;margin:0 10px 0 0;}
.search-info-box-del-btn{display: flex; align-items: center;}
.search-info-box-del-btn button{cursor: pointer;margin-top:10px}
@media (max-width: 992px){
.search-info-box-del-btn button {
margin-bottom:1rem;
margin-top:0px;
}
}

4
src/components/basis/flight/plan/FlightPlanAreaMap.js
Unescape View File

@ -44,8 +44,8 @@ const FlightPlanAreaMap = (props) => {
const ModeInit = () => { const ModeInit = () => {
setMode(mapControl.drawType) setMode(mapControl.drawType)
} }
console.log(areaCoordList);
const NaverMapInit = () => { const NaverMapInit = () => {
const center = {}; const center = {};
const bufferzoom ={}; const bufferzoom ={};
@ -81,7 +81,7 @@ const FlightPlanAreaMap = (props) => {
}; };
setMap(new naver.maps.Map('map', mapOptions2)); setMap(new naver.maps.Map('map', mapOptions2));
} }
}
const handlerDrawType = val => { const handlerDrawType = val => {
dispatch(drawTypeChangeAction(val)); dispatch(drawTypeChangeAction(val));
}; };

133
src/components/basis/flight/plan/FlightPlanForm.js
Unescape View File

@ -1,4 +1,4 @@
import React, { useEffect } from 'react'; import React, { useEffect, useState } from 'react';
import { import {
Card, Card,
CardBody, CardBody,
@ -24,6 +24,33 @@ import { useDispatch, useSelector } from 'react-redux';
const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDelete, modal, handleDeleteArray }) => { const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDelete, modal, handleDeleteArray }) => {
const {areaList, pilotList, arcrftList} = data; const {areaList, pilotList, arcrftList} = data;
const { detail } = useSelector(state => state.flightState);
const [date ,setDate] = useState();
const [isFlightDone, setIsFlightDone] = useState();
useEffect(() => {
if(detail.createDt) {
setDate(detail.schFltStDt);
}
}, [detail])
useEffect(() => {
setDate('');
}, [])
useEffect(() => {
if(date) {
let cTime = new Date();
let pTime = new Date(date)
if(cTime > pTime) {
setIsFlightDone(true);
} else {
setIsFlightDone(false);
}
}
}, [date])
return ( return (
<Row> <Row>
<Col sm='12'> <Col sm='12'>
@ -69,6 +96,7 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
bsSize='sm' bsSize='sm'
placeholder='' placeholder=''
{ ...(isFlightDone ? {readOnly:true} : {}) }
/> />
</FormGroup> </FormGroup>
</Col> </Col>
@ -115,6 +143,7 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
}) })
}} }}
placeholder='010-0000-0000' placeholder='010-0000-0000'
{ ...(isFlightDone ? {readOnly:true} : {}) }
/> />
</div> </div>
</FormGroup> </FormGroup>
@ -140,6 +169,7 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
}} }}
// innerRef={props.data} // innerRef={props.data}
placeholder='' placeholder=''
{ ...(isFlightDone ? {readOnly:true} : {}) }
/> />
</FormGroup> </FormGroup>
</Col> </Col>
@ -157,7 +187,23 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
<Label for='test'> <Label for='test'>
<span className='necessary'>*</span>비행시작일자 <span className='necessary'>*</span>비행시작일자
</Label> </Label>
<Flatpickr size='sm' {
(isFlightDone) ?
(
<Input
type='text'
id='groupNm'
name='groupNm'
value={data.schFltStDt}
bsSize='sm'
placeholder=''
readOnly
/>
)
:
(
<Flatpickr
size='sm'
className='form-control calendar-flat' className='form-control calendar-flat'
type='text' type='text'
id='schFltStDt' id='schFltStDt'
@ -173,7 +219,11 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
value value
}) })
}} }}
placeholder='비행 시작일자 선택(클릭)'/> placeholder='비행 시작일자 선택(클릭)'
{...{options:{minDate: "today"}}}
/>
)
}
</FormGroup> </FormGroup>
</Col> </Col>
@ -182,12 +232,29 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
<Label for='test'> <Label for='test'>
<span className='necessary'>*</span>비행종료일자 <span className='necessary'>*</span>비행종료일자
</Label> </Label>
<Flatpickr size='sm' {
(isFlightDone) ?
(
<Input
type='text'
id='groupNm'
name='groupNm'
value={data.schFltEndDt}
bsSize='sm'
placeholder=''
readOnly
/>
)
:
(
<Flatpickr
size='sm'
className='form-control calendar-flat' className='form-control calendar-flat'
type='text' type='text'
id='schFltEndDt' id='schFltEndDt'
name='schFltEndDt' name='schFltEndDt'
data-enable-time data-enable-time
// defaultValue={data.schFltEndDt}
value={data.schFltEndDt} value={data.schFltEndDt}
onChange={(date) => { onChange={(date) => {
const value = moment(date[0]).format('YYYY-MM-DD HH:mm:ss') || ''; const value = moment(date[0]).format('YYYY-MM-DD HH:mm:ss') || '';
@ -197,8 +264,11 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
value value
}) })
}} }}
placeholder='비행 종료일자 선택(클릭)'/> placeholder='비행 종료일자 선택(클릭)'
{...{options:{minDate: "today"}}}
/>
)
}
</FormGroup> </FormGroup>
</Col> </Col>
<Col className='list-input' lg={4} md={4} sm={12}> <Col className='list-input' lg={4} md={4} sm={12}>
@ -207,7 +277,7 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
<span className='necessary'>*</span>비행 목적 <span className='necessary'>*</span>비행 목적
</Label> </Label>
<Input <Input
type='select' {...(isFlightDone? {type:'text'} : {type:'select'})}
id='fltPurpose' id='fltPurpose'
name='fltPurpose' name='fltPurpose'
value={data.fltPurpose} value={data.fltPurpose}
@ -220,12 +290,17 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
value, value,
}) })
}} }}
{...(isFlightDone? {readOnly:true} : {})}
// innerRef={props.data} // innerRef={props.data}
// className={classnames({ // className={classnames({
// 'is-invalid': props.errors.arcrftTypeCd // 'is-invalid': props.errors.arcrftTypeCd
// })} // })}
> >
{/* TODO CDNOT 코드연동 필요 */} {/* TODO CDNOT 코드연동 필요 */}
{ isFlightDone ?
<></>
:
<>
<option value=''>= 선택 =</option> <option value=''>= 선택 =</option>
<option value='시험비행'>= 시험비행 =</option> <option value='시험비행'>= 시험비행 =</option>
<option value='교육비행'>= 교육비행 =</option> <option value='교육비행'>= 교육비행 =</option>
@ -233,6 +308,8 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
<option value='비행훈련'>= 비행훈련 =</option> <option value='비행훈련'>= 비행훈련 =</option>
<option value='비행교육'>= 비행교육 =</option> <option value='비행교육'>= 비행교육 =</option>
<option value='비행실기시험'>= 비행실기시험 =</option> <option value='비행실기시험'>= 비행실기시험 =</option>
</>
}
</Input> </Input>
</FormGroup> </FormGroup>
@ -249,6 +326,7 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
onClick={(e) => { onClick={(e) => {
handleModal({target: 'area', isOpen: true}) handleModal({target: 'area', isOpen: true})
}} }}
{...(isFlightDone)? {disabled:true} : {} }
> >
비행 구역 설정 비행 구역 설정
</Button.Ripple> </Button.Ripple>
@ -268,6 +346,7 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
onClick={(e) => { onClick={(e) => {
handleModal({target: 'pilot', isOpen: true}) handleModal({target: 'pilot', isOpen: true})
}} }}
{...(isFlightDone)? {disabled:true} : {} }
> >
조종사 조회 조종사 조회
</Button.Ripple> </Button.Ripple>
@ -278,7 +357,9 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
index={i} index={i}
data={item} data={item}
handleChange={handleChange} handleChange={handleChange}
handleDeleteArray ={handleDeleteArray}/>) handleDeleteArray ={handleDeleteArray}
isFlightDone={isFlightDone}
/>)
: <PilotForm data={initFlightBas.pilot} : <PilotForm data={initFlightBas.pilot}
handleChange={handleChange}/>} handleChange={handleChange}/>}
</dt> </dt>
@ -290,6 +371,7 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
onClick={(e) => { onClick={(e) => {
handleModal({target: 'arcrft', isOpen: true}); handleModal({target: 'arcrft', isOpen: true});
}} }}
{...(isFlightDone)? {disabled:true} : {} }
> >
기체 조회 기체 조회
</Button.Ripple> </Button.Ripple>
@ -300,7 +382,9 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
index={i} index={i}
data={item} data={item}
handleChange={handleChange} handleChange={handleChange}
handleDeleteArray ={handleDeleteArray}/>) handleDeleteArray ={handleDeleteArray}
isFlightDone={isFlightDone}
/>)
: <ArcrftForm data={initFlightBas.arcrft} : <ArcrftForm data={initFlightBas.arcrft}
handleChange={handleChange}/>} handleChange={handleChange}/>}
@ -312,6 +396,7 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
color='primary' color='primary'
size='sm' size='sm'
onClick={handleSave} onClick={handleSave}
{...(isFlightDone)? {disabled:true} : {} }
> >
저장 저장
</Button.Ripple> </Button.Ripple>
@ -319,6 +404,7 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
color='danger' color='danger'
size='sm' size='sm'
onClick={handleDelete} onClick={handleDelete}
{...(isFlightDone)? {disabled:true} : {} }
> >
삭제 삭제
</Button.Ripple> </Button.Ripple>
@ -517,7 +603,7 @@ const AreaForm = ({data, handleChange, index}) => {
</Row> </Row>
</div>) </div>)
} }
const PilotForm = ({data, handleChange, index, handleDeleteArray}) => { const PilotForm = ({data, handleChange, index, handleDeleteArray, isFlightDone}) => {
return (<div className='search-info-box'> return (<div className='search-info-box'>
<Row> <Row>
<Col className='list-input' lg={4} md={6} sm={12}> <Col className='list-input' lg={4} md={6} sm={12}>
@ -597,7 +683,7 @@ const PilotForm = ({data, handleChange, index, handleDeleteArray}) => {
</div> </div>
</FormGroup> </FormGroup>
</Col> </Col>
<Col className='list-input' lg={4} md={6} sm={12}> <Col className='list-input' lg={3} md={6} sm={12}>
<FormGroup> <FormGroup>
<Label for='test'> <Label for='test'>
<span className='necessary'>*</span>이메일 <span className='necessary'>*</span>이메일
@ -624,33 +710,33 @@ const PilotForm = ({data, handleChange, index, handleDeleteArray}) => {
/> />
</FormGroup> </FormGroup>
</Col> </Col>
<Col className='search-info-box-del-btn' lg={1} md={6} sm={12}>
{data.groupNm? {data.groupNm?
( (
<Col className='pilot-del-btn' xs={12} md={2} xl={2} >
<Button.Ripple <Button.Ripple
color='danger' color='danger'
className='text-nowrap px-2' className='btn-icon'
onClick={() => onClick={() =>
handleDeleteArray({ type: 'pilot', index }) handleDeleteArray({ type: 'pilot', index })
} }
outline {...(isFlightDone)? {disabled:true} : {} }
> >
<X size={14} className='mr-50' /> <X size={14} />
<span>삭제</span>
</Button.Ripple> </Button.Ripple>
</Col>
) )
: :
( (
<></> <></>
) )
} }
</Col>
</Row> </Row>
</div>) </div>)
} }
const ArcrftForm = ({data, handleChange, index, handleDeleteArray}) => { const ArcrftForm = ({data, handleChange, index, handleDeleteArray, isFlightDone}) => {
return (<div className='search-info-box'> return (<div className='search-info-box'>
<Row> <Row>
<Col className='list-input' lg={3} md={6} sm={12}> <Col className='list-input' lg={3} md={6} sm={12}>
@ -734,7 +820,7 @@ const ArcrftForm = ({data, handleChange, index, handleDeleteArray}) => {
/> />
</FormGroup> </FormGroup>
</Col> </Col>
<Col className='list-input' lg={3} md={6} sm={12}> <Col className='list-input' lg={2} md={6} sm={12}>
<FormGroup> <FormGroup>
<Label for='test'> <Label for='test'>
<span className='necessary'>*</span>소유자명 <span className='necessary'>*</span>소유자명
@ -783,17 +869,16 @@ const ArcrftForm = ({data, handleChange, index, handleDeleteArray}) => {
} */} } */}
{data.groupNm? {data.groupNm?
( (
<Col className='arcrft-del-btn' xs={12} md={2} xl={2} > <Col className='search-info-box-del-btn' lg={1} md={6} sm={12}>
<Button.Ripple <Button.Ripple
color='danger' color='danger'
className='text-nowrap px-1' className='btn-icon'
onClick={() => onClick={() =>
handleDeleteArray({ type: 'arcrft', index }) handleDeleteArray({ type: 'arcrft', index })
} }
outline {...(isFlightDone)? {disabled:true} : {} }
> >
<X size={14} className='mr-50' /> <X size={14} />
<span>삭제</span>
</Button.Ripple> </Button.Ripple>
</Col> </Col>
) )

Write Preview
Loading…
Cancel
Save