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 01/12] =?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 14086a6..1ac28e1 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 02/12] =?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 4b3c972..b4423f8 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); }; From f099da397d32a9403de980e95ac5cd11f0993442 Mon Sep 17 00:00:00 2001 From: junh_eee Date: Wed, 7 Sep 2022 13:35:20 +0900 Subject: [PATCH 03/12] =?UTF-8?q?=EC=95=84=EC=9D=B4=EB=94=94=EC=B0=BE?= =?UTF-8?q?=EA=B8=B0,=20=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8=20=EC=B0=BE?= =?UTF-8?q?=EA=B8=B0=20=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/find/AccountFindPassword.js | 47 +++++++++++++++---- .../account/find/AccountFindUserId.js | 34 ++++++++++++-- .../account/find/AccounFindTabContainer.js | 17 ++++++- 3 files changed, 84 insertions(+), 14 deletions(-) diff --git a/src/components/account/find/AccountFindPassword.js b/src/components/account/find/AccountFindPassword.js index 09a73c4..21f481a 100644 --- a/src/components/account/find/AccountFindPassword.js +++ b/src/components/account/find/AccountFindPassword.js @@ -56,11 +56,21 @@ export const AccountFindPassword = props => { }, []); const handlerSend = async() => { - if(!inputId || !inputHpno) { + if(!inputId) { setModal({ isOpen: true, title: '인증번호 발송', - desc: '빈칸을 채워주세요.', + desc: '아이디를 입력해 주세요.', + color: 'modal-danger' + }) + return; + } + + if(!inputHpno) { + setModal({ + isOpen: true, + title: '인증번호 발송', + desc: '휴대폰 번호를 입력해 주세요.', color: 'modal-danger' }) return; @@ -126,6 +136,12 @@ export const AccountFindPassword = props => { setIsRunning(false); // setValue('crtfyNo', ''); // setCrtfyNo(''); + setModal({ + isOpen: true, + title: '인증번호 만료', + desc: '인증번호가 만료되었습니다.', + color: 'modal-danger' + }) } }, 1000); @@ -137,11 +153,21 @@ export const AccountFindPassword = props => { } const handlerConfirm = async() => { - if(!inputId || !inputHpno) { + if(!inputId) { setModal({ isOpen: true, - title: '인증번호 인증', - desc: '빈칸을 채워주세요.', + title: '인증번호 발송', + desc: '아이디를 입력해 주세요.', + color: 'modal-danger' + }) + return; + } + + if(!inputHpno) { + setModal({ + isOpen: true, + title: '인증번호 발송', + desc: '휴대폰 번호를 입력해 주세요.', color: 'modal-danger' }) return; @@ -183,7 +209,7 @@ export const AccountFindPassword = props => { setModal({ isOpen: true, title: '비밀번호 변경', - desc: '빈칸을 채워주세요.', + desc: '비밀번호를 입력해 주세요.', color: 'modal-danger' }) return; @@ -194,7 +220,7 @@ export const AccountFindPassword = props => { setModal({ isOpen: true, title: '비밀번호 변경', - desc: '8자 이상, 20자 미만 영문자/숫자/특수문자(@$!%*#?&) 조합하여 입력해주세요.', + desc: '8자 이상, 20자 미만 영문자/숫자/특수문자(@$!%*#?&) 조합하여 입력해 주세요.', color: 'modal-danger' }) return; @@ -242,12 +268,17 @@ export const AccountFindPassword = props => { setInputCrtfy(crtfyhp) } } else if(name == 'newPw') { + const regex = /^[A-Za-z0-9@$!%*#?&]{0,20}$/; + if(regex.test(value)) { newpw = value; setInputNewPw(newpw); - // } + } } else if(name == 'newPwCk') { + const regex = /^[A-Za-z0-9@$!%*#?&]{0,20}$/; + if(regex.test(value)) { newpwck = value; setInputNewPwCk(newpwck); + } } } diff --git a/src/components/account/find/AccountFindUserId.js b/src/components/account/find/AccountFindUserId.js index 78214e1..4c44475 100644 --- a/src/components/account/find/AccountFindUserId.js +++ b/src/components/account/find/AccountFindUserId.js @@ -52,11 +52,21 @@ export const AccountFindUserId = props => { }, []); const handlerSend = async() => { - if(!inputName || !inputHpno) { + if(!inputName) { setModal({ isOpen: true, title: '인증번호 발송', - desc: '빈칸을 채워주세요.', + desc: '이름을 입력해 주세요.', + color: 'modal-danger' + }) + return; + } + + if(!inputHpno) { + setModal({ + isOpen: true, + title: '인증번호 발송', + desc: '휴대폰 번호를 입력해 주세요.', color: 'modal-danger' }) return; @@ -121,6 +131,12 @@ export const AccountFindUserId = props => { setIsRunning(false); // setValue('crtfyNo', ''); // setCrtfyNo(''); + setModal({ + isOpen: true, + title: '인증번호 만료', + desc: '인증번호가 만료되었습니다.', + color: 'modal-danger' + }) } }, 1000); @@ -132,11 +148,21 @@ export const AccountFindUserId = props => { } const handlerConfirm = async() => { - if(!inputName || !inputHpno) { + if(!inputHpno) { + setModal({ + isOpen: true, + title: '인증번호 인증', + desc: '휴대폰 번호를 입력 해주세요.', + color: 'modal-danger' + }) + return; + } + + if(!inputName) { setModal({ isOpen: true, title: '인증번호 인증', - desc: '빈칸을 채워주세요.', + desc: '이름을 입력 해주세요.', color: 'modal-danger' }) return; diff --git a/src/containers/account/find/AccounFindTabContainer.js b/src/containers/account/find/AccounFindTabContainer.js index bcdba53..e8d95f5 100644 --- a/src/containers/account/find/AccounFindTabContainer.js +++ b/src/containers/account/find/AccounFindTabContainer.js @@ -1,10 +1,15 @@ import { AccountFindTab } from "../../../components/account/find/AccountFindTab"; - import loginImg from '../../../assets/images/login01.png'; - +import { Button } from 'reactstrap' import '../../../assets/css/custom.css'; +import { useHistory } from 'react-router-dom' export const AccountFindTabContainer = () => { + const history = useHistory(); + + const handlerRegister = () => { + history.push(`/account/register`) + } return ( <> @@ -17,6 +22,14 @@ export const AccountFindTabContainer = () => {
+
+ + 회원가입 바로가기 + +
From cbd27bc72c6f40e8c4a2041e475fa94f376a4379 Mon Sep 17 00:00:00 2001 From: junh_eee Date: Wed, 7 Sep 2022 13:54:00 +0900 Subject: [PATCH 04/12] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C=20=EC=9D=B4=EB=A6=84=20=ED=91=9C=EC=B6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/account/register/AccountRegister.js | 4 ++++ src/components/account/register/AccountRegisterComplete.js | 5 +++-- src/components/account/register/AccountRegisterForm.js | 6 +++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/components/account/register/AccountRegister.js b/src/components/account/register/AccountRegister.js index 202c2fa..9839825 100644 --- a/src/components/account/register/AccountRegister.js +++ b/src/components/account/register/AccountRegister.js @@ -8,6 +8,7 @@ import { AccountRegisterComplete } from './AccountRegisterComplete'; export const AccountRegister = ({ props }) => { const [stepper, setStepper] = useState(null); + const [testName, setTestName] = useState(); const ref = useRef(null); // console.log(props); @@ -36,6 +37,8 @@ export const AccountRegister = ({ props }) => { stepper={stepper} type='wizard-horizontal' movePage={movePage} + testName={testName} + setTestName={setTestName} /> ) }, @@ -48,6 +51,7 @@ export const AccountRegister = ({ props }) => { stepper={stepper} type='wizard-horizontal' movePage={movePage} + testName={testName} /> ) } diff --git a/src/components/account/register/AccountRegisterComplete.js b/src/components/account/register/AccountRegisterComplete.js index 764c46e..8d1fec7 100644 --- a/src/components/account/register/AccountRegisterComplete.js +++ b/src/components/account/register/AccountRegisterComplete.js @@ -20,8 +20,9 @@ import { import AppCollapse from '@components/app-collapse'; import Select from 'react-select'; import { selectThemeColors } from '@utils'; +import { useSelector } from 'react-redux'; -export const AccountRegisterComplete = ({ stepper, type, movePage }) => { +export const AccountRegisterComplete = ({ stepper, type, movePage, testName}) => { const handlerLogin = () => { movePage('/account/login'); }; @@ -30,7 +31,7 @@ export const AccountRegisterComplete = ({ stepper, type, movePage }) => {
- 환영합니다. 홍길동 님 + 환영합니다. {testName}님 모든 회원가입절차가 완료되었습니다. 로그인 후 사용해주세요. diff --git a/src/components/account/register/AccountRegisterForm.js b/src/components/account/register/AccountRegisterForm.js index b4423f8..e9f210a 100644 --- a/src/components/account/register/AccountRegisterForm.js +++ b/src/components/account/register/AccountRegisterForm.js @@ -25,7 +25,7 @@ import { useDispatch, useSelector } from 'react-redux'; import { accountApi } from '../../../modules/account/register/apis/accountApi'; import * as Actions from '../../../modules/account/register/actions/accountAction'; -export const AccountRegisterForm = ({ stepper, type, movePage }) => { +export const AccountRegisterForm = ({ stepper, type, movePage, testName, setTestName }) => { const { agreeTerms } = useSelector(state => state.accountState); const [minutes_Counter, setMinutes_Counter] = useState('03'); const [seconds_Counter, setSeconds_Counter] = useState('00'); @@ -272,6 +272,10 @@ export const AccountRegisterForm = ({ stepper, type, movePage }) => { // console.log(register); const { name, value } = e.target; + if(name == 'memberName') { + setTestName(value); + } + if (name == 'brthdyDate') { const regex = /^[0-9\b]{0,8}$/; From 90d0b28bed0e935eaab5ab18a2208c94b8220d08 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 14:01:23 +0900 Subject: [PATCH 05/12] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/register/AccountRegister.js | 8 ++-- .../register/AccountRegisterComplete.js | 4 +- .../account/register/AccountRegisterForm.js | 42 +++++++++---------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/components/account/register/AccountRegister.js b/src/components/account/register/AccountRegister.js index 9839825..f2b6b5b 100644 --- a/src/components/account/register/AccountRegister.js +++ b/src/components/account/register/AccountRegister.js @@ -8,7 +8,7 @@ import { AccountRegisterComplete } from './AccountRegisterComplete'; export const AccountRegister = ({ props }) => { const [stepper, setStepper] = useState(null); - const [testName, setTestName] = useState(); + const [memberName, setMemberName] = useState(); const ref = useRef(null); // console.log(props); @@ -37,8 +37,8 @@ export const AccountRegister = ({ props }) => { stepper={stepper} type='wizard-horizontal' movePage={movePage} - testName={testName} - setTestName={setTestName} + memberName={memberName} + setMemberName={setMemberName} /> ) }, @@ -51,7 +51,7 @@ export const AccountRegister = ({ props }) => { stepper={stepper} type='wizard-horizontal' movePage={movePage} - testName={testName} + memberName={memberName} /> ) } diff --git a/src/components/account/register/AccountRegisterComplete.js b/src/components/account/register/AccountRegisterComplete.js index 8d1fec7..244dc9f 100644 --- a/src/components/account/register/AccountRegisterComplete.js +++ b/src/components/account/register/AccountRegisterComplete.js @@ -22,7 +22,7 @@ import Select from 'react-select'; import { selectThemeColors } from '@utils'; import { useSelector } from 'react-redux'; -export const AccountRegisterComplete = ({ stepper, type, movePage, testName}) => { +export const AccountRegisterComplete = ({ stepper, type, movePage, memberName}) => { const handlerLogin = () => { movePage('/account/login'); }; @@ -31,7 +31,7 @@ export const AccountRegisterComplete = ({ stepper, type, movePage, testName}) =>
- 환영합니다. {testName}님 + 환영합니다. {memberName}님 모든 회원가입절차가 완료되었습니다. 로그인 후 사용해주세요. diff --git a/src/components/account/register/AccountRegisterForm.js b/src/components/account/register/AccountRegisterForm.js index e9f210a..8a9fd43 100644 --- a/src/components/account/register/AccountRegisterForm.js +++ b/src/components/account/register/AccountRegisterForm.js @@ -25,7 +25,7 @@ import { useDispatch, useSelector } from 'react-redux'; import { accountApi } from '../../../modules/account/register/apis/accountApi'; import * as Actions from '../../../modules/account/register/actions/accountAction'; -export const AccountRegisterForm = ({ stepper, type, movePage, testName, setTestName }) => { +export const AccountRegisterForm = ({ stepper, type, movePage, testName, setMemberName }) => { const { agreeTerms } = useSelector(state => state.accountState); const [minutes_Counter, setMinutes_Counter] = useState('03'); const [seconds_Counter, setSeconds_Counter] = useState('00'); @@ -198,9 +198,9 @@ export const AccountRegisterForm = ({ stepper, type, movePage, testName, setTest }); return false; } - // dispatch( - // Actions.register.request({ data: data, agreeTerms: agreeTerms }) - // ); + dispatch( + Actions.register.request({ data: data, agreeTerms: agreeTerms }) + ); const res = await accountApi.register({ data: data, agreeTerms: agreeTerms @@ -243,25 +243,25 @@ export const AccountRegisterForm = ({ stepper, type, movePage, testName, setTest 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); }; @@ -273,7 +273,7 @@ export const AccountRegisterForm = ({ stepper, type, movePage, testName, setTest const { name, value } = e.target; if(name == 'memberName') { - setTestName(value); + setMemberName(value); } if (name == 'brthdyDate') { From bb4273c47fc569dc5baad04f84c176d46660767f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?qkr7828=28=EB=B0=95=EC=9E=AC=EC=9A=B0=29?= Date: Wed, 7 Sep 2022 14:43:37 +0900 Subject: [PATCH 06/12] =?UTF-8?q?=EA=B8=B0=EC=B2=B4=EC=A0=95=EB=B3=B4=20-?= =?UTF-8?q?=20=ED=8C=8C=EC=9D=BC=20=EC=97=85=EB=A1=9C=EB=93=9C=20=EC=8B=9C?= =?UTF-8?q?=2010MB=20=EC=9D=B4=ED=95=98=EC=9D=98=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=EB=A7=8C=20=EB=93=B1=EB=A1=9D=EB=90=98=EA=B2=8C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/basis/dron/BasisDronImage.js | 25 ++++++++++++++++++- .../basis/dron/BasisDronDetailContainer.js | 19 +++++++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/src/components/basis/dron/BasisDronImage.js b/src/components/basis/dron/BasisDronImage.js index 77327f3..28cbc4f 100644 --- a/src/components/basis/dron/BasisDronImage.js +++ b/src/components/basis/dron/BasisDronImage.js @@ -1,6 +1,6 @@ import React from 'react'; import { Edit, Image, Trash2 } from 'react-feather'; -import { Button, Label, Media } from 'reactstrap'; +import { Button, Label, Media, Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap'; export const BasisDronImage = props => { return ( @@ -50,6 +50,29 @@ export const BasisDronImage = props => {
+
+ props.setModal({ ...props.modal, isOpen: !props.modal.isOpen })} + modalClassName={props.modal.color} + className='modal-dialog-centered' + > + props.setModal({ ...props.modal, isOpen: !props.modal.isOpen })} + > + {props.modal.title} + + {props.modal.desc} + + + + +
{/*
이미지 최적 크기 300*300
*/} diff --git a/src/containers/basis/dron/BasisDronDetailContainer.js b/src/containers/basis/dron/BasisDronDetailContainer.js index 1e207d4..a4ed573 100644 --- a/src/containers/basis/dron/BasisDronDetailContainer.js +++ b/src/containers/basis/dron/BasisDronDetailContainer.js @@ -54,7 +54,12 @@ export const BasisDronDetailContainer = props => { }, resolver: yupResolver(validationSchema) }); - + const [modal, setModal] = useState({ + isOpen: false, + title: '', + desc: '', + color: '' + }) useEffect(() => { if (props.id) { handlerSearch(); @@ -96,6 +101,16 @@ export const BasisDronDetailContainer = props => { const handlerImageChange = e => { const reader = new FileReader(), files = e.target.files; + const fileSize = files[0].size/1048576; + if(fileSize > 10) { + setModal({ + isOpen: true, + title: '이미지 용량 초과', + desc: '10MB 이하의 파일만 등록 가능합니다', + color: 'modal-danger' + }) + return; + } saveFileAPI(files[0]); }; @@ -148,6 +163,8 @@ export const BasisDronDetailContainer = props => { handlerImageDelete={handlerImageDelete} data={register} img={img} + modal={modal} + setModal={setModal} /> From 0ef03ea5ba5b7b9d6b20a89722d6dff311554d4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?qkr7828=28=EB=B0=95=EC=9E=AC=EC=9A=B0=29?= Date: Wed, 7 Sep 2022 14:51:53 +0900 Subject: [PATCH 07/12] =?UTF-8?q?=EC=97=85=EB=A1=9C=EB=93=9C=20=ED=81=B4?= =?UTF-8?q?=EB=A6=AD=20=ED=9B=84=20=EC=B7=A8=EC=86=8C=EB=B2=84=ED=8A=BC?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=B0=BD=20=EB=8B=AB=EC=9D=84=EC=8B=9C=20?= =?UTF-8?q?=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/containers/basis/dron/BasisDronDetailContainer.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/containers/basis/dron/BasisDronDetailContainer.js b/src/containers/basis/dron/BasisDronDetailContainer.js index a4ed573..090eab5 100644 --- a/src/containers/basis/dron/BasisDronDetailContainer.js +++ b/src/containers/basis/dron/BasisDronDetailContainer.js @@ -101,8 +101,9 @@ export const BasisDronDetailContainer = props => { const handlerImageChange = e => { const reader = new FileReader(), files = e.target.files; + if(!(files[0].size == 0) ){ const fileSize = files[0].size/1048576; - if(fileSize > 10) { + if(fileSize > 1) { setModal({ isOpen: true, title: '이미지 용량 초과', @@ -111,6 +112,7 @@ export const BasisDronDetailContainer = props => { }) return; } + } saveFileAPI(files[0]); }; From 13b282be135eb75bfc8c092c40137bcd061c3e3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?qkr7828=28=EB=B0=95=EC=9E=AC=EC=9A=B0=29?= Date: Wed, 7 Sep 2022 14:52:52 +0900 Subject: [PATCH 08/12] . --- src/containers/basis/dron/BasisDronDetailContainer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/basis/dron/BasisDronDetailContainer.js b/src/containers/basis/dron/BasisDronDetailContainer.js index 090eab5..4df22de 100644 --- a/src/containers/basis/dron/BasisDronDetailContainer.js +++ b/src/containers/basis/dron/BasisDronDetailContainer.js @@ -103,7 +103,7 @@ export const BasisDronDetailContainer = props => { files = e.target.files; if(!(files[0].size == 0) ){ const fileSize = files[0].size/1048576; - if(fileSize > 1) { + if(fileSize > 10) { setModal({ isOpen: true, title: '이미지 용량 초과', From 4c4e98772c27f9bd739a5100471ce620501f8168 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 15:04:34 +0900 Subject: [PATCH 09/12] =?UTF-8?q?[=EB=B9=84=ED=96=89=20=EC=8B=9C=EB=AE=AC?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=85=98]=20=EC=BD=98=EC=86=94=EB=AC=B8?= =?UTF-8?q?=EA=B5=AC=20=EB=B0=8F=20=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/analysis/simulation/AnalysisSimulationDetail.js | 2 +- src/components/analysis/simulation/AnalysisSimulationReport.js | 1 - src/components/analysis/simulation/AnalysisSimulatorSlider.js | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/analysis/simulation/AnalysisSimulationDetail.js b/src/components/analysis/simulation/AnalysisSimulationDetail.js index 43fe2fc..cb32f40 100644 --- a/src/components/analysis/simulation/AnalysisSimulationDetail.js +++ b/src/components/analysis/simulation/AnalysisSimulationDetail.js @@ -210,7 +210,7 @@ export const AnalysisSimulationDetail = props => {
*/} {props.stcsList?.map(item => { return ( -
{ // console.log(props.params); - console.log(11111111111111); return (
diff --git a/src/components/analysis/simulation/AnalysisSimulatorSlider.js b/src/components/analysis/simulation/AnalysisSimulatorSlider.js index c809f4c..2e81af8 100644 --- a/src/components/analysis/simulation/AnalysisSimulatorSlider.js +++ b/src/components/analysis/simulation/AnalysisSimulatorSlider.js @@ -40,7 +40,6 @@ const AnalysisSimulatorSlider = ({ }; useEffect(() => { - console.log(playCount); }, [playCount]); return (
From 6ec3f2100ae646fb88b805a38baea1f2bfa55921 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 15:14:48 +0900 Subject: [PATCH 10/12] =?UTF-8?q?[=EA=B7=B8=EB=A3=B9=EA=B0=80=EC=9E=85]=20?= =?UTF-8?q?=EC=BD=98=EC=86=94=20=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/basis/group/BasisGroupDetailJoinSearch.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/basis/group/BasisGroupDetailJoinSearch.js b/src/components/basis/group/BasisGroupDetailJoinSearch.js index eb93bae..2aff40a 100644 --- a/src/components/basis/group/BasisGroupDetailJoinSearch.js +++ b/src/components/basis/group/BasisGroupDetailJoinSearch.js @@ -61,7 +61,7 @@ export const BasisGroupDetailJoinSearch = props => { type='text' id='groupNm' name='groupNm' - value={props.params.groupNm} + value={props.params.groupNm || ''} onChange={props.handlerInput} bsSize='sm' placeholder='그룹명을 입력하세요' @@ -84,7 +84,7 @@ export const BasisGroupDetailJoinSearch = props => { id='groupId' name='groupId' onChange={props.handlerInput} - value={props.params.groupId} + value={props.params.groupId || ''} onKeyPress={props.onKeyPress} bsSize='sm' placeholder='그룹코드를 입력하세요' From 80f4d4e5f9a1bf1a3b5302a4dfbf6d88c3c931b1 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 15:17:49 +0900 Subject: [PATCH 11/12] =?UTF-8?q?[=EC=82=AC=EC=9A=A9=EC=9E=90=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC]=20=EC=BD=98=EC=86=94=20=EC=97=90=EB=9F=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/basis/group/BasisGroupUsersSearch.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/basis/group/BasisGroupUsersSearch.js b/src/components/basis/group/BasisGroupUsersSearch.js index 4d8cc1d..81756dc 100644 --- a/src/components/basis/group/BasisGroupUsersSearch.js +++ b/src/components/basis/group/BasisGroupUsersSearch.js @@ -61,7 +61,7 @@ export const BasisGroupUsersSearch = props => { type='text' id='groupNm' name='groupNm' - value={props.params.groupNm} + value={props.params.groupNm || ''} onChange={props.handlerInput} onKeyPress={props.onKeyPress} bsSize='sm' @@ -87,7 +87,7 @@ export const BasisGroupUsersSearch = props => { type='text' id='memberName' name='memberName' - value={props.params.memberName} + value={props.params.memberName || ''} onChange={props.handlerInput} onKeyPress={props.onKeyPress} bsSize='sm' From 7dc1c60e4f0d5a4d6851335a0c27b6ac558ed815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?qkr7828=28=EB=B0=95=EC=9E=AC=EC=9A=B0=29?= Date: Wed, 7 Sep 2022 15:34:01 +0900 Subject: [PATCH 12/12] =?UTF-8?q?=EA=B8=B0=EC=B2=B4=EA=B4=80=EB=A6=AC=20-?= =?UTF-8?q?=20=EA=B8=B0=EC=B2=B4=EC=82=AC=EC=A7=84=20=EB=93=B1=EB=A1=9D=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basis/dron/BasisDronDetailContainer.js | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/containers/basis/dron/BasisDronDetailContainer.js b/src/containers/basis/dron/BasisDronDetailContainer.js index 4df22de..0fff353 100644 --- a/src/containers/basis/dron/BasisDronDetailContainer.js +++ b/src/containers/basis/dron/BasisDronDetailContainer.js @@ -101,19 +101,21 @@ export const BasisDronDetailContainer = props => { const handlerImageChange = e => { const reader = new FileReader(), files = e.target.files; - if(!(files[0].size == 0) ){ - const fileSize = files[0].size/1048576; - if(fileSize > 10) { - setModal({ - isOpen: true, - title: '이미지 용량 초과', - desc: '10MB 이하의 파일만 등록 가능합니다', - color: 'modal-danger' - }) - return; - } - } - saveFileAPI(files[0]); + if(!(files[0] == undefined)){ + if(!(files[0].size == 0)){ + const fileSize = files[0].size/1048576; + if(fileSize > 10) { + setModal({ + isOpen: true, + title: '이미지 용량 초과', + desc: '10MB 이하의 파일만 등록 가능합니다', + color: 'modal-danger' + }) + return; + } + } + } + saveFileAPI(files[0]); }; const handlerImageDelete = () => {