diff --git a/src/components/laanc/LaancModal.js b/src/components/laanc/LaancModal.js
index 07b8b05..93e045a 100644
--- a/src/components/laanc/LaancModal.js
+++ b/src/components/laanc/LaancModal.js
@@ -2,7 +2,7 @@ import { Button, Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap';
export const LaancModal = props => {
const handleButtonClick = () => {
- window.open('https://drone.onestop.go.kr/', 'Ex');
+ window.open(props.modal.url);
};
return (
diff --git a/src/components/laanc/LaancSearch.js b/src/components/laanc/LaancSearch.js
index a219495..6aad545 100644
--- a/src/components/laanc/LaancSearch.js
+++ b/src/components/laanc/LaancSearch.js
@@ -1,15 +1,23 @@
-import { useState } from 'react';
+import { useState, useEffect } from 'react';
+import { useDispatch, Selector, useSelector } from 'react-redux';
import { Row, Col, Button, Card, CardBody } from 'reactstrap';
import { Search, Calendar } from 'react-feather';
import Flatpickr from 'react-flatpickr';
import moment from 'moment';
+import * as LaancAction from '../../modules/laanc/actions/laancActions';
function LaancSearch() {
+ const dispatch = useDispatch();
+
const [date, setDate] = useState({
stDate: moment().subtract(0, 'day').format('YYYY-MM-DD'),
endDate: moment().subtract(-14, 'day').format('YYYY-MM-DD')
});
+ useEffect(() => {
+ dispatch(LaancAction.LAANC_APRV_LIST.request({ ...date, page: 1 }));
+ }, []);
+
const handlerChangeDate = selectedDates => {
if (selectedDates.length === 2) {
const stDate = moment(selectedDates[0]).format('YYYY-MM-DD');
@@ -18,6 +26,10 @@ function LaancSearch() {
}
};
+ const handlerClick = () => {
+ dispatch(LaancAction.LAANC_APRV_LIST.request({ ...date, page: 1 }));
+ };
+
return (
@@ -27,7 +39,13 @@ function LaancSearch() {
검색조건
- {}}>
+ {
+ handlerClick();
+ }}
+ >
검색
diff --git a/src/containers/laanc/LaancContainer.js b/src/containers/laanc/LaancContainer.js
index ac98f09..12c3d01 100644
--- a/src/containers/laanc/LaancContainer.js
+++ b/src/containers/laanc/LaancContainer.js
@@ -46,7 +46,9 @@ export default function LaancContainer() {
state => state.groupState
);
const { user } = useSelector(state => state.authState, shallowEqual);
+ const { laancSearchData } = useSelector(state => state.laancState);
+ console.log('??', laancSearchData);
//비행계획서 신청 버튼 활성/비활성 제어
const [isMyGroup, setIsMyGroup] = useState();
diff --git a/src/modules/laanc/models/laancModels.ts b/src/modules/laanc/models/laancModels.ts
index 9290074..6db6cde 100644
--- a/src/modules/laanc/models/laancModels.ts
+++ b/src/modules/laanc/models/laancModels.ts
@@ -5,7 +5,7 @@ export interface laancState {
laancApply: LaancApproval | undefined;
laancPdf: LaancPdf | undefined;
laancSun: LaancSunData[] | undefined;
- laancSearch: LaancAprvData[] | undefined;
+ laancSearchData: LaancAprvData[] | undefined;
}
// laanc계획서 초기값
@@ -363,7 +363,7 @@ export const laancControlData = {
laancPdf: undefined,
laancApply: undefined,
laancSun: undefined,
- laancSearch: undefined,
+ laancSearchData: undefined,
detail: {
planSno: 0,
groupId: '',
@@ -623,22 +623,26 @@ export interface LaancAprvRq {
// laanc 승인 요청 rs
export interface LaancAprvData {
- planSno: number;
- groupId: string;
- cstmrSno: number;
- memberName: string;
- email: string;
- hpno: string;
- clncd: string;
- schFltStDt: string;
- schFltEndDt: string;
- fltPurpose: string;
- aprvlYn: string;
- createUserId: string;
- createDt: string;
- updateUserId: string;
- updateDt: string;
- serviceType: string;
+ content: [
+ {
+ planSno: number;
+ groupId: string;
+ cstmrSno: number;
+ memberName: string;
+ email: string;
+ hpno: string;
+ clncd: string;
+ schFltStDt: string;
+ schFltEndDt: string;
+ fltPurpose: string;
+ aprvlYn: string;
+ createUserId: string;
+ createDt: string;
+ updateUserId: string;
+ updateDt: string;
+ serviceType: string;
+ }
+ ];
areaList: [
{
planAreaSno: number;
@@ -654,4 +658,6 @@ export interface LaancAprvData {
docState: string;
}
];
+ totalElements: number;
+ totalPages: number;
}
diff --git a/src/modules/laanc/reducers/laancReducers.ts b/src/modules/laanc/reducers/laancReducers.ts
index 454ecca..f374402 100644
--- a/src/modules/laanc/reducers/laancReducers.ts
+++ b/src/modules/laanc/reducers/laancReducers.ts
@@ -42,7 +42,7 @@ export const laancReducer = createReducer(
.handleAction(Actions.LAANC_APRV_LIST.success, (state, action) =>
produce(state, draft => {
const data = action.payload;
- draft.laancSearch = data;
+ draft.laancSearchData = data;
})
);
diff --git a/src/views/laanc/LaancStep1.js b/src/views/laanc/LaancStep1.js
index 53c49d0..64cea14 100644
--- a/src/views/laanc/LaancStep1.js
+++ b/src/views/laanc/LaancStep1.js
@@ -72,7 +72,8 @@ export default function LaancStep1({
isOpen: false,
title: '',
desc: '',
- type: ''
+ type: '',
+ url: ''
});
console.log('>>', laancSun);
@@ -203,7 +204,8 @@ export default function LaancStep1({
아래 링크를 통해 담당자와 협의 부탁드립니다.
>
),
- type: '처리부서안내 바로가기'
+ type: '처리부서안내 바로가기',
+ url: 'https://drone.onestop.go.kr/introduce/systemintro3 '
});
}
}
@@ -376,7 +378,8 @@ export default function LaancStep1({
드론원스톱을 통해서 신청해 주시기 바랍니다.
>
),
- type: '드론원스톱 바로가기'
+ type: '드론원스톱 바로가기',
+ url: 'https://drone.onestop.go.kr/'
});
handleChange({
name: 'schFltStDt',
@@ -462,7 +465,8 @@ export default function LaancStep1({
드론원스톱을 통해서 신청해 주시기 바랍니다.
>
),
- type: 'date'
+ type: 'date',
+ url: 'https://drone.onestop.go.kr/'
});
handleChange({
name: 'schFltEndDt',