Merge branch 'master' of http://gitea.palntour.com/pav/pav-home

src/components/analysis/simulation/AnalysimuationInfo.js

@@ -1,12 +1,8 @@
 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>
@@ -18,7 +14,8 @@ export const AnalysimuationInfo = props => {
           //   item.idntfNum.indexOf(props.filterId)
           // );
           // console.log(item.idntfNum.indexOf(props.filterId));
-                if (item.idntfNum && item.idntfNum.indexOf(props.searchText) != -1) {
+
+          if (item.idntfNum) {
             return (
               <div
                 className='layer-content-list'
@@ -59,6 +56,5 @@ export const AnalysimuationInfo = props => {
         })
       )}
     </div>
-    )
-}
-
+  );
+};

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,7 +179,8 @@ export const AnalysisSimulationContainer = props => {
 
       <AnalysisSimulationMenu
         setOpenReportList={setOpenReportList}
-        handlerLogout={handlerLogout} />
+        handlerLogout={handlerLogout}
+      />
 
       {oepnReportList ? (
         <div className='left-layer'>