From dc7ff52dc5a967b484feb2dbcd987cd9c99220cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?= Date: Tue, 27 Sep 2022 10:55:02 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EB=B9=84=EC=A0=95=EC=83=81=20=EC=95=8C?= =?UTF-8?q?=EB=A6=BC=20=EB=AA=A9=EB=A1=9D=20-=20=EC=8B=9D=EB=B3=84?= =?UTF-8?q?=EB=B2=88=ED=98=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/control/gp/apis/controlGpApi.ts | 2 +- src/modules/control/gp/models/controlGpModel.ts | 3 ++- src/views/control/alarm/ControlAlarmDetail.js | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/modules/control/gp/apis/controlGpApi.ts b/src/modules/control/gp/apis/controlGpApi.ts index 93010da..66faaf7 100644 --- a/src/modules/control/gp/apis/controlGpApi.ts +++ b/src/modules/control/gp/apis/controlGpApi.ts @@ -24,7 +24,7 @@ export const controlGpApi = { } const { data }: ResponseControlGpWarnLog = await axios.get( - `api/ctr/cntrl/warn/list/${id}` + `api/ctr/cntrl/warn/detail/${id}` ); return data; diff --git a/src/modules/control/gp/models/controlGpModel.ts b/src/modules/control/gp/models/controlGpModel.ts index 5be5c06..745e247 100644 --- a/src/modules/control/gp/models/controlGpModel.ts +++ b/src/modules/control/gp/models/controlGpModel.ts @@ -133,8 +133,9 @@ export interface ControlGpFlightPlanData { export interface ControlGpWarnLogData { warnLogSno: number; - cntrlId: String; + cntrlId: String; createDt: String; + idntfNum: String; } export interface ControlGpWarnLogList extends Array {}; diff --git a/src/views/control/alarm/ControlAlarmDetail.js b/src/views/control/alarm/ControlAlarmDetail.js index a335a85..b7c1e68 100644 --- a/src/views/control/alarm/ControlAlarmDetail.js +++ b/src/views/control/alarm/ControlAlarmDetail.js @@ -19,6 +19,7 @@ const ControlAlarmDetail = ({ historyModal, setHistoryModal, controlGpWarnLog }) + @@ -27,6 +28,7 @@ const ControlAlarmDetail = ({ historyModal, setHistoryModal, controlGpWarnLog }) return ( + From 9d72100712f7e915c67558a0eb2dab7dfd737163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?= Date: Tue, 27 Sep 2022 14:14:03 +0900 Subject: [PATCH 2/4] =?UTF-8?q?auth=20=EB=AA=85=EC=B9=AD=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basis/flight/aprv/FlightPlanAprvGrid.js | 6 ++-- .../basis/dron/BasisDronContainer.js | 6 ++-- .../flight/aprv/FlightPlanAprvContainer.js | 3 +- .../group/BasisGroupApprovalContainer.js | 3 +- .../basis/group/BasisGroupContainer.js | 3 +- .../group/BasisGroupDetailJoinContainer.js | 3 +- .../basis/group/BasisGroupUsersContainer.js | 33 ++++++++++++------- 7 files changed, 38 insertions(+), 19 deletions(-) diff --git a/src/components/basis/flight/aprv/FlightPlanAprvGrid.js b/src/components/basis/flight/aprv/FlightPlanAprvGrid.js index 05caa18..1ea4aca 100644 --- a/src/components/basis/flight/aprv/FlightPlanAprvGrid.js +++ b/src/components/basis/flight/aprv/FlightPlanAprvGrid.js @@ -16,9 +16,11 @@ const FlightPlanAprvGrid = ({ useEffect(() => { joinList.forEach(c => { if (c.groupId === selectGroup.groupId) { - if (c.groupAuthCd === 'USER') { + // if (c.groupAuthCd === 'USER') { + if (c.groupAuthCd === 'NORMAL') { setAprvAuth(false); - } else if (c.groupAuthCd === 'CREATER' || c.groupAuthCd === 'ADMIN') { + // } else if (c.groupAuthCd === 'CREATER' || c.groupAuthCd === 'ADMIN') { + } else if (c.groupAuthCd === 'MASTER' || c.groupAuthCd === 'LEADER') { setAprvAuth(true); } } diff --git a/src/containers/basis/dron/BasisDronContainer.js b/src/containers/basis/dron/BasisDronContainer.js index d28123f..e7ba7fc 100644 --- a/src/containers/basis/dron/BasisDronContainer.js +++ b/src/containers/basis/dron/BasisDronContainer.js @@ -174,8 +174,10 @@ export const BasisDronContainer = props => { const handlerDetail = (groupId, groupNm, groupAuthCd, aprvlYn) => { if ( - groupAuthCd === 'CREATER' || - (aprvlYn === 'Y' && groupAuthCd === 'ADMIN') + // groupAuthCd === 'CREATER' || + groupAuthCd === 'MASTER' || + // (aprvlYn === 'Y' && groupAuthCd === 'ADMIN') + (aprvlYn === 'Y' && groupAuthCd === 'LEADER') ) { dispatch(Actions.SELECT({ groupId: groupId, groupNm: groupNm })); setParams({ diff --git a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js index c6c1960..6314924 100644 --- a/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js +++ b/src/containers/basis/flight/aprv/FlightPlanAprvContainer.js @@ -100,7 +100,8 @@ const FlightPlanAprvContainer = () => { param.cstmrSno = user.cstmrSno; param.groupId = groupId; - if (groupAuthCd === 'CREATER' || groupAuthCd === 'ADMIN') { + // if (groupAuthCd === 'CREATER' || groupAuthCd === 'ADMIN') { + if (groupAuthCd === 'MASTER' || groupAuthCd === 'LEADER') { dispatch( FlightAction.FLIGHT_PLAN_GROUP_SELECT({ cstmrSno: user.cstmrSno, diff --git a/src/containers/basis/group/BasisGroupApprovalContainer.js b/src/containers/basis/group/BasisGroupApprovalContainer.js index 797efcd..30d50de 100644 --- a/src/containers/basis/group/BasisGroupApprovalContainer.js +++ b/src/containers/basis/group/BasisGroupApprovalContainer.js @@ -24,7 +24,8 @@ export const BasisGroupApprovalContainer = props => { const [saveData, setSaveData] = useState({ cstmrGroupSno: '', - aprvlYn: 'N', //가입은 USER 로만 + // aprvlYn: 'N', //가입은 USER 로만 + aprvlYn: 'N', //가입은 NORMAL 로만 aprvUserId: '' }); diff --git a/src/containers/basis/group/BasisGroupContainer.js b/src/containers/basis/group/BasisGroupContainer.js index 5bef759..75d1e63 100644 --- a/src/containers/basis/group/BasisGroupContainer.js +++ b/src/containers/basis/group/BasisGroupContainer.js @@ -138,7 +138,8 @@ export const BasisGroupContainer = props => { // selector: 'cntrlStDate', width: '150px', cell: row => { - return row?.groupAuthCd === 'CREATER' ? ( + // return row?.groupAuthCd === 'CREATER' ? ( + return row?.groupAuthCd === 'MASTER' ? (
-
) : ( { const [joinData, setJoinData] = useState({ groupId: '', - groupAuthCd: 'USER', //가입은 USER 로만 + // groupAuthCd: 'USER', //가입은 USER 로만 + groupAuthCd: 'NORMAL', //가입은 NORMAL 로만 cstmrSno: '' }); diff --git a/src/containers/basis/group/BasisGroupUsersContainer.js b/src/containers/basis/group/BasisGroupUsersContainer.js index 491fb26..66023eb 100644 --- a/src/containers/basis/group/BasisGroupUsersContainer.js +++ b/src/containers/basis/group/BasisGroupUsersContainer.js @@ -107,10 +107,13 @@ export const BasisGroupUsersContainer = props => { // console.log('내 권한 : ', my?.groupAuthCd); // console.log('이 사람의 권한 : ', row?.groupAuthCd); - if (row?.groupAuthCd === 'CREATER') { + // if (row?.groupAuthCd === 'CREATER') { + if (row?.groupAuthCd === 'MASTER') { return
수정불가
; - } else if (row?.groupAuthCd === 'ADMIN') { - if (my?.groupAuthCd === 'CREATER') { + // } else if (row?.groupAuthCd === 'ADMIN') { + } else if (row?.groupAuthCd === 'LEADER') { + // if (my?.groupAuthCd === 'CREATER') { + if (my?.groupAuthCd === 'MASTER') { return ( { } else { return
수정불가
; } - } else if (row?.groupAuthCd === 'USER') { - if (my?.groupAuthCd === 'CREATER' || my?.groupAuthCd === 'ADMIN') { + // } else if (row?.groupAuthCd === 'USER') { + } else if (row?.groupAuthCd === 'NORMAL') { + // if (my?.groupAuthCd === 'CREATER' || my?.groupAuthCd === 'ADMIN') { + if (my?.groupAuthCd === 'MASTER' || my?.groupAuthCd === 'LEADER') { return ( { // console.log('내 권한 : ', my?.groupAuthCd); // console.log('이 사람의 권한 : ', row?.groupAuthCd); - if (row?.groupAuthCd === 'ADMIN') { - if (my?.groupAuthCd === 'CREATER') { + // if (row?.groupAuthCd === 'ADMIN') { + if (row?.groupAuthCd === 'LEADER') { + // if (my?.groupAuthCd === 'CREATER') { + if (my?.groupAuthCd === 'MASTER') { return ( { setSaveData({ cstmrGroupSno: cstmrGroupSno, joinYn: 'Y', - groupAuthCd: 'ADMIN' + // groupAuthCd: 'ADMIN' + groupAuthCd: 'LEADER' }); }; @@ -259,7 +267,8 @@ export const BasisGroupUsersContainer = props => { setSaveData({ cstmrGroupSno: cstmrGroupSno, joinYn: 'Y', - groupAuthCd: 'USER' + // groupAuthCd: 'USER' + groupAuthCd: 'NORMAL' }); }; @@ -274,12 +283,14 @@ export const BasisGroupUsersContainer = props => { { cstmrGroupSno: row, joinYn: 'Y', - groupAuthCd: 'CREATER' + // groupAuthCd: 'CREATER' + groupAuthCd: 'MASTER' }, { cstmrGroupSno: my, joinYn: 'Y', - groupAuthCd: 'USER' + // groupAuthCd: 'USER' + groupAuthCd: 'NORMAL' } ]); }; From e3eb8fa4a8aa63adb320226df1a6873de9f72912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?= Date: Tue, 27 Sep 2022 14:19:03 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EB=B9=84=ED=96=89=20=EA=B4=80=EC=A0=9C=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=20->=20=ED=91=9C=EC=B6=9C=20=ED=95=AD?= =?UTF-8?q?=EB=AA=A9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../control/report/ControlReportDetail.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/control/report/ControlReportDetail.js b/src/views/control/report/ControlReportDetail.js index 5cabd15..372029a 100644 --- a/src/views/control/report/ControlReportDetail.js +++ b/src/views/control/report/ControlReportDetail.js @@ -103,7 +103,7 @@ const ControlReportDetail = props => { {GET_ARCTFT_TYPE_CD(controlDetail?.arcrftTypeCd)} -
+ {/*
배터리 잔량
{controlGpDetail?.betteryLevel} % @@ -114,7 +114,7 @@ const ControlReportDetail = props => {
{controlGpDetail?.betteryVoltage} volt
-
+ */} @@ -136,7 +136,7 @@ const ControlReportDetail = props => {
시작시간
{moment( - controlGpDetail?.controlStartDt, + controlGpDetail?.controlStDt, 'YYYYMMDDHHmmss' ).format('MM-DD HH:mm:ss')}
@@ -160,30 +160,30 @@ const ControlReportDetail = props => {
-
좌표
+
좌표(위도/경도)
- {controlGpDetail?.lat} , {controlGpDetail?.lng} + {controlGpDetail?.lat} / {controlGpDetail?.lng}
-
+ {/*
비행거리
{nullMessage(controlGpDetail?.moveDistance)}{' '} {controlGpDetail?.moveDistanceType}
-
+ */}
헤딩 방위각
{controlGpDetail?.heading} °
-
+ {/*
상태
{nullMessage(controlGpDetail?.dronStatus)}
-
+ */}
위치정보 수신 시간
From 007e3970ea1044e20b80ceed7cf3df31a65ab42d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?= Date: Tue, 27 Sep 2022 15:54:10 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EA=B7=B8=EB=A3=B9=EA=B0=80=EC=9E=85=20-=20?= =?UTF-8?q?=EC=8A=B9=EC=9D=B8=20=EC=B2=98=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basis/group/BasisGroupUsersGrid.js | 22 +---------- .../group/BasisGroupApprovalContainer.js | 4 +- .../group/BasisGroupDetailJoinContainer.js | 5 ++- .../basis/group/BasisGroupUsersContainer.js | 37 ------------------- 4 files changed, 7 insertions(+), 61 deletions(-) diff --git a/src/components/basis/group/BasisGroupUsersGrid.js b/src/components/basis/group/BasisGroupUsersGrid.js index debc75e..1d69875 100644 --- a/src/components/basis/group/BasisGroupUsersGrid.js +++ b/src/components/basis/group/BasisGroupUsersGrid.js @@ -1,25 +1,5 @@ import { GridDatabase } from '../../crud/grid/GridDatatable'; -import { - Row, - Col, - Table, - Badge, - UncontrolledDropdown, - DropdownMenu, - DropdownItem, - DropdownToggle, - Card, - CardHeader, - CardBody, - CardTitle, - CardSubtitle, - ButtonGroup, - Button, - Input, - CustomInput, - FormGroup -} from 'reactstrap'; -import { ExcelExportButton } from '../../crud/excel/ExcelExportButton'; +import { Row, Col, Card } from 'reactstrap'; export const BasisGroupUsersGrid = props => { return ( diff --git a/src/containers/basis/group/BasisGroupApprovalContainer.js b/src/containers/basis/group/BasisGroupApprovalContainer.js index 30d50de..42c3dcc 100644 --- a/src/containers/basis/group/BasisGroupApprovalContainer.js +++ b/src/containers/basis/group/BasisGroupApprovalContainer.js @@ -161,10 +161,12 @@ export const BasisGroupApprovalContainer = props => { desc: '해당 사용자를 승인 처리 하시겠습니까?' }); + //승인처리 시 권한부여 O setSaveData({ cstmrGroupSno: cstmrGroupSno, aprvlYn: 'Y', - aprvUserId: user?.userId + aprvUserId: user?.userId, + groupAuthCd: 'NORMAL' }); }; diff --git a/src/containers/basis/group/BasisGroupDetailJoinContainer.js b/src/containers/basis/group/BasisGroupDetailJoinContainer.js index f76b08c..090a031 100644 --- a/src/containers/basis/group/BasisGroupDetailJoinContainer.js +++ b/src/containers/basis/group/BasisGroupDetailJoinContainer.js @@ -22,10 +22,11 @@ export const BasisGroupDetailJoinContainer = props => { cstmrSno: user?.cstmrSno }); + //가입신청 시 권한부여 X const [joinData, setJoinData] = useState({ groupId: '', - // groupAuthCd: 'USER', //가입은 USER 로만 - groupAuthCd: 'NORMAL', //가입은 NORMAL 로만 + // groupAuthCd: 'NORMAL', //가입은 NORMAL 로만 + groupAuthCd: '', cstmrSno: '' }); diff --git a/src/containers/basis/group/BasisGroupUsersContainer.js b/src/containers/basis/group/BasisGroupUsersContainer.js index 66023eb..a31daf9 100644 --- a/src/containers/basis/group/BasisGroupUsersContainer.js +++ b/src/containers/basis/group/BasisGroupUsersContainer.js @@ -107,12 +107,9 @@ export const BasisGroupUsersContainer = props => { // console.log('내 권한 : ', my?.groupAuthCd); // console.log('이 사람의 권한 : ', row?.groupAuthCd); - // if (row?.groupAuthCd === 'CREATER') { if (row?.groupAuthCd === 'MASTER') { return
수정불가
; - // } else if (row?.groupAuthCd === 'ADMIN') { } else if (row?.groupAuthCd === 'LEADER') { - // if (my?.groupAuthCd === 'CREATER') { if (my?.groupAuthCd === 'MASTER') { return ( { className='badge badge-primary' onClick={() => handlerUserConfirm(row?.cstmrGroupSno)} > - {/* 사용자로 변경 */} - {/* USER */} NORMAL ); } else { return
수정불가
; } - // } else if (row?.groupAuthCd === 'USER') { } else if (row?.groupAuthCd === 'NORMAL') { - // if (my?.groupAuthCd === 'CREATER' || my?.groupAuthCd === 'ADMIN') { if (my?.groupAuthCd === 'MASTER' || my?.groupAuthCd === 'LEADER') { return ( { className='badge badge-danger' onClick={() => handlerAdminConfirm(row?.cstmrGroupSno)} > - {/* 운영자로 변경 */} - {/* ADMIN */} LEADER ); } } - // return row?.groupAuthCd === 'ADMIN' ? ( - // handlerUserConfirm(row?.cstmrGroupSno)} - // > - // 사용자로 변경 - // - // ) : //
-
- // row?.groupAuthCd === 'CREATER' ? ( - //
수정불가
- // ) : ( - // handlerAdminConfirm(row?.cstmrGroupSno)} - // > - // 운영자로 변경 - // - // ); } }, { @@ -180,9 +151,7 @@ export const BasisGroupUsersContainer = props => { // console.log('내 권한 : ', my?.groupAuthCd); // console.log('이 사람의 권한 : ', row?.groupAuthCd); - // if (row?.groupAuthCd === 'ADMIN') { if (row?.groupAuthCd === 'LEADER') { - // if (my?.groupAuthCd === 'CREATER') { if (my?.groupAuthCd === 'MASTER') { return ( { handlerCreaterConfirm(row?.cstmrGroupSno, my?.cstmrGroupSno) } > - {/* 위임하기 */} - {/* DELEGATE */} MASTER ); @@ -246,7 +213,6 @@ export const BasisGroupUsersContainer = props => { setSaveData({ cstmrGroupSno: cstmrGroupSno, joinYn: 'Y', - // groupAuthCd: 'ADMIN' groupAuthCd: 'LEADER' }); }; @@ -267,7 +233,6 @@ export const BasisGroupUsersContainer = props => { setSaveData({ cstmrGroupSno: cstmrGroupSno, joinYn: 'Y', - // groupAuthCd: 'USER' groupAuthCd: 'NORMAL' }); }; @@ -283,13 +248,11 @@ export const BasisGroupUsersContainer = props => { { cstmrGroupSno: row, joinYn: 'Y', - // groupAuthCd: 'CREATER' groupAuthCd: 'MASTER' }, { cstmrGroupSno: my, joinYn: 'Y', - // groupAuthCd: 'USER' groupAuthCd: 'NORMAL' } ]);
번호식별번호 날짜 내용
{i + 1}{p.idntfNum} {p.createDt} {p.warnType}