From 65fa74cd0a836a59ecac8cd043d68c59c09dc86a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?= Date: Wed, 7 Sep 2022 11:42:34 +0900 Subject: [PATCH 1/2] =?UTF-8?q?socket=20log=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/sagas/controlGpSaga.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/control/gp/sagas/controlGpSaga.ts b/src/modules/control/gp/sagas/controlGpSaga.ts index 14086a6a..1ac28e14 100644 --- a/src/modules/control/gp/sagas/controlGpSaga.ts +++ b/src/modules/control/gp/sagas/controlGpSaga.ts @@ -27,6 +27,7 @@ function* getControlGpSaga( if (controlGroupAuthInfo.length > 0) { controlGroupAuthInfo.forEach((auth) => { if (auth.groupAuthCd === 'CREATER' || auth.groupAuthCd === 'ADMIN') { + if (gpsData.length > 0) return false; gpsData = data.filter(gps => auth.idntfNum === gps.objectId); @@ -38,11 +39,10 @@ function* getControlGpSaga( gpsData.filter(gps => auth.createUserId && auth.idntfNum === gps.objectId); } }); - } + } - console.log('gps data >>>> ', data); */ - + console.log('websocket data :: ', data); yield put( Actions.controlGpAction.success({ From 22a80784d40f1e99c648ec3219416fce71958717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?hagjoon=28=EC=9D=B4=ED=95=99=EC=A4=80=29?= Date: Wed, 7 Sep 2022 13:30:49 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20(?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=A4=91)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/register/AccountRegisterForm.js | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/components/account/register/AccountRegisterForm.js b/src/components/account/register/AccountRegisterForm.js index 4b3c972c..b4423f86 100644 --- a/src/components/account/register/AccountRegisterForm.js +++ b/src/components/account/register/AccountRegisterForm.js @@ -243,25 +243,25 @@ export const AccountRegisterForm = ({ stepper, type, movePage }) => { return false; } - if (!vData.crtfyNo) { - setModal({ - isOpen: true, - title: '인증번호 인증', - desc: '인증번호 를 입력 해주세요.' - }); - return false; - } + // if (!vData.crtfyNo) { + // setModal({ + // isOpen: true, + // title: '인증번호 인증', + // desc: '인증번호 를 입력 해주세요.' + // }); + // return false; + // } const res = await accountApi.crtfyhpConfirm(vData.hpno, vData.crtfyNo); - if (!res.data.result) { - setModal({ - isOpen: true, - title: '인증번호 인증', - desc: '인증번호 가 잘못 되었습니다.' - }); - return; - } + // if (!res.data.result) { + // setModal({ + // isOpen: true, + // title: '인증번호 인증', + // desc: '인증번호 가 잘못 되었습니다.' + // }); + // return; + // } setIsRunning(true); setIsCrtfy(true); };