Browse Source

상세보기 버튼(버그 수정)

ctrlDraw
sanguu 2 years ago
parent
commit
418558e3e8
  1. 5
      src/components/basis/flight/aprv/FlightPlanAprvGrid.js
  2. 20
      src/components/basis/flight/plan/FlightPlanGrid.js
  3. 5
      src/containers/basis/dron/BasisDronContainer.js
  4. 5
      src/containers/basis/flight/aprv/FlightPlanAprvContainer.js
  5. 5
      src/containers/basis/flight/plan/FlightPlanContainer.js

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

@ -6,7 +6,6 @@ import { Link } from 'react-router-dom';
const FlightPlanAprvGrid = ({ const FlightPlanAprvGrid = ({
data, data,
// columns, // columns,
handleMoveDetail,
handleChangeSelected, handleChangeSelected,
handleClickAprv, handleClickAprv,
joinList, joinList,
@ -61,9 +60,7 @@ const FlightPlanAprvGrid = ({
return ( return (
<Link to={`/basis/flight/plan/detail/${row.planSno}`} <Link to={`/basis/flight/plan/detail/${row.planSno}`}
size='sm' size='sm'
onClick={() => {
handleMoveDetail(row.planSno);
}}
> >
상세 상세
</Link> </Link>

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

@ -1,30 +1,28 @@
import React from 'react'; import React from 'react';
import {Button, Card, Col, Row} from 'reactstrap'; import { Button, Card, Col, Row } from 'reactstrap';
import {GridDatabase} from '../../../crud/grid/GridDatatable'; import { GridDatabase } from '../../../crud/grid/GridDatatable';
import {Redirect} from 'react-router-dom'; import { Redirect } from 'react-router-dom';
import { Link, useHistory } from 'react-router-dom'; import { Link, useHistory } from 'react-router-dom';
const FlightPlanGrid = ({movePage, planListData, handleMoveDetail}) => { const FlightPlanGrid = ({ movePage, planListData }) => {
const columns = [ const columns = [
{id: 'planSno', name: '번호', cell: (row, i) => (<div>{i+1}</div>)}, { id: 'planSno', name: '번호', cell: (row, i) => (<div>{i + 1}</div>) },
{id: 'fltPurpose', name: '비행목적', cell: row => (<div>{row.fltPurpose}</div>)}, { id: 'fltPurpose', name: '비행목적', cell: row => (<div>{row.fltPurpose}</div>) },
{ {
id: 'fltMethod', name: '비행방식', cell: row => { id: 'fltMethod', name: '비행방식', cell: row => {
const displayName = row.areaList && row.areaList.length > 0 && row.areaList[0].fltMethod || '-'; const displayName = row.areaList && row.areaList.length > 0 && row.areaList[0].fltMethod || '-';
return <div>{displayName}</div> return <div>{displayName}</div>
} }
}, },
{id: 'schFltStDt', name: '출발일', cell: row => (<div>{row.schFltStDt}</div>)}, { id: 'schFltStDt', name: '출발일', cell: row => (<div>{row.schFltStDt}</div>) },
{id: 'aprvlYn', name: '승인여부', cell: row => (<div>{row.aprvlYn}</div>)}, { id: 'aprvlYn', name: '승인여부', cell: row => (<div>{row.aprvlYn}</div>) },
{ {
id: 'moveDetail', name: '상세보기', cell: row => { id: 'moveDetail', name: '상세보기', cell: row => {
return <Link return <Link
to={`/basis/flight/plan/detail/${row.planSno}`} to={`/basis/flight/plan/detail/${row.planSno}`}
size='sm' onClick={() => { size='sm'>상세</Link>;
handleMoveDetail(row.planSno)}
}>상세</Link>;
} }
} }
]; ];

5
src/containers/basis/dron/BasisDronContainer.js

@ -129,7 +129,6 @@ export const BasisDronContainer = props => {
return ( return (
<Link <Link
to={`/basis/dron/detail/${row.arcrftSno}`} to={`/basis/dron/detail/${row.arcrftSno}`}
onClick={() => handlerDetailpage(row.arcrftSno)}
> >
상세보기 상세보기
</Link> </Link>
@ -193,10 +192,6 @@ export const BasisDronContainer = props => {
} }
}; };
const handlerDetailpage = arcrftSno => {
dispatch(Actions.RESET_IDNTF()); // 초기화 진행
history.push(`/basis/dron/detail/${arcrftSno}`);
};
const handlerGroupCreate = () => { const handlerGroupCreate = () => {
dispatch(Actions.RESET_IDNTF()); // 초기화 진행 dispatch(Actions.RESET_IDNTF()); // 초기화 진행

5
src/containers/basis/flight/aprv/FlightPlanAprvContainer.js

@ -143,9 +143,7 @@ const FlightPlanAprvContainer = () => {
); );
}; };
const handleMoveDetail = id => {
history.push(`/basis/flight/plan/detail/${id}`);
};
// 최초 비행계획서 목록 조회 // 최초 비행계획서 목록 조회
useEffect(() => { useEffect(() => {
@ -246,7 +244,6 @@ const FlightPlanAprvContainer = () => {
joinList={joinList} joinList={joinList}
selectGroup={selectGroup} selectGroup={selectGroup}
handleChangeSelected={handleChangeSelected} handleChangeSelected={handleChangeSelected}
handleMoveDetail={handleMoveDetail}
/> />
</> </>
) : ( ) : (

5
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 }) => { const handleGroupSelect = ({ groupId, groupNm, groupAuthCd }) => {
// 권한 상관 없이 모두 조회 가능 // 권한 상관 없이 모두 조회 가능
@ -143,7 +141,6 @@ const FlightPlanContainer = () => {
movePage={moveFlightPlanDetailPage} movePage={moveFlightPlanDetailPage}
planListData={planListData} planListData={planListData}
// columns={columns} // columns={columns}
handleMoveDetail={handleMoveDetail}
/> />
</> </>
) : ( ) : (

Loading…
Cancel
Save