Browse Source

비행 시물레이션 리스트 indexOf 제거

feature/auth
김장현 2 years ago
parent
commit
40e229e76c
  1. 106
      src/components/analysis/simulation/AnalysimuationInfo.js
  2. 18
      src/containers/analysis/simulator/AnalysisSimulationContainer.js

106
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 (
<div className='layer-content drone-list'>
{props.count === 0 ? (
<div className='no-dataTable'>표시할 데이터가 없습니다.</div>
) : (
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 (
<div
className='layer-content-list'
onClick={() => props.handlerDetail(item.cntrlId)}
key={Math.random()}
>
<dl>
<dt>
<div className='list-left-txt'>식별번호</div>
<div className='list-right-txt'>{item.idntfNum}</div>
</dt>
<dt>
<div className='list-left-txt'>일자</div>
<div className='list-right-txt'>
{moment(item.cntrlStDt).format('YYYY년MM월DD일')}
</div>
</dt>
<dt>
<div className='list-left-txt'>시작 위치</div>
<div className='list-right-txt'>{item.stArea}</div>
</dt>
<dt>
<div className='list-left-txt'>시작/종료 시간</div>
<div className='list-right-txt'>
{moment(item.cntrlStDt).format('HH:mm')}
{' '}/{' '}
{moment(item.cntrlEndDt).format('HH:mm')}
</div>
</dt>
{/* <dt>
{props.count === 0 ? (
<div className='no-dataTable'>표시할 데이터가 없습니다.</div>
) : (
props.data?.map(item => {
// console.log(
// item.idntfNum,
// ':::',
// item.idntfNum.indexOf(props.filterId)
// );
// console.log(item.idntfNum.indexOf(props.filterId));
if (item.idntfNum) {
return (
<div
className='layer-content-list'
onClick={() => props.handlerDetail(item.cntrlId)}
key={Math.random()}
>
<dl>
<dt>
<div className='list-left-txt'>식별번호</div>
<div className='list-right-txt'>{item.idntfNum}</div>
</dt>
<dt>
<div className='list-left-txt'>일자</div>
<div className='list-right-txt'>
{moment(item.cntrlStDt).format('YYYY년MM월DD일')}
</div>
</dt>
<dt>
<div className='list-left-txt'>시작 위치</div>
<div className='list-right-txt'>{item.stArea}</div>
</dt>
<dt>
<div className='list-left-txt'>시작/종료 시간</div>
<div className='list-right-txt'>
{moment(item.cntrlStDt).format('HH:mm')}
{' '}/{' '}
{moment(item.cntrlEndDt).format('HH:mm')}
</div>
</dt>
{/* <dt>
<div className='list-left-txt'> 비행거리/시간</div>
<div className='list-right-txt'>ddd</div>
</dt> */}
</dl>
</div>
);
}
})
)}
</dl>
</div>
);
}
})
)}
</div>
)
}
);
};

18
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 => {
<AnalysisSimulationMenu
setOpenReportList={setOpenReportList}
handlerLogout={handlerLogout} />
handlerLogout={handlerLogout}
/>
{oepnReportList ? (
<div className='left-layer'>
<div className='left-layer'>
<AnalysisSimulationReport
params={params}
handlerInput={handlerInput}

Loading…
Cancel
Save