From 418558e3e8dc70fe743edeb9f4aed18364dd53a1 Mon Sep 17 00:00:00 2001 From: sanguu Date: Thu, 29 Sep 2022 17:39:34 +0900 Subject: [PATCH] =?UTF-8?q?=EC=83=81=EC=84=B8=EB=B3=B4=EA=B8=B0=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC(=EB=B2=84=EA=B7=B8=20=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 | 5 +--- .../basis/flight/plan/FlightPlanGrid.js | 26 +++++++++---------- .../basis/dron/BasisDronContainer.js | 5 ---- .../flight/aprv/FlightPlanAprvContainer.js | 5 +--- .../basis/flight/plan/FlightPlanContainer.js | 5 +--- 5 files changed, 15 insertions(+), 31 deletions(-) diff --git a/src/components/basis/flight/aprv/FlightPlanAprvGrid.js b/src/components/basis/flight/aprv/FlightPlanAprvGrid.js index fa15416..a122aa1 100644 --- a/src/components/basis/flight/aprv/FlightPlanAprvGrid.js +++ b/src/components/basis/flight/aprv/FlightPlanAprvGrid.js @@ -6,7 +6,6 @@ import { Link } from 'react-router-dom'; const FlightPlanAprvGrid = ({ data, // columns, - handleMoveDetail, handleChangeSelected, handleClickAprv, joinList, @@ -61,9 +60,7 @@ const FlightPlanAprvGrid = ({ return ( { - handleMoveDetail(row.planSno); - }} + > 상세 diff --git a/src/components/basis/flight/plan/FlightPlanGrid.js b/src/components/basis/flight/plan/FlightPlanGrid.js index 133f0e7..ef037b1 100644 --- a/src/components/basis/flight/plan/FlightPlanGrid.js +++ b/src/components/basis/flight/plan/FlightPlanGrid.js @@ -1,30 +1,28 @@ import React from 'react'; -import {Button, Card, Col, Row} from 'reactstrap'; -import {GridDatabase} from '../../../crud/grid/GridDatatable'; -import {Redirect} from 'react-router-dom'; +import { Button, Card, Col, Row } from 'reactstrap'; +import { GridDatabase } from '../../../crud/grid/GridDatatable'; +import { Redirect } from 'react-router-dom'; import { Link, useHistory } from 'react-router-dom'; -const FlightPlanGrid = ({movePage, planListData, handleMoveDetail}) => { +const FlightPlanGrid = ({ movePage, planListData }) => { const columns = [ - {id: 'planSno', name: '번호', cell: (row, i) => (
{i+1}
)}, - {id: 'fltPurpose', name: '비행목적', cell: row => (
{row.fltPurpose}
)}, + { 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: 'schFltStDt', name: '출발일', cell: row => (
{row.schFltStDt}
) }, + { id: 'aprvlYn', name: '승인여부', cell: row => (
{row.aprvlYn}
) }, { id: 'moveDetail', name: '상세보기', cell: row => { return { - handleMoveDetail(row.planSno)} - }>상세; + to={`/basis/flight/plan/detail/${row.planSno}`} + size='sm'>상세; } } ]; @@ -55,10 +53,10 @@ const FlightPlanGrid = ({movePage, planListData, handleMoveDetail}) => {
{/* 검색된 데이터가 없습니다. */}
diff --git a/src/containers/basis/dron/BasisDronContainer.js b/src/containers/basis/dron/BasisDronContainer.js index 4c1c943..41f42f7 100644 --- a/src/containers/basis/dron/BasisDronContainer.js +++ b/src/containers/basis/dron/BasisDronContainer.js @@ -129,7 +129,6 @@ export const BasisDronContainer = props => { return ( handlerDetailpage(row.arcrftSno)} > 상세보기 @@ -193,10 +192,6 @@ export const BasisDronContainer = props => { } }; - const handlerDetailpage = arcrftSno => { - dispatch(Actions.RESET_IDNTF()); // 초기화 진행 - history.push(`/basis/dron/detail/${arcrftSno}`); - }; const handlerGroupCreate = () => { dispatch(Actions.RESET_IDNTF()); // 초기화 진행 diff --git a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js index a7fa31b..dc1f8c7 100644 --- a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js +++ b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js @@ -143,9 +143,7 @@ const FlightPlanAprvContainer = () => { ); }; - const handleMoveDetail = id => { - history.push(`/basis/flight/plan/detail/${id}`); - }; + // 최초 비행계획서 목록 조회 useEffect(() => { @@ -246,7 +244,6 @@ const FlightPlanAprvContainer = () => { joinList={joinList} selectGroup={selectGroup} handleChangeSelected={handleChangeSelected} - handleMoveDetail={handleMoveDetail} /> ) : ( diff --git a/src/containers/basis/flight/plan/FlightPlanContainer.js b/src/containers/basis/flight/plan/FlightPlanContainer.js index 9d7580f..33c0fe1 100644 --- a/src/containers/basis/flight/plan/FlightPlanContainer.js +++ b/src/containers/basis/flight/plan/FlightPlanContainer.js @@ -60,9 +60,7 @@ const FlightPlanContainer = () => { })); }; - const handleMoveDetail = id => { - history.push(`/basis/flight/plan/detail/${id}`); - }; + const handleGroupSelect = ({ groupId, groupNm, groupAuthCd }) => { // 권한 상관 없이 모두 조회 가능 @@ -143,7 +141,6 @@ const FlightPlanContainer = () => { movePage={moveFlightPlanDetailPage} planListData={planListData} // columns={columns} - handleMoveDetail={handleMoveDetail} /> ) : (