From dad9d6c99cc356f3a891a2d5813efa5d64d71326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?hagjoon=28=EC=9D=B4=ED=95=99=EC=A4=80=29?= Date: Fri, 30 Sep 2022 10:35:36 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=B9=84=ED=96=89=EA=B3=84=ED=9A=8D?= =?UTF-8?q?=EC=84=9C=20-=20=EC=BD=98=EC=86=94=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/basis/flight/aprv/FlightPlanAprvGrid.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/components/basis/flight/aprv/FlightPlanAprvGrid.js b/src/components/basis/flight/aprv/FlightPlanAprvGrid.js index 9cb4528..fb10bb2 100644 --- a/src/components/basis/flight/aprv/FlightPlanAprvGrid.js +++ b/src/components/basis/flight/aprv/FlightPlanAprvGrid.js @@ -28,10 +28,6 @@ const FlightPlanAprvGrid = ({ }); }, [selectGroup]); - useEffect(() => { - console.log(selPlanSnoList, '>>>'); - }, [selPlanSnoList]); - const columns = [ // { // id: '', @@ -96,9 +92,9 @@ const FlightPlanAprvGrid = ({ name: '상세보기', cell: row => { return ( - 상세 + + 상세 + ); } } From 0f373219466cc7019f8998f611dcba19653f21cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?hagjoon=28=EC=9D=B4=ED=95=99=EC=A4=80=29?= Date: Fri, 30 Sep 2022 10:44:26 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EB=B9=84=ED=96=89=EA=B3=84=ED=9A=8D?= =?UTF-8?q?=EC=84=9C=20-=20=EC=83=81=EC=84=B8=20->=20=EC=83=81=EC=84=B8?= =?UTF-8?q?=EB=B3=B4=EA=B8=B0=20=EB=8F=99=EC=9D=BC=ED=95=98=EA=B2=8C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basis/flight/aprv/FlightPlanAprvGrid.js | 2 +- .../basis/flight/plan/FlightPlanGrid.js | 135 ++++++++++-------- 2 files changed, 75 insertions(+), 62 deletions(-) diff --git a/src/components/basis/flight/aprv/FlightPlanAprvGrid.js b/src/components/basis/flight/aprv/FlightPlanAprvGrid.js index fb10bb2..4969fc5 100644 --- a/src/components/basis/flight/aprv/FlightPlanAprvGrid.js +++ b/src/components/basis/flight/aprv/FlightPlanAprvGrid.js @@ -93,7 +93,7 @@ const FlightPlanAprvGrid = ({ cell: row => { return ( - 상세 + 상세보기 ); } diff --git a/src/components/basis/flight/plan/FlightPlanGrid.js b/src/components/basis/flight/plan/FlightPlanGrid.js index ef037b1..8d23bcf 100644 --- a/src/components/basis/flight/plan/FlightPlanGrid.js +++ b/src/components/basis/flight/plan/FlightPlanGrid.js @@ -4,68 +4,81 @@ import { GridDatabase } from '../../../crud/grid/GridDatatable'; import { Redirect } from 'react-router-dom'; import { Link, useHistory } from 'react-router-dom'; - const FlightPlanGrid = ({ movePage, planListData }) => { + const columns = [ + { id: 'planSno', name: '번호', cell: (row, i) =>
{i + 1}
}, + { + id: 'fltPurpose', + name: '비행목적', + cell: row =>
{row.fltPurpose}
+ }, + { + id: 'fltMethod', + name: '비행방식', + cell: row => { + const displayName = + (row.areaList && + row.areaList.length > 0 && + row.areaList[0].fltMethod) || + '-'; + return
{displayName}
; + } + }, + { + id: 'schFltStDt', + name: '출발일', + cell: row =>
{row.schFltStDt}
+ }, + { id: 'aprvlYn', name: '승인여부', cell: row =>
{row.aprvlYn}
}, + { + id: 'moveDetail', + name: '상세보기', + cell: row => { + return ( + + 상세보기 + + ); + } + } + ]; - const columns = [ - { id: 'planSno', name: '번호', cell: (row, i) => (
{i + 1}
) }, - { id: 'fltPurpose', name: '비행목적', cell: row => (
{row.fltPurpose}
) }, - { - id: 'fltMethod', name: '비행방식', cell: row => { - const displayName = row.areaList && row.areaList.length > 0 && row.areaList[0].fltMethod || '-'; - return
{displayName}
- } - }, - { id: 'schFltStDt', name: '출발일', cell: row => (
{row.schFltStDt}
) }, - { id: 'aprvlYn', name: '승인여부', cell: row => (
{row.aprvlYn}
) }, - { - id: 'moveDetail', name: '상세보기', cell: row => { - return 상세; - } - } - ]; - - return ( -
- - -
-
-

비행계획서 신청 목록

- 검색결과 총 {!!planListData ? planListData.length : 0}건 -
-
- - {/* 계획서 생성 */} - 비행계획서 신청 - -
-
-
- -
- - {/* 검색된 데이터가 없습니다. */} -
-
-
- -
-
- ) -} + return ( +
+ + +
+
+

비행계획서 신청 목록

+ + 검색결과 총 {!!planListData ? planListData.length : 0}건 + +
+
+ + {/* 계획서 생성 */} + 비행계획서 신청 + +
+
+
+ +
+ + {/* 검색된 데이터가 없습니다. */} +
+
+
+ +
+
+ ); +}; export default FlightPlanGrid;