diff --git a/src/components/account/register/AccountRegisterForm.js b/src/components/account/register/AccountRegisterForm.js
index 6aa000e..9b34e0e 100644
--- a/src/components/account/register/AccountRegisterForm.js
+++ b/src/components/account/register/AccountRegisterForm.js
@@ -203,7 +203,9 @@ export const AccountRegisterForm = ({
email: '',
hpno: '',
clncd: '+82',
- crtfyNo: ''
+ crtfyNo: '',
+ company: '팔네트웍스',
+ trmnlId: 'SANDBOX-001'
},
resolver: yupResolver(SignupSchema)
});
@@ -289,9 +291,15 @@ export const AccountRegisterForm = ({
let hpno = '';
let brthdyDate = '';
+ let trmnlId = '';
const onChangeHandler = e => {
const { name, value } = e.target;
+ if (name === 'company') {
+ trmnlId = value;
+ setValue('trmnlId', trmnlId);
+ }
+
if (name === 'memberName') {
setMemberName(value);
}
@@ -578,7 +586,7 @@ export const AccountRegisterForm = ({
*/}
-
+
@@ -597,8 +605,51 @@ export const AccountRegisterForm = ({
{errors && errors.userPswd && (
{errors.userPswd.message}
)}
-
-
+
+
+
+
+
+
+ 검색하신 지역의 날씨 정보입니다.
+
+ 인천광역시 부평구 안남로 272
+
+
+ {/* 탭메뉴or탭내용 활성화 active */}
+
+
+
+
+
+ 시각 |
+ 날씨 |
+ 기온 |
+ 풍향 |
+ 풍속 |
+
+
+
+
+ 10시 |
+
+
+ |
+ 27℃ |
+
+
+ |
+ 2m/s |
+
+
+ 12시 |
+
+
+ |
+ 30℃ |
+
+
+ |
+ 3m/s |
+
+
+ 14시 |
+
+
+ |
+ 28℃ |
+
+
+ |
+ 4m/s |
+
+
+ 16시 |
+
+
+ |
+ 27℃ |
+
+
+ |
+ 7m/s |
+
+
+ 18시 |
+
+
+ |
+ 25℃ |
+
+
+ |
+ 2m/s |
+
+
+ 20시 |
+
+
+ |
+ 26℃ |
+
+
+ |
+ 2m/s |
+
+
+
+
+
+
+
+
+ 날짜 |
+ 날씨 |
+ 기온 |
+
+
+
+
+ 06.19.(토) 오전 |
+
+
+ |
+ 최저 27℃ |
+
+
+ 06.19.(토) 오후 |
+
+
+ |
+ 30℃ |
+
+
+ 06.20.(일) 오전 |
+
+
+ |
+ 30℃ |
+
+
+ 06.20.(일) 오후 |
+
+
+ |
+ 30℃ |
+
+
+ 06.21.(월) 오전 |
+
+
+ |
+ 30℃ |
+
+
+ 06.21.(월) 오후 |
+
+
+ |
+ 30℃ |
+
+
+ 06.22.(화) 오전 |
+
+
+ |
+ 30℃ |
+
+
+ 06.2.(화) 오후 |
+
+
+ |
+ 30℃ |
+
+
+
+
+
+
+
+
diff --git a/src/components/basis/group/BaisGroupForm.js b/src/components/basis/group/BaisGroupForm.js
index d6a2594..cec619a 100644
--- a/src/components/basis/group/BaisGroupForm.js
+++ b/src/components/basis/group/BaisGroupForm.js
@@ -77,7 +77,7 @@ export const BasisGroupForm = props => {
name='groupId'
bsSize='sm'
readOnly={true}
- value={props.groupData.groupId || ''}
+ defaultValue={props.groupData.groupId || ''}
placeholder=''
/>
@@ -107,6 +107,32 @@ export const BasisGroupForm = props => {
+
+
+
+
+ {errors && errors.trmnlId && (
+
+ {errors.trmnlId.message}
+
+ )}
+
+
+
{/*
diff --git a/src/components/map/naver/dron/DronMarker.js b/src/components/map/naver/dron/DronMarker.js
index 9ef8fa1..401ee27 100644
--- a/src/components/map/naver/dron/DronMarker.js
+++ b/src/components/map/naver/dron/DronMarker.js
@@ -116,12 +116,15 @@ export const DronMarker = props => {
const markerOption = {};
if (id.substring(0, 2) === 'PA') {
- const pal = controlGroupAuthInfo.find(
+ const pal = controlGroupAuthInfo?.find(
prev => prev.idntfNum === gps.objectId
);
markerOption.url = pal ? DronIcon : FlightIcon;
markerOption.type = pal ? 'DRONE' : 'FLIGHT';
} else {
+ // const etc = controlGpList?.filter(
+ // prev => prev.command === 이사람이 가입한 그룹의 command(가입한 그룹의 리스트를 여기로 불러와야 함)
+ // )
markerOption.url = FlightIcon;
markerOption.type = 'FLIGHT';
}
@@ -253,7 +256,6 @@ export const DronMarker = props => {
//마커를 셋팅 한다.
const markerInit = () => {
if (controlGpList) {
- console.log(controlGpList);
allRemoveMarkers();
controlGpList.map(item => {
let position = new naver.maps.LatLng(item.lat, item.lng);
diff --git a/src/containers/basis/group/BasisGroupApprovalContainer.js b/src/containers/basis/group/BasisGroupApprovalContainer.js
index 2cffb8b..16c2ac7 100644
--- a/src/containers/basis/group/BasisGroupApprovalContainer.js
+++ b/src/containers/basis/group/BasisGroupApprovalContainer.js
@@ -170,6 +170,7 @@ export const BasisGroupApprovalContainer = props => {
const [saveData, setSaveData] = useState({
cstmrGroupSno: '',
+ trmnlId: '',
// aprvlYn: 'N', //가입은 USER 로만
aprvlYn: 'N', //가입은 NORMAL 로만
aprvUserId: ''
@@ -259,14 +260,10 @@ export const BasisGroupApprovalContainer = props => {
sortable: false,
cell: (row, i) => {
let disa = false;
-
+ let trmnlId = '';
if (user.authId === 'ADMIN') {
//모든 그룹 조회 가능
- const my = groupList?.find(prev => {
- if (prev.groupId === row?.groupId) {
- return prev;
- }
- });
+ const my = groupList?.find(prev => prev.groupId === row?.groupId);
if (my.myGroupAuthCd === 'NORMAL') {
disa = true;
} else if (!my.myGroupAuthCd) {
@@ -274,11 +271,8 @@ export const BasisGroupApprovalContainer = props => {
}
} else if (user.authId === 'USER') {
//본인 그룹 조회 가능
- const my = joinList?.find(prev => {
- if (prev.groupId === row?.groupId) {
- return prev;
- }
- });
+ const my = joinList?.find(prev => prev.groupId === row?.groupId);
+ trmnlId = my?.trmnlId;
if (my?.groupAuthCd === 'NORMAL') {
disa = true;
}
@@ -288,7 +282,7 @@ export const BasisGroupApprovalContainer = props => {
handlerAprvConfirm(row?.cstmrGroupSno)}
+ onClick={() => handlerAprvConfirm(row?.cstmrGroupSno, trmnlId)}
disabled={disa}
>
승인처리
@@ -327,19 +321,19 @@ export const BasisGroupApprovalContainer = props => {
param.page = page;
dispatch(Actions.APPROVAL_LIST.request({ searchParams: param }));
};
- const handlerAprvConfirm = cstmrGroupSno => {
+ const handlerAprvConfirm = (cstmrGroupSno, trmnlId) => {
setModal({
isOpen: true,
title: '승인 확인',
desc: '해당 사용자를 승인 처리 하시겠습니까?'
});
-
//승인처리 시 권한부여 O
setSaveData({
cstmrGroupSno: cstmrGroupSno,
aprvlYn: 'Y',
aprvUserId: user?.userId,
- groupAuthCd: 'NORMAL'
+ groupAuthCd: 'NORMAL',
+ trmnlId: trmnlId
});
};
diff --git a/src/containers/basis/group/BasisGroupDetailContainer.js b/src/containers/basis/group/BasisGroupDetailContainer.js
index 0bfc3c6..1c98391 100644
--- a/src/containers/basis/group/BasisGroupDetailContainer.js
+++ b/src/containers/basis/group/BasisGroupDetailContainer.js
@@ -38,6 +38,7 @@ export const BasisGroupDetailContainer = () => {
useEffect(() => {
setGroupData({
+ trmnlId: user?.trmnlId,
groupId: newGroupId,
groupNm: '',
type: 'create',
@@ -63,6 +64,7 @@ export const BasisGroupDetailContainer = () => {
const handlerCreate = data => {
const saveData = {
+ trmnlId: groupData.trmnlId,
createDt: '',
cstmrSno: groupData.cstmrSno,
groupId: groupData.groupId,
diff --git a/src/modules/control/gp/models/controlGpModel.ts b/src/modules/control/gp/models/controlGpModel.ts
index fbd3dbe..e4f4de6 100644
--- a/src/modules/control/gp/models/controlGpModel.ts
+++ b/src/modules/control/gp/models/controlGpModel.ts
@@ -113,6 +113,7 @@ export interface ControlGroupAuthData {
arcrftSno: number;
idntfNum: string;
createUserId: string;
+ trmnlId: string;
}
export interface ControlGpFlightPlanDataList
diff --git a/src/modules/control/gp/sagas/controlGpSaga.ts b/src/modules/control/gp/sagas/controlGpSaga.ts
index ddc58b9..a34ecc7 100644
--- a/src/modules/control/gp/sagas/controlGpSaga.ts
+++ b/src/modules/control/gp/sagas/controlGpSaga.ts
@@ -26,7 +26,7 @@ function* getControlGpSaga(
let gpsData: ControlGpData[] = [];
//사용자가 등록한 기체(식별장치 포함)만 관제에서 볼 수 있게 필터처리
- if (controlGroupAuthInfo.length > 0) {
+ if (controlGroupAuthInfo?.length > 0) {
controlGroupAuthInfo.forEach(auth => {
if (gpsData.length > 0) return false;
@@ -46,7 +46,7 @@ function* getControlGpSaga(
data.forEach(gps => {
if (gps.controlId && gps.objectId.substring(0, 2) === 'PA') {
- const arcrft = controlGroupAuthInfo.find(
+ const arcrft = controlGroupAuthInfo?.find(
auth => auth.idntfNum === gps.objectId
);