diff --git a/src/components/analysis/simulation/AnalysisSimulationReport.js b/src/components/analysis/simulation/AnalysisSimulationReport.js
index 6d118eba..feb855a0 100644
--- a/src/components/analysis/simulation/AnalysisSimulationReport.js
+++ b/src/components/analysis/simulation/AnalysisSimulationReport.js
@@ -1,4 +1,3 @@
-import moment from 'moment';
import { useState } from 'react';
import { Calendar, X } from 'react-feather';
import Flatpickr from 'react-flatpickr';
diff --git a/src/components/basis/dron/BasisDronSearch.js b/src/components/basis/dron/BasisDronSearch.js
index 21c2a949..7dc9cdbd 100644
--- a/src/components/basis/dron/BasisDronSearch.js
+++ b/src/components/basis/dron/BasisDronSearch.js
@@ -1,28 +1,4 @@
-import {
- Row,
- Col,
- Table,
- Badge,
- UncontrolledDropdown,
- DropdownMenu,
- DropdownItem,
- DropdownToggle,
- Card,
- CardHeader,
- CardBody,
- CardTitle,
- CardSubtitle,
- ButtonGroup,
- Button,
- Input,
- CustomInput,
- FormGroup
-} from 'reactstrap';
-import Flatpickr from 'react-flatpickr';
-import { MoreVertical, Edit, Trash, Search, File } from 'react-feather';
-import { Calendar } from 'react-feather';
-import { useEffect, useState } from 'react';
-import moment from 'moment';
+import { Row, Col, Card, CardBody, Button, Input } from 'reactstrap';
export const BasisDronSearch = props => {
return (
diff --git a/src/components/basis/dron/BasisIdntform.js b/src/components/basis/dron/BasisIdntform.js
index 2cbbb1b9..5275ec1b 100644
--- a/src/components/basis/dron/BasisIdntform.js
+++ b/src/components/basis/dron/BasisIdntform.js
@@ -1,5 +1,4 @@
-import React, { useEffect, useState } from 'react';
-import moment from 'moment';
+import dayjs from 'dayjs';
import {
Row,
@@ -111,9 +110,9 @@ export const BasisIdntfForm = props => {
diff --git a/src/components/basis/group/BasisGroupDetailJoinSearch.js b/src/components/basis/group/BasisGroupDetailJoinSearch.js
index 2aff40a5..3fb96ce0 100644
--- a/src/components/basis/group/BasisGroupDetailJoinSearch.js
+++ b/src/components/basis/group/BasisGroupDetailJoinSearch.js
@@ -1,29 +1,14 @@
import {
Row,
Col,
- Table,
- Badge,
- UncontrolledDropdown,
- DropdownMenu,
- DropdownItem,
- DropdownToggle,
Card,
- CardHeader,
CardBody,
- CardTitle,
- CardSubtitle,
- ButtonGroup,
Button,
Input,
- CustomInput,
Label,
FormGroup
} from 'reactstrap';
-import Flatpickr from 'react-flatpickr';
-import { MoreVertical, Edit, Trash, Search, File } from 'react-feather';
-import { Calendar } from 'react-feather';
-import { useEffect, useState } from 'react';
-import moment from 'moment';
+import { Search } from 'react-feather';
export const BasisGroupDetailJoinSearch = props => {
return (
diff --git a/src/components/basis/group/BasisGroupSearch.js b/src/components/basis/group/BasisGroupSearch.js
index 2037d16c..1457c211 100644
--- a/src/components/basis/group/BasisGroupSearch.js
+++ b/src/components/basis/group/BasisGroupSearch.js
@@ -1,28 +1,7 @@
-import {
- Row,
- Col,
- Table,
- Badge,
- UncontrolledDropdown,
- DropdownMenu,
- DropdownItem,
- DropdownToggle,
- Card,
- CardHeader,
- CardBody,
- CardTitle,
- CardSubtitle,
- ButtonGroup,
- Button,
- Input,
- CustomInput,
- FormGroup
-} from 'reactstrap';
-import Flatpickr from 'react-flatpickr';
-import { MoreVertical, Edit, Trash, Search, File } from 'react-feather';
-import { Calendar } from 'react-feather';
+import { Row, Col, Card, CardBody, Button, Input } from 'reactstrap';
+import { Search } from 'react-feather';
import { useEffect, useState } from 'react';
-import moment from 'moment';
+import dayjs from 'dayjs';
export const BasisGroupSearch = props => {
const [isClick, setIsClick] = useState(1);
@@ -31,7 +10,7 @@ export const BasisGroupSearch = props => {
useEffect(() => {
props.setParams({
...props.params,
- stDate: moment().subtract(dateType, 'day').format('YYYY-MM-DD')
+ stDate: dayjs().subtract(dateType, 'day').format('YYYY-MM-DD')
});
}, [dateType]);
diff --git a/src/components/basis/group/BasisGroupUsersSearch.js b/src/components/basis/group/BasisGroupUsersSearch.js
index 31a725f7..9a086a3f 100644
--- a/src/components/basis/group/BasisGroupUsersSearch.js
+++ b/src/components/basis/group/BasisGroupUsersSearch.js
@@ -1,33 +1,17 @@
import {
Row,
Col,
- Table,
- Badge,
- UncontrolledDropdown,
- DropdownMenu,
- DropdownItem,
- DropdownToggle,
Card,
- CardHeader,
CardBody,
- CardTitle,
- CardSubtitle,
- ButtonGroup,
Button,
Input,
- CustomInput,
Label,
FormGroup
} from 'reactstrap';
-import Flatpickr from 'react-flatpickr';
-import { MoreVertical, Edit, Trash, Search, File } from 'react-feather';
-import { Calendar } from 'react-feather';
-import { useEffect, useState } from 'react';
-import moment from 'moment';
+import { Search } from 'react-feather';
export const BasisGroupUsersSearch = props => {
return (
- //
@@ -50,32 +34,6 @@ export const BasisGroupUsersSearch = props => {
- {/* -
-
-
그룹명
-
-
-
-
-
-
-
-
-
-
-
-
-
- */}
-
사용자 명
@@ -102,31 +60,6 @@ export const BasisGroupUsersSearch = props => {
- {/*
-
-
권한 명
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- */}
diff --git a/src/containers/analysis/history/AnalysisHistoryContainer.js b/src/containers/analysis/history/AnalysisHistoryContainer.js
index 568b68b5..c41f949c 100644
--- a/src/containers/analysis/history/AnalysisHistoryContainer.js
+++ b/src/containers/analysis/history/AnalysisHistoryContainer.js
@@ -1,5 +1,5 @@
-import moment from 'moment';
-import { useEffect, useState, useCallback } from 'react';
+import dayjs from 'dayjs';
+import { useEffect, useState } from 'react';
import { useDispatch, useSelector, shallowEqual } from 'react-redux';
import { Link } from 'react-router-dom';
import { AnalysisHistoryGrid } from '../../../components/analysis/history/AnalysisHistoryGrid';
@@ -58,9 +58,6 @@ export const AnalysisHistoryContainer = props => {
// user: 로그인한 user 정보
const { user } = useSelector(state => state.authState, shallowEqual);
- // const [isClick, setIsClick] = useState(-1);
- // const [dateType, setDateType] = useState(1);
-
/**
* Modal 초기값 state
*/
@@ -76,11 +73,11 @@ export const AnalysisHistoryContainer = props => {
*/
const [params, setParams] = useState({
stDate: selectGroup.stDate
- ? moment(selectGroup.stDate).format('YYYY-MM-DD')
- : moment().subtract(7, 'day').format('YYYY-MM-DD'),
+ ? dayjs(selectGroup.stDate).format('YYYY-MM-DD')
+ : dayjs().subtract(7, 'day').format('YYYY-MM-DD'),
endDate: selectGroup.endDate
- ? moment(selectGroup.endDate).format('YYYY-MM-DD')
- : moment().subtract(0, 'day').format('YYYY-MM-DD'),
+ ? dayjs(selectGroup.endDate).format('YYYY-MM-DD')
+ : dayjs().subtract(0, 'day').format('YYYY-MM-DD'),
search1: selectGroup.search1 ? selectGroup.search1 : '',
groupId: selectGroup.groupId ? selectGroup.groupId : ''
});
@@ -109,17 +106,12 @@ export const AnalysisHistoryContainer = props => {
const handleGroupSelect = ({ groupId }) => {
// 권한 상관 없이 모두 조회 가능
- // const param = params;
-
- // param.groupId = groupId;
-
dispatch(FlightAction.FLIGHT_PLAN_GROUP_SELECT({ groupId: groupId }));
// groupId sessionStorage에 보관 (1 브라우저 1 tab에만 유효)
sessionStorage.setItem('groupId', groupId);
sessionStorage.setItem('cstmrSno', user.cstmrSno);
- // setIsClick(7);
setParams(prevState => ({ ...prevState, groupId }));
dispatch(Actions.LIST_INITAL());
dispatch(
@@ -139,7 +131,6 @@ export const AnalysisHistoryContainer = props => {
search1: ''
})
);
- // setIsClick(0);
};
const titleName = '비행이력 현황';
@@ -159,7 +150,7 @@ export const AnalysisHistoryContainer = props => {
minWidth: '102px',
// sortable: true,
cell: row => {
- return
{moment(row?.cntrlStDt).format('YYYY년 MM월DD일')}
;
+ return
{dayjs(row?.cntrlStDt).format('YYYY년 MM월 DD일')}
;
}
},
@@ -187,57 +178,18 @@ export const AnalysisHistoryContainer = props => {
minWidth: '102px',
sortable: true,
cell: row => {
- return
{moment(row?.cntrlStDt).format('DD일 HH:mm:ss')}
;
+ return
{dayjs(row?.cntrlStDt).format('DD일 HH:mm:ss')}
;
}
},
- // {
- // name: '종료위치',
- // selector: 'cntrlStDate',
- // minWidth: '102px',
- // sortable: true,
- // cell: row => {
- // return
{row.endArea}
;
- // }
- // },
{
name: '종료시간',
selector: row => row.cntrlEndDt,
minWidth: '102px',
sortable: true,
cell: row => {
- return
{moment(row?.cntrlEndDt).format('DD일 HH:mm:ss')}
;
+ return
{dayjs(row?.cntrlEndDt).format('DD일 HH:mm:ss')}
;
}
},
- // ,
- // {
- // name: '거리',
- // selector: 'cntrlStDate',
- // minWidth: '102px',
- // sortable: true,
- // cell: row => {
- // return (
- //
- // {' '}
- // {row.ttlDstnc}
- // {row.ttlDstncType}
- //
- // );
- // }
- // },
-
- // {
- // name: '시간',
- // selector: 'cntrlStDate',
- // minWidth: '102px',
- // sortable: true,
- // cell: row => {
- // return (
- //
- // {row.ttlTime} {row.ttlTimeType}
- //
- // );
- // }
- // },
{
name: '이력보기',
selector: row => row.cntrlStDate,
@@ -268,7 +220,6 @@ export const AnalysisHistoryContainer = props => {
color: 'modal-danger'
});
} else {
- // dispatch(Actions.LIST_INITAL());
dispatch(FlightAction.FLIGHT_PLAN_GROUP_SELECT({ ...params }));
dispatch(Actions.list.request({ searchParams: params, page: 1 }));
}
@@ -283,22 +234,19 @@ export const AnalysisHistoryContainer = props => {
if (val.length == 2) {
setParams({
...params,
- stDate: moment(val[0]).format('YYYY-MM-DD'),
- endDate: moment(val[1]).format('YYYY-MM-DD')
+ stDate: dayjs(val[0]).format('YYYY-MM-DD'),
+ endDate: dayjs(val[1]).format('YYYY-MM-DD')
});
- // setIsClick(-1);
}
}
};
// 최근 1일, 최근 7일... 탭 click handler
const handlerClickDate = val => {
- // setDateType(val);
- // setIsClick(val);
setParams(prev => ({
...prev,
- stDate: moment().subtract(val, 'day').format('YYYY-MM-DD'),
- endDate: moment().subtract(0, 'day').format('YYYY-MM-DD')
+ stDate: dayjs().subtract(val, 'day').format('YYYY-MM-DD'),
+ endDate: dayjs().subtract(0, 'day').format('YYYY-MM-DD')
}));
};
@@ -309,19 +257,8 @@ export const AnalysisHistoryContainer = props => {
return (
- {/* */}
- {/*
-
- */}
- {/* */}
{/* 그룹목록 */}
{user ? (
@@ -355,14 +292,11 @@ export const AnalysisHistoryContainer = props => {
params={params}
onKeyPress={onKeyPress}
setParams={setParams}
- // isClick={isClick}
- // dateType={dateType}
handlerClickDate={handlerClickDate}
searchData={params}
/>
>
) : (
- //
그룹 목록에서 상세보기를 클릭하세요.
diff --git a/src/containers/analysis/history/AnalysisHistoryDetailContainer.js b/src/containers/analysis/history/AnalysisHistoryDetailContainer.js
index b574da1b..e1e890f1 100644
--- a/src/containers/analysis/history/AnalysisHistoryDetailContainer.js
+++ b/src/containers/analysis/history/AnalysisHistoryDetailContainer.js
@@ -1,4 +1,4 @@
-import moment from 'moment';
+import dayjs from 'dayjs';
import { useEffect } from 'react';
import { useDispatch, useSelector } from 'react-redux';
import { useParams } from 'react-router-dom';
@@ -25,21 +25,6 @@ export const AnalysisHistoryDetailContainer = () => {
dispatch(Actions.detail.request(id));
};
- const handlerInput = (type, val) => {
- if (type === 'search1') {
- setParams({ ...params, search1: val });
- }
- if (type === 'searchDate') {
- if (val.length == 2) {
- setParams({
- ...params,
- stDate: moment(val[0]).format('YYYY-MM-DD'),
- endDate: moment(val[1]).format('YYYY-MM-DD')
- });
- }
- }
- };
-
const excelHeaders = [
{ label: '시간', key: 'srvrRcvDt' },
{ label: '위도', key: 'lat' },
@@ -57,7 +42,7 @@ export const AnalysisHistoryDetailContainer = () => {
selector: row => row.cntrlStDate,
cell: row => {
- return
{moment(row?.srvrRcvDt).format('DD일 HH:mm:ss')}
;
+ return
{dayjs(row?.srvrRcvDt).format('DD일 HH:mm:ss')}
;
}
},
@@ -139,12 +124,6 @@ export const AnalysisHistoryDetailContainer = () => {
return (
- {/* */}
{/* 비행이력 로그 Chart */}
diff --git a/src/containers/analysis/simulator/AnalysisSimulationContainer.js b/src/containers/analysis/simulator/AnalysisSimulationContainer.js
index 0160766a..fad1d1e8 100644
--- a/src/containers/analysis/simulator/AnalysisSimulationContainer.js
+++ b/src/containers/analysis/simulator/AnalysisSimulationContainer.js
@@ -1,4 +1,4 @@
-import moment from 'moment';
+import dayjs from 'dayjs';
import { useEffect, useState, useCallback, useRef } from 'react';
import { useDispatch, useSelector } from 'react-redux';
import { AnalysisSimulationDetail } from '../../../components/analysis/simulation/AnalysisSimulationDetail';
@@ -77,8 +77,8 @@ export const AnalysisSimulationContainer = props => {
const [countArray, setCountArray] = useState([]);
// 검색 데이터
const [params, setParams] = useState({
- stDate: moment().subtract(1, 'day').format('YYYY-MM-DD'),
- endDate: moment().subtract(0, 'day').format('YYYY-MM-DD'),
+ stDate: dayjs().subtract(1, 'day').format('YYYY-MM-DD'),
+ endDate: dayjs().subtract(0, 'day').format('YYYY-MM-DD'),
search1: ''
});
@@ -86,7 +86,7 @@ export const AnalysisSimulationContainer = props => {
useEffect(() => {
if (isPlay) {
const countCheck = log.map(item =>
- moment(item?.srvrRcvDt).diff(moment(log[0]?.srvrRcvDt), 'seconds')
+ dayjs(item?.srvrRcvDt).diff(dayjs(log[0]?.srvrRcvDt), 'second')
);
setCountArray(countCheck);
@@ -110,18 +110,18 @@ export const AnalysisSimulationContainer = props => {
}
setInfo({ ...log[playCount], playCount, playCounts });
if (log[playCount]?.srvrRcvDt) {
- setTimeCd(moment(log[playCount]?.srvrRcvDt).format('HH:mm'));
+ setTimeCd(dayjs(log[playCount]?.srvrRcvDt).format('HH:mm'));
}
- playCounts = moment(log[playCount]?.srvrRcvDt).diff(
- moment(log[0]?.srvrRcvDt),
- 'seconds'
+ playCounts = dayjs(log[playCount]?.srvrRcvDt).diff(
+ dayjs(log[0]?.srvrRcvDt),
+ 'second'
);
setDronLength(
- moment(log[log.length - 1]?.srvrRcvDt).diff(
- moment(log[0]?.srvrRcvDt),
- 'seconds'
+ dayjs(log[log.length - 1]?.srvrRcvDt).diff(
+ dayjs(log[0]?.srvrRcvDt),
+ 'second'
)
);
playCount++;
@@ -172,7 +172,7 @@ export const AnalysisSimulationContainer = props => {
playCount = index;
setInfo({ ...log[playCount], playCount, playCounts });
if (log[playCount]?.srvrRcvDt) {
- setTimeCd(moment(log[playCount]?.srvrRcvDt).format('HH:mm'));
+ setTimeCd(dayjs(log[playCount]?.srvrRcvDt).format('HH:mm'));
}
}
}, [sliderCount]);
@@ -216,8 +216,8 @@ export const AnalysisSimulationContainer = props => {
if (val.length == 2) {
setParams({
...params,
- stDate: moment(val[0]).format('YYYY-MM-DD'),
- endDate: moment(val[1]).format('YYYY-MM-DD')
+ stDate: dayjs(val[0]).format('YYYY-MM-DD'),
+ endDate: dayjs(val[1]).format('YYYY-MM-DD')
});
}
}
diff --git a/src/containers/basis/dron/BasisDronContainer.js b/src/containers/basis/dron/BasisDronContainer.js
index 255e7934..50922194 100644
--- a/src/containers/basis/dron/BasisDronContainer.js
+++ b/src/containers/basis/dron/BasisDronContainer.js
@@ -1,4 +1,3 @@
-import moment from 'moment';
import { useEffect, useState } from 'react';
import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory, Link } from 'react-router-dom';