비행이력현황(최종본)

src/components/analysis/history/AnalysisHistorySearch.js

@@ -15,18 +15,21 @@ import {
 export const AnalysisHistorySearch = props => {
   const [isClick, setIsClick] = useState(1);
   const [dateType, setDateType] = useState(1);
-
   useEffect(() => {
     props.setParams({
       ...props.params,
       stDate: moment().subtract(dateType, 'day').format('YYYY-MM-DD')
     });
-  }, [dateType]);
+  
+  }, [dateType,props.params.groupId]);
 
   const handlerClickDate = val => {
     setDateType(val);
     setIsClick(val);
   };
+
+
+
   return (
     <div className='pal-card-box'>
       <Row>

src/containers/analysis/history/AnalysisHistoryContainer.js

@@ -12,7 +12,7 @@ import { Col, Row, Button } from 'reactstrap';
 import * as FlightAction from '../../../modules/basis/flight/actions/basisFlightAction';
 import FlightPlanAprvSearch from '../../../components/basis/flight/aprv/FlightPlanAprvSearch';
 import FlightPlanAprvGrid from '../../../components/basis/flight/aprv/FlightPlanAprvGrid';
-import {useHistory} from 'react-router-dom';
+import { useHistory } from 'react-router-dom';
 
 
 export const AnalysisHistoryContainer = props => {
@@ -31,7 +31,7 @@ export const AnalysisHistoryContainer = props => {
   const history = useHistory();
   const [searchData, setSearchData] = useState(initSearchData);
   const [selPlanSnoList, setSelPlanSnoList] = useState([]);
-  const {list: aprvList, aprvProc, selectGroup} = useSelector(state => state.flightState);
+  const { list: aprvList, aprvProc, selectGroup } = useSelector(state => state.flightState);
   const { joinList, joinListCount } = useSelector(state => state.groupState);
   const { user } = useSelector(state => state.authState, shallowEqual);
 
@@ -41,7 +41,7 @@ export const AnalysisHistoryContainer = props => {
     // param.cstmrSno = user.cstmrSno;
     param.groupId = groupId;
 
-    dispatch(FlightAction.FLIGHT_PLAN_GROUP_SELECT({groupId: groupId }));
+    dispatch(FlightAction.FLIGHT_PLAN_GROUP_SELECT({ groupId: groupId }));
 
     // groupId sessionStorage에 보관 (1 브라우저 1 tab에만 유효)
     sessionStorage.setItem('groupId', groupId);
@@ -54,7 +54,7 @@ export const AnalysisHistoryContainer = props => {
         groupId: groupId
       }
     });
-    dispatch(Actions.list.request({searchParams:param}));
+    dispatch(Actions.list.request({ searchParams: param }));
   }
   const handlerGroupCancel = () => {
     dispatch(FlightAction.FLIGHT_PLAN_GROUP_SELECT({ cstmrSno: 0, groupId: '', groupNm: '' }));
@@ -74,7 +74,7 @@ export const AnalysisHistoryContainer = props => {
     if (aprvProc && aprvProc.result > 0) {
       handleSearch(searchData);
     }
-}, [aprvProc])
+  }, [aprvProc])
 
   useEffect(() => {
     if (user?.cstmrSno) {
@@ -91,12 +91,7 @@ export const AnalysisHistoryContainer = props => {
 
   const titleName = '비행이력 현황';
 
-  const [params, setParams] = useState({
+
-    stDate: moment().subtract(1, 'day').format('YYYY-MM-DD'),
-    endDate: moment().subtract(-1, 'day').format('YYYY-MM-DD'),
-    search1: '',
-    groupId: searchData.groupId
-  });
 
   const excelHeaders = [
     { label: '일자', key: 'cntrlStDt' },
@@ -205,8 +200,14 @@ export const AnalysisHistoryContainer = props => {
     }
   ];
 
+  const [params, setParams] = useState({
+    stDate: moment().subtract(1, 'day').format('YYYY-MM-DD'),
+    endDate: moment().subtract(-1, 'day').format('YYYY-MM-DD'),
+    search1: '',
+    groupId: searchData.groupId
+  });
+
   useEffect(() => {
-    if (data) return;
 
     if (searchParams) {
       setParams({
@@ -219,6 +220,10 @@ export const AnalysisHistoryContainer = props => {
     //   handlerSearch();
   }, [searchData]);
 
+  useEffect(() => {
+    if (data) return;
+  }, [searchParams]);
+
   const onKeyPress = e => {
     if (e.key == 'Enter') {
       handlerSearch();
@@ -233,7 +238,7 @@ export const AnalysisHistoryContainer = props => {
 
   const handlerInput = (type, val) => {
     if (type === 'search1') {
-      setParams({ ...params, search1: val});
+      setParams({ ...params, search1: val });
     }
     if (type === 'searchDate') {
       if (val.length == 2) {