diff --git a/src/components/laanc/step/LaancStep1.js b/src/components/laanc/step/LaancStep1.js index e9b5a84..cab05c2 100644 --- a/src/components/laanc/step/LaancStep1.js +++ b/src/components/laanc/step/LaancStep1.js @@ -233,10 +233,17 @@ export default function LaancStep1({ name: 'fltMethod', value: '' }); - setIsErrorModal({ + setIsLaancModal({ isOpen: true, - title: '비행 구역 설정', - desc: '비행 구역 설정을 먼저 설정 해 주세요' + title: '군집 비행 목적', + desc: ( + <> + 군집 비행의 경우 담당자와 협의가 필요합니다.
+ 아래 링크를 통해 담당자와 협의 부탁드립니다. + + ), + type: '처리부서안내 바로가기', + url: 'https://drone.onestop.go.kr/introduce/systemintro3 ' }); } } @@ -375,7 +382,7 @@ export default function LaancStep1({ defaultValue={data.schFltStDt} value={data.schFltStDt} ref={schFltStDtRef} - onFocus={handleOpenFlatpickr} + onFocus={() => handleOpenFlatpickr()} options={{ minDate: moment().format('YYYY-MM-DD'), maxDate: moment().add(90, 'day').format('YYYY-MM-DD') @@ -397,10 +404,12 @@ export default function LaancStep1({ moment(value, 'YYYYMMDD') ); }); + const schFltStDt = moment(value).format('HHmmss'); + filteredData.forEach(data => { if ( - data.civile === moment(value).format('HHmmss') || - data.civilm === moment(value).format('HHmmss') + schFltStDt <= data.civilm || + schFltStDt >= data.civile ) { setIsLaancModal({ isOpen: true, @@ -418,8 +427,17 @@ export default function LaancStep1({ }); handleChange({ name: 'schFltStDt', - value: '' + value: + schFltStDt <= data.civilm || + schFltStDt >= data.civile + ? moment(data.civilm, 'HHmmss') + .add(5, 'minute') + .format('YYYY-MM-DD HH:mm:ss') + : moment() + .add(5, 'minute') + .format('YYYY-MM-DD HH:mm:ss') }); + closeFlatpickr(); } }); } @@ -484,10 +502,12 @@ export default function LaancStep1({ moment(value, 'YYYYMMDD') ); }); + const schFltEndDt = moment(value).format('HHmmss'); + filteredData.forEach(data => { if ( - data.civile === moment(value).format('HHmmss') || - data.civilm === moment(value).format('HHmmss') + schFltEndDt <= data.civilm || + schFltEndDt >= data.civile ) { setIsLaancModal({ isOpen: true, @@ -500,13 +520,22 @@ export default function LaancStep1({ 드론원스톱을 통해서 신청해 주시기 바랍니다. ), - type: 'date', + type: '드론원스톱 바로가기', url: 'https://drone.onestop.go.kr/' }); handleChange({ name: 'schFltEndDt', - value: '' + value: + schFltEndDt <= data.civilm || + schFltEndDt >= data.civile + ? moment(data.civile, 'HHmmss') + .add(5, 'minute') + .format('YYYY-MM-DD HH:mm:ss') + : moment() + .add(5, 'minute') + .format('YYYY-MM-DD HH:mm:ss') }); + closeFlatpickr(); } }); } diff --git a/src/modules/laanc/models/laancModels.ts b/src/modules/laanc/models/laancModels.ts index ee4c8ff..ce954ff 100644 --- a/src/modules/laanc/models/laancModels.ts +++ b/src/modules/laanc/models/laancModels.ts @@ -27,8 +27,8 @@ export const LaancFlightData = { addr: '', addrDtlCn: '', zip: '', - schFltStDt: moment().format('YYYY-MM-DD HH:mm:ss'), - schFltEndDt: moment().format('YYYY-MM-DD HH:mm:ss'), + schFltStDt: moment().add(5, 'minute').format('YYYY-MM-DD HH:mm:ss'), + schFltEndDt: moment().add(2, 'hours').format('YYYY-MM-DD HH:mm:ss'), fltPurpose: '', aprvlYn: '', delYn: '', @@ -120,8 +120,8 @@ export const LaancFlightData = { addr: '', addrDtlCn: '', zip: '', - schFltStDt: moment().format('YYYY-MM-DD HH:mm:ss'), - schFltEndDt: moment().format('YYYY-MM-DD HH:mm:ss'), + schFltStDt: moment().add(5, 'minute').format('YYYY-MM-DD HH:mm:ss'), + schFltEndDt: moment().add(2, 'hours').format('YYYY-MM-DD HH:mm:ss'), fltPurpose: '', aprvlYn: '', delYn: '', @@ -468,8 +468,8 @@ export const initFlightBas = { addr: '', addrDtlCn: '', zip: '', - schFltStDt: moment().format('YYYY-MM-DD HH:mm:ss'), - schFltEndDt: moment().format('YYYY-MM-DD HH:mm:ss'), + schFltStDt: moment().add(5, 'minute').format('YYYY-MM-DD HH:mm:ss'), + schFltEndDt: moment().add(2, 'hours').format('YYYY-MM-DD HH:mm:ss'), fltPurpose: '', aprvlYn: '', delYn: '',