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/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/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..42c3dcc 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: ''
});
@@ -160,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/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' ? (
-
) : (
{
cstmrSno: user?.cstmrSno
});
+ //가입신청 시 권한부여 X
const [joinData, setJoinData] = useState({
groupId: '',
- groupAuthCd: 'USER', //가입은 USER 로만
+ // groupAuthCd: 'NORMAL', //가입은 NORMAL 로만
+ groupAuthCd: '',
cstmrSno: ''
});
diff --git a/src/containers/basis/group/BasisGroupUsersContainer.js b/src/containers/basis/group/BasisGroupUsersContainer.js
index 491fb26..a31daf9 100644
--- a/src/containers/basis/group/BasisGroupUsersContainer.js
+++ b/src/containers/basis/group/BasisGroupUsersContainer.js
@@ -107,59 +107,35 @@ 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') {
- if (my?.groupAuthCd === 'CREATER') {
+ } else if (row?.groupAuthCd === 'LEADER') {
+ if (my?.groupAuthCd === 'MASTER') {
return (
handlerUserConfirm(row?.cstmrGroupSno)}
>
- {/* 사용자로 변경 */}
- {/* USER */}
NORMAL
);
} else {
return 수정불가
;
}
- } else if (row?.groupAuthCd === 'USER') {
- if (my?.groupAuthCd === 'CREATER' || my?.groupAuthCd === 'ADMIN') {
+ } else if (row?.groupAuthCd === 'NORMAL') {
+ if (my?.groupAuthCd === 'MASTER' || my?.groupAuthCd === 'LEADER') {
return (
handlerAdminConfirm(row?.cstmrGroupSno)}
>
- {/* 운영자로 변경 */}
- {/* ADMIN */}
LEADER
);
}
}
- // return row?.groupAuthCd === 'ADMIN' ? (
- // handlerUserConfirm(row?.cstmrGroupSno)}
- // >
- // 사용자로 변경
- //
- // ) : // -
- // row?.groupAuthCd === 'CREATER' ? (
- // 수정불가
- // ) : (
- // handlerAdminConfirm(row?.cstmrGroupSno)}
- // >
- // 운영자로 변경
- //
- // );
}
},
{
@@ -175,8 +151,8 @@ export const BasisGroupUsersContainer = props => {
// console.log('내 권한 : ', my?.groupAuthCd);
// console.log('이 사람의 권한 : ', row?.groupAuthCd);
- if (row?.groupAuthCd === 'ADMIN') {
- if (my?.groupAuthCd === 'CREATER') {
+ if (row?.groupAuthCd === 'LEADER') {
+ if (my?.groupAuthCd === 'MASTER') {
return (
{
handlerCreaterConfirm(row?.cstmrGroupSno, my?.cstmrGroupSno)
}
>
- {/* 위임하기 */}
- {/* DELEGATE */}
MASTER
);
@@ -239,7 +213,7 @@ export const BasisGroupUsersContainer = props => {
setSaveData({
cstmrGroupSno: cstmrGroupSno,
joinYn: 'Y',
- groupAuthCd: 'ADMIN'
+ groupAuthCd: 'LEADER'
});
};
@@ -259,7 +233,7 @@ export const BasisGroupUsersContainer = props => {
setSaveData({
cstmrGroupSno: cstmrGroupSno,
joinYn: 'Y',
- groupAuthCd: 'USER'
+ groupAuthCd: 'NORMAL'
});
};
@@ -274,12 +248,12 @@ export const BasisGroupUsersContainer = props => {
{
cstmrGroupSno: row,
joinYn: 'Y',
- groupAuthCd: 'CREATER'
+ groupAuthCd: 'MASTER'
},
{
cstmrGroupSno: my,
joinYn: 'Y',
- groupAuthCd: 'USER'
+ groupAuthCd: 'NORMAL'
}
]);
};
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 (
{i + 1} |
+ {p.idntfNum} |
{p.createDt} |
{p.warnType} |
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)}
-
+ */}
위치정보 수신 시간