diff --git a/src/components/basis/flight/aprv/FlightPlanAprvGroupGrid.js b/src/components/basis/flight/aprv/FlightPlanAprvGroupGrid.js
index bc318768..def74c50 100644
--- a/src/components/basis/flight/aprv/FlightPlanAprvGroupGrid.js
+++ b/src/components/basis/flight/aprv/FlightPlanAprvGroupGrid.js
@@ -2,7 +2,14 @@ import React from 'react';
import { GridDatabase } from '../../../crud/grid/GridDatatable';
import { Card, Button } from 'reactstrap';
-const FlightPlanAprvGroupGrid = ({ data, count, columns, pagination, paginationPerPage, paginationRowsPerPageOptions }) => {
+const FlightPlanAprvGroupGrid = ({
+ data,
+ count,
+ columns,
+ pagination,
+ paginationPerPage,
+ paginationRowsPerPageOptions
+}) => {
return (
<>
@@ -15,8 +22,14 @@ const FlightPlanAprvGroupGrid = ({ data, count, columns, pagination, paginationP
diff --git a/src/components/laanc/LaancGrid.js b/src/components/laanc/LaancGrid.js
index 7ea0cff5..0e66c386 100644
--- a/src/components/laanc/LaancGrid.js
+++ b/src/components/laanc/LaancGrid.js
@@ -1,5 +1,5 @@
import { GridDatabase } from '@src/components/crud/grid/GridDatatable';
-import { Row, Col, Card, Button } from 'reactstrap';
+import { Row, Col, Card, Button, Spinner } from 'reactstrap';
import { useSelector } from 'react-redux';
import moment from 'moment';
@@ -32,6 +32,7 @@ const data = [
function LaancGrid() {
const { scheduleList } = useSelector(state => state.flightState);
+ const { laancSearchData } = useSelector(state => state.laancState);
const { loading } = useSelector(state => state.loadingReducer);
const fillZero = (width, str) => {
@@ -43,59 +44,59 @@ function LaancGrid() {
const columns = [
{
name: '조종사 성명',
- selector: row => row.name,
+ selector: row => row.memberName,
minWidth: '150px',
sortable: true,
cell: row => {
- return row.name;
+ return row.memberName;
}
},
{
name: '비행시작일시',
- selector: row => row.flightStart,
+ selector: row => row.schFltStDt,
minWidth: '150px',
sortable: true,
cell: row => {
- return moment(row.flightStart).format('YYYY-MM-DD HH:mm');
+ return moment(row.schFltStDt).format('YYYY-MM-DD HH:mm');
}
},
{
name: '비행종료일시',
- selector: row => row.flightEnd,
+ selector: row => row.schFltEndDt,
minWidth: '150px',
sortable: true,
cell: row => {
- return moment(row.flightEnd).format('YYYY-MM-DD HH:mm');
+ return moment(row.schFltEndDt).format('YYYY-MM-DD HH:mm');
}
},
{
name: '승인유형',
- selector: row => row.apploveType,
- minWidth: '150px',
+ selector: row => row.aprvlYn,
+ minWidth: '90px',
sortable: true,
cell: row => {
- return row.apploveType;
+ return row.aprvlYn;
}
},
{
name: '기체중량',
- selector: row => row.weight,
- minWidth: '150px',
+ selector: row => row.arcrftWght,
+ minWidth: '260px',
sortable: true,
cell: row => {
- return row.weight;
+ return row.arcrftWght;
}
},
{
name: '고도',
- selector: row => row.altitude,
- minWidth: '150px',
+ selector: row => row.elev,
+ minWidth: '80px',
sortable: true,
cell: row => {
- return row.altitude;
+ return row.elev;
}
},
{
@@ -150,28 +151,33 @@ function LaancGrid() {
>
LAANC 승인 신청 목록
- 검색결과 총 {data.length}건
+
+ 검색결과 총 {laancSearchData?.numberOfElements}건
+