diff --git a/src/components/analysis/simulation/AnalysimuationInfo.js b/src/components/analysis/simulation/AnalysimuationInfo.js index 441aca0..a3f928e 100644 --- a/src/components/analysis/simulation/AnalysimuationInfo.js +++ b/src/components/analysis/simulation/AnalysimuationInfo.js @@ -1,64 +1,60 @@ import moment from 'moment'; import { useEffect } from 'react'; - export const AnalysimuationInfo = props => { - useEffect(()=>{ - //console.log(props.data); - },[props.data]) - return( + return (
- {props.count === 0 ? ( -
표시할 데이터가 없습니다.
- ) : ( - props.data?.map(item => { - // console.log( - // item.idntfNum, - // ':::', - // item.idntfNum.indexOf(props.filterId) - // ); - // console.log(item.idntfNum.indexOf(props.filterId)); - if (item.idntfNum && item.idntfNum.indexOf(props.searchText) != -1) { - return ( -
props.handlerDetail(item.cntrlId)} - key={Math.random()} - > -
-
-
식별번호
-
{item.idntfNum}
-
-
-
일자
-
- {moment(item.cntrlStDt).format('YYYY년MM월DD일')} -
-
-
-
시작 위치
-
{item.stArea}
-
-
-
시작/종료 시간
-
- {moment(item.cntrlStDt).format('HH:mm')} - {' '}/{' '} - {moment(item.cntrlEndDt).format('HH:mm')} -
-
- {/*
+ {props.count === 0 ? ( +
표시할 데이터가 없습니다.
+ ) : ( + props.data?.map(item => { + // console.log( + // item.idntfNum, + // ':::', + // item.idntfNum.indexOf(props.filterId) + // ); + // console.log(item.idntfNum.indexOf(props.filterId)); + + if (item.idntfNum) { + return ( +
props.handlerDetail(item.cntrlId)} + key={Math.random()} + > +
+
+
식별번호
+
{item.idntfNum}
+
+
+
일자
+
+ {moment(item.cntrlStDt).format('YYYY년MM월DD일')} +
+
+
+
시작 위치
+
{item.stArea}
+
+
+
시작/종료 시간
+
+ {moment(item.cntrlStDt).format('HH:mm')} + {' '}/{' '} + {moment(item.cntrlEndDt).format('HH:mm')} +
+
+ {/*
총 비행거리/시간
ddd
*/} -
-
- ); - } - }) - )} +
+
+ ); + } + }) + )}
- ) -} - + ); +}; diff --git a/src/containers/analysis/simulator/AnalysisSimulationContainer.js b/src/containers/analysis/simulator/AnalysisSimulationContainer.js index 5a62585..e4e629c 100644 --- a/src/containers/analysis/simulator/AnalysisSimulationContainer.js +++ b/src/containers/analysis/simulator/AnalysisSimulationContainer.js @@ -4,7 +4,7 @@ import { useDispatch, useSelector } from 'react-redux'; import { AnalysisSimulationDetail } from '../../../components/analysis/simulation/AnalysisSimulationDetail'; import { AnalysisSimulationMenu } from '../../../components/analysis/simulation/AnalysisSimulationMenu'; import { AnalysisSimulationReport } from '../../../components/analysis/simulation/AnalysisSimulationReport'; -import { AnalysimuationInfo } from '../../../components/analysis/simulation/AnalysimuationInfo' +import { AnalysimuationInfo } from '../../../components/analysis/simulation/AnalysimuationInfo'; import { NMap } from '../../../components/map/nhn/NMap'; import { NMapMarker } from '../../../components/map/nhn/NMapMarker'; import { NMapPolyline } from '../../../components/map/nhn/NMapPolyline'; @@ -43,7 +43,6 @@ export const AnalysisSimulationContainer = props => { const dispatch = useDispatch(); - const [params, setParams] = useState({ stDate: moment().subtract(1, 'day').format('YYYY-MM-DD'), endDate: moment().subtract(-1, 'day').format('YYYY-MM-DD'), @@ -81,11 +80,11 @@ export const AnalysisSimulationContainer = props => { setParams({ stDate: searchParams.stDate, endDate: searchParams.endDate, - search1: filterId + search1: searchText }); } -//handlerSearch(); + //handlerSearch(); } }, [oepnReportList]); @@ -124,10 +123,10 @@ export const AnalysisSimulationContainer = props => { // console.log('minDate :::', minDate, 'maxDate :: ', maxDate); }, [log]); - const handlerSearch = (search1) => { - setSearchText(search1) + const handlerSearch = search1 => { + setSearchText(search1); - dispatch(Actions.list.request({ searchParams: {...params, search1} })); + dispatch(Actions.list.request({ searchParams: { ...params, search1 } })); }; const handlerDetailSearch = id => { @@ -180,10 +179,11 @@ export const AnalysisSimulationContainer = props => { + handlerLogout={handlerLogout} + /> {oepnReportList ? ( -
+