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

src/components/analysis/simulation/AnalysisSimulationDetail.js

@@ -210,7 +210,8 @@ export const AnalysisSimulationDetail = props => {
                 </div> */}
                 {props.stcsList?.map(item => {
                   return (
-                    <div key={item.timeCd}
+                    <div
+                      key={item.timeCd}
                       className={
                         props.timeCd === item.timeCd
                           ? 'simulation-date-num date-num-focus'

src/components/analysis/simulation/AnalysisSimulatorSlider.js

@@ -39,12 +39,12 @@ const AnalysisSimulatorSlider = ({
     direction
   };
 
-  useEffect(() => {
-  }, [playCount]);
+  useEffect(() => {}, [playCount]);
   return (
     <div className='simulation-slider'>
       {/* <h5 className='my-2'>Default / Primary Color Slider</h5> */}
       {/* <Nouislider className='mt-md-1 mt-3 mb-4' {...colorOptions} behaviour={'tap'}/> */}
+
       <Nouislider
         className='mt-md-1 mt-3 mb-1'
         {...colorOptions}

src/components/basis/flight/aprv/FlightPlanAprvGrid.js

@@ -1,8 +1,9 @@
 import React, { useEffect, useState } from 'react';
-import { Button, Card, Col, Row, CustomInput } from 'reactstrap';
+import { Button, Card, Col, Row, Spinner } from 'reactstrap';
 import { GridDatabase } from '../../../crud/grid/GridDatatable';
 import { Link } from 'react-router-dom';
 import { selectableRowsComponent } from '../../../crud/grid/selectableRowsComponent';
+import { useSelector } from 'react-redux';
 
 const FlightPlanAprvGrid = ({
   data,
@@ -17,6 +18,7 @@ const FlightPlanAprvGrid = ({
   paginationRowsPerPageOptions
 }) => {
   const [aprvAuth, setAprvAuth] = useState('');
+  const { loading } = useSelector(state => state.loadingReducer);
 
   useEffect(() => {
     joinList.forEach(c => {
@@ -126,6 +128,14 @@ const FlightPlanAprvGrid = ({
           <div className='invoice-list-wrapper'>
             <Card>
               <div className='invoice-list-dataTable'>
+                {loading ? (
+                  <div className='grid-loading'>
+                    <div>
+                      <Spinner color='primary' />
+                      <span>Loading...</span>
+                    </div>
+                  </div>
+                ) : null}
                 <GridDatabase
                   title={'비행이력'}
                   data={data}

src/components/basis/flight/plan/FlightPlanGrid.js

@@ -1,10 +1,12 @@
 import React from 'react';
-import { Button, Card, Col, Row } from 'reactstrap';
+import { Button, Card, Col, Row, Spinner } from 'reactstrap';
 import { GridDatabase } from '../../../crud/grid/GridDatatable';
 import { Redirect } from 'react-router-dom';
 import { Link, useHistory } from 'react-router-dom';
+import { useSelector } from 'react-redux';
 
 const FlightPlanGrid = ({ movePage, planListData, pagination, paginationPerPage, paginationRowsPerPageOptions }) => {
+  const { loading } = useSelector(state => state.loadingReducer);
   const columns = [
     { id: 'planSno', name: '번호', cell: (row, i) => <div>{i + 1}</div> },
     {
@@ -64,6 +66,14 @@ const FlightPlanGrid = ({ movePage, planListData, pagination, paginationPerPage,
           <div className='invoice-list-wrapper'>
             <Card>
               <div className='invoice-list-dataTable'>
+                {loading ? (
+                  <div className='grid-loading'>
+                    <div>
+                      <Spinner color='primary' />
+                      <span>Loading...</span>
+                    </div>
+                  </div>
+                ) : null}
                 <GridDatabase
                   title={'비행이력'}
                   data={planListData}

src/containers/analysis/simulator/AnalysisSimulationContainer.js

@@ -10,6 +10,9 @@ 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';
+
+let playCount = 0;
+
 export const AnalysisSimulationContainer = props => {
   const { list, count, detail, searchParams, log, stcsList, stcsCount } =
     useSelector(state => state.analysisSimulatorState);
@@ -34,8 +37,6 @@ export const AnalysisSimulationContainer = props => {
 
   const [searchText, setSearchText] = useState('');
 
-  let playCount = 0;
-
   const [sliderVal, setSliderVal] = useState({
     maxVal: 0,
     minVal: 0
@@ -59,7 +60,6 @@ export const AnalysisSimulationContainer = props => {
         }
 
         playCount++;
-
         if (playCount == log.length) {
           playCount = 0;
           clearInterval(timer);
@@ -76,7 +76,7 @@ export const AnalysisSimulationContainer = props => {
       setInfo({ ...log[playCount], playCount: playCount });
       setIsPlay(false);
     }
-  }, [stcsList])
+  }, [stcsList]);
 
   useEffect(() => {
     if (oepnReportList) {
@@ -100,6 +100,11 @@ export const AnalysisSimulationContainer = props => {
   }, [sliderCount]);
 
   useEffect(() => {
+    playCount = 0;
+    if (log) {
+      setInfo({ ...log[playCount], playCount: 0 });
+    }
+
     // let arrDate = log?.map(date => {
     //   const dateval = date.srvrRcvDt;
     //   if (dateval) {

src/containers/basis/flight/plan/FlightPlanContainer.js

@@ -173,6 +173,7 @@ const FlightPlanContainer = () => {
                   pagination={true}
                   paginationPerPage={10}
                   paginationRowsPerPageOptions={[10, 20, 30, 40]}
+                // handlerPageChange={handlerPageChange}
                 // columns={columns}
                 />
               </>