diff --git a/src/components/analysis/simulation/AnalysimuationInfo.js b/src/components/analysis/simulation/AnalysimuationInfo.js
new file mode 100644
index 0000000..441aca0
--- /dev/null
+++ b/src/components/analysis/simulation/AnalysimuationInfo.js
@@ -0,0 +1,64 @@
+import moment from 'moment';
+import { useEffect } from 'react';
+
+
+export const AnalysimuationInfo = props => {
+ useEffect(()=>{
+ //console.log(props.data);
+ },[props.data])
+ 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')}
+
+
+ {/* -
+
총 비행거리/시간
+ ddd
+ */}
+
+
+ );
+ }
+ })
+ )}
+
+ )
+}
+
diff --git a/src/components/analysis/simulation/AnalysisSimulationReport.js b/src/components/analysis/simulation/AnalysisSimulationReport.js
index 0c261f3..d1b29c7 100644
--- a/src/components/analysis/simulation/AnalysisSimulationReport.js
+++ b/src/components/analysis/simulation/AnalysisSimulationReport.js
@@ -1,13 +1,17 @@
import moment from 'moment';
-import React from 'react';
+import { useState } from 'react';
import { Calendar, X } from 'react-feather';
import Flatpickr from 'react-flatpickr';
import { Button, Input, InputGroup } from 'reactstrap';
export const AnalysisSimulationReport = props => {
// console.log(props.params);
+ const [filterId, setFilterId] = useState('');
+
+
+
return (
-
+
비행 Simulation
@@ -26,6 +30,7 @@ export const AnalysisSimulationReport = props => {
-
- {props.count === 0 ? (
-
표시할 데이터가 없습니다.
- ) : (
- props.data?.map(item => {
- // console.log(item);
- // console.log(
- // item.idntfNum,
- // ':::',
- // item.idntfNum.indexOf(props.filterId)
- // );
- // console.log(item.idntfNum.indexOf(props.filterId));
- if (item.idntfNum && item.idntfNum.indexOf(props.filterId) != -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')}
-
-
- {/* -
-
총 비행거리/시간
- ddd
- */}
-
-
- );
- }
- })
- )}
-
-
+
);
};
diff --git a/src/containers/analysis/simulator/AnalysisSimulationContainer.js b/src/containers/analysis/simulator/AnalysisSimulationContainer.js
index e869d6e..5a62585 100644
--- a/src/containers/analysis/simulator/AnalysisSimulationContainer.js
+++ b/src/containers/analysis/simulator/AnalysisSimulationContainer.js
@@ -4,12 +4,12 @@ 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 { NMap } from '../../../components/map/nhn/NMap';
import { NMapMarker } from '../../../components/map/nhn/NMapMarker';
import { NMapPolyline } from '../../../components/map/nhn/NMapPolyline';
import * as Actions from '../../../modules/analysis/simulation/actions/analysisSimulatorAction';
import * as Action from '../../../modules/account/login/actions/authAction';
-
export const AnalysisSimulationContainer = props => {
const { list, count, detail, searchParams, log, stcsList, stcsCount } =
useSelector(state => state.analysisSimulatorState);
@@ -32,6 +32,8 @@ export const AnalysisSimulationContainer = props => {
const [sliderCount, setSliderCount] = useState(0);
+ const [searchText, setSearchText] = useState('');
+
let playCount = 0;
const [sliderVal, setSliderVal] = useState({
@@ -41,7 +43,6 @@ export const AnalysisSimulationContainer = props => {
const dispatch = useDispatch();
- const [filterId, setFilterId] = useState('');
const [params, setParams] = useState({
stDate: moment().subtract(1, 'day').format('YYYY-MM-DD'),
@@ -80,11 +81,11 @@ export const AnalysisSimulationContainer = props => {
setParams({
stDate: searchParams.stDate,
endDate: searchParams.endDate,
- search1: searchParams.search1
+ search1: filterId
});
}
- handlerSearch();
+//handlerSearch();
}
}, [oepnReportList]);
@@ -96,7 +97,7 @@ export const AnalysisSimulationContainer = props => {
setTimeCd(moment(log[playCount]?.srvrRcvDt).format('HH:mm'));
}
- // console.log('sliderCount>>>>', sliderCount);
+ // console.log('sliderCount>>>>', sliderCount);
}
}, [sliderCount]);
@@ -123,8 +124,10 @@ export const AnalysisSimulationContainer = props => {
// console.log('minDate :::', minDate, 'maxDate :: ', maxDate);
}, [log]);
- const handlerSearch = () => {
- dispatch(Actions.list.request({ searchParams: params }));
+ const handlerSearch = (search1) => {
+ setSearchText(search1)
+
+ dispatch(Actions.list.request({ searchParams: {...params, search1} }));
};
const handlerDetailSearch = id => {
@@ -175,22 +178,25 @@ export const AnalysisSimulationContainer = props => {
-