Merge branch 'master' of http://gitea.palntour.com/pav/pav-home

2 years ago · ccd26b0fa6
46 changed files with 491 additions and 296 deletions
--- a/src/components/account/find/AccountFindPassword.js
+++ b/src/components/account/find/AccountFindPassword.js
@ -17,28 +17,6 @@ import { accountApi } from '../../../modules/account/register/apis/accountApi'
 import { updatePwAction } from '../../../modules/account/find/actions/findAction';

 export const AccountFindPassword =  props => {
-  // const validationSchema = yup.object().shape({
-  //   newPw: yup
-  //     .string()
-  //     .required('비밀번호를 입력주세요.')
-  //     .matches(
-  //       /^(?=.*[A-Za-z])(?=.*[0-9])(?=.*[@$!%*#?&])[A-Za-z0-9@$!%*#?&]{8,20}$/,
-  //       '8자 이상, 20자 미만 영문자/숫자/특수문자(@$!%*#?&) 조합하여 입력해주세요.'
-  //     ),
-  //   newPwCk: yup
-  //     .string()
-  //     .required('비밀번호 확인을 입력해 주세요.')
-  //     .oneOf([yup.ref('userPswd'), null], '비밀번호가 일치하지 않습니다.')
-  // })
-
-  // const { register, getValues, setValue, errors, handleSubmit } = useForm({
-  //   defaultValues: {
-  //     newPw: '',
-  //     newPwCk: '',
-  //   },
-  //   resolver: yupResolver(validationSchema)
-  // })
-
  const dispatch = useDispatch();
  const [activeTab, setActiveTab] = useState('2')

@ -46,6 +24,7 @@ export const AccountFindPassword =  props => {
  const toggle = tab => setActiveTab(tab)
  //modal
  const [confirmModal, setConfirmModal] = useState(false)
+  const [saveModal, setSaveModal] = useState(false)
  const [modal, setModal] = useState({
    isOpen: false,
    title: '',
@ -77,11 +56,21 @@ export const AccountFindPassword =  props => {
  }, []);

  const handlerSend = async() => {
-    if(!inputId || !inputHpno) {
+    if(!inputId) {
+      setModal({
+        isOpen: true,
+        title: '인증번호 발송',
+        desc: '아이디를 입력해 주세요.',
+        color: 'modal-danger'
+      })
+      return;
+    }
+
+    if(!inputHpno) {
      setModal({
        isOpen: true,
        title: '인증번호 발송',
-        desc: '빈칸을 채워주세요.',
+        desc: '휴대폰 번호를 입력해 주세요.',
        color: 'modal-danger'
      })
      return;
@ -147,6 +136,12 @@ export const AccountFindPassword =  props => {
        setIsRunning(false);
        // setValue('crtfyNo', '');
        // setCrtfyNo('');
+        setModal({
+          isOpen: true,
+          title: '인증번호 만료',
+          desc: '인증번호가 만료되었습니다.',
+          color: 'modal-danger'
+        })
      }
    }, 1000);

@ -158,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;
@ -200,60 +205,88 @@ export const AccountFindPassword =  props => {
  }

  const handlerUpdatePw = async() => {
-    if(inputNewPw !== inputNewPwCk) {
+    if(!inputNewPw || !inputNewPwCk) {
      setModal({
        isOpen: true,
        title: '비밀번호 변경',
-        desc: '비밀번호가 일치하지 않습니다.',
+        desc: '비밀번호를 입력해 주세요.',
        color: 'modal-danger'
-      });
+      })
      return;
    }

-    if(!inputNewPw || !inputNewPwCk) {
+    const reg = /^(?=.*[A-Za-z])(?=.*[0-9])(?=.*[@$!%*#?&])[A-Za-z0-9@$!%*#?&]{8,20}$/;
+    if(!reg.test(inputNewPw) || !reg.test(inputNewPwCk)) {
      setModal({
        isOpen: true,
        title: '비밀번호 변경',
-        desc: '빈칸을 채워주세요.',
+        desc: '8자 이상, 20자 미만 영문자/숫자/특수문자(@$!%*#?&) 조합하여 입력해 주세요.',
        color: 'modal-danger'
      })
      return;
    }

-    if((inputNewPw === inputNewPwCk) && inputNewPw && inputNewPwCk) {
-      dispatch(updatePwAction.request({userId: inputId, hpno: inputHpno, newPw: inputNewPw}));
-
+    if(inputNewPw !== inputNewPwCk) {
      setModal({
        isOpen: true,
        title: '비밀번호 변경',
-        desc: '변경이 완료되었습니다. 다시 로그인 해주세요.',
-        color: 'modal-primary'
-      })
+        desc: '비밀번호가 일치하지 않습니다.',
+        color: 'modal-danger'
+      });
      return;
    }
+    
+
+    if((inputNewPw === inputNewPwCk) && inputNewPw && inputNewPwCk) {
+      dispatch(updatePwAction.request({userId: inputId, hpno: inputHpno, newPw: inputNewPw}));
+      setSaveModal(!saveModal);
+    }
  }

+  let id = '';
+  let hpno = '';
+  let crtfyhp = '';
+  let newpw = '';
+  let newpwck = '';
  const handlerChange = (e) => {
    const {name, value} = e.target;

    if(name == 'userId') {
-      setInputId(value);
+      id = value;
+      setInputId(id)
+      
    } else if(name == 'hpno') {
-      setInputHpno(value);
+      const regex = /^[0-9]{0,11}$/;
+      if(regex.test(value)) {
+        hpno = value;
+        setInputHpno(hpno)
+      }
    } else if(name == 'crtfyhpNo') {
-      setInputCrtfy(value);
+      const regex = /^[0-9]{0,6}$/;
+      if(regex.test(value)) {
+        crtfyhp = value;
+        setInputCrtfy(crtfyhp)
+      }
    } else if(name == 'newPw') {
-      setInputNewPw(value);
+      const regex = /^[A-Za-z0-9@$!%*#?&]{0,20}$/;
+      if(regex.test(value)) {
+        newpw = value;
+        setInputNewPw(newpw);
+      }
    } else if(name == 'newPwCk') {
-      setInputNewPwCk(value);
+      const regex = /^[A-Za-z0-9@$!%*#?&]{0,20}$/;
+      if(regex.test(value)) {
+        newpwck = value;
+        setInputNewPwCk(newpwck);
+      }
    }
  }

-  const handlerClose = () => {
-    setModal({ ...modal, isOpen: !modal.isOpen });
-    setConfirmModal({ ...confirmModal, isOpen: !confirmModal.isOpen});
-    props.handlerClose();
-  }
+  // const handlerClose = () => {
+  //   setModal({ ...modal, isOpen: !modal.isOpen });
+  //   setConfirmModal({ ...confirmModal, isOpen: !confirmModal.isOpen});
+  //   props.handlerClose();
+  // }

  return(
    <>
@ -309,6 +342,7 @@ export const AccountFindPassword =  props => {
                id='crtfyhpNo'
                name='crtfyhpNo'
                placeholder='인증번호 입력'
+                value={inputCrtfy}
                onChange={handlerChange}
                {...sendCount > 0 ? 
                  {}
@ -326,7 +360,7 @@ export const AccountFindPassword =  props => {
                color='primary'
                type='button'
                onClick={handlerConfirm}
-                {...sendCount > 0 ? 
+                {...isRunning ? 
                  {}
                :
                  {disabled: true}
@ -337,6 +371,7 @@ export const AccountFindPassword =  props => {
        </FormGroup>
        <FormGroup>
          <div className='full-btn-2n vertically-centered-modal'>
+          {/* <div className='full-btn-2n vertically-centered-confirmModal'> */}
            <Button
              color='secondary'
              type='button'
@ -355,7 +390,6 @@ export const AccountFindPassword =  props => {
              }
            >확인</Button>

-            {/* <Form onSubmit={handleSubmit(onSubmit)}> */}
            <Modal isOpen={confirmModal} toggle={() => setConfirmModal(!confirmModal)} className='modal-dialog-centered user-search-modal'>
              <ModalHeader toggle={() => setConfirmModal(!confirmModal)}>비밀번호 확인</ModalHeader>
              <ModalBody>
@ -374,13 +408,7 @@ export const AccountFindPassword =  props => {
                      placeholder='새로운 비밀번호'
                      value={inputNewPw}
                      onChange={handlerChange}
-                      // className={classnames({
-                      //   'is-invalid': errors.newPw
-                      // })}
                    />
-                     {/* {errors && errors.newPw && (
-                        <FormFeedback>{errors.newPw.message}</FormFeedback>
-                      )} */}
                  </InputGroup>
                  </FormGroup>
                  <FormGroup className='form-label-group position-relative has-icon-left mb-0'>
@ -397,13 +425,7 @@ export const AccountFindPassword =  props => {
                      placeholder='새로운 비밀번호 확인'
                      value={inputNewPwCk}
                      onChange={handlerChange}
-                      // className={classnames({
-                      //   'is-invalid': errors.newPwCk
-                      // })}
                    />
-                     {/* {errors && errors.newPwCk && (
-                        <FormFeedback>{errors.newPwCk.message}</FormFeedback>
-                      )} */}
                  </InputGroup>
                </FormGroup>
              </ModalBody>
@ -413,9 +435,30 @@ export const AccountFindPassword =  props => {
                  type='button'
                  onClick={handlerUpdatePw}
                >저장</Button>
+
+                <div className='vertically-centered-modal'>
+                  <Modal
+                    isOpen={saveModal}
+                    toggle={() => setSaveModal(!saveModal)}
+                    modalClassName='modal-primary'
+                    className='modal-dialog-centered'
+                  >
+                    <ModalHeader toggle={() => setSaveModal(!saveModal)}>
+                      비밀번호 변경
+                    </ModalHeader>
+                    <ModalBody>
+                      변경이 완료되었습니다. 다시 로그인 해주세요.
+                    </ModalBody>
+                    <ModalFooter>
+                      <Button color='primary' onClick={props.handlerClose}>
+                        로그인
+                      </Button>{' '}
+                    </ModalFooter>
+                  </Modal>
+                </div>
+
              </ModalFooter>
            </Modal>
-            {/* </Form> */}
          </div>
        </FormGroup>

@ -433,22 +476,12 @@ export const AccountFindPassword =  props => {
            </ModalHeader>
            <ModalBody>{modal.desc}</ModalBody>
            <ModalFooter>
-              {
-                udResult?.data.code === 0 ?
-                <Button
-                  color='danger'
-                  onClick={handlerClose}
-                >
-                  로그인
-                </Button>
-                :
                <Button
                  color='danger'
                  onClick={() => setModal({ ...modal, isOpen: !modal.isOpen })}
                >
                  확인
                </Button>
-              }
            </ModalFooter>
          </Modal>
        </div>
--- a/src/components/account/find/AccountFindUserId.js
+++ b/src/components/account/find/AccountFindUserId.js
@ -1,7 +1,7 @@
 import * as yup from 'yup';
 import classnames from 'classnames';
 import { yupResolver } from '@hookform/resolvers/yup';
-import { useState, useEffect } from 'react'
+import { useState, useEffect, useMemo } from 'react'
 import { useForm } from 'react-hook-form';
 import { useDispatch, useSelector } from 'react-redux';

@ -15,20 +15,6 @@ import { accountApi } from '../../../modules/account/register/apis/accountApi';
 import { findAPI } from '../../../modules/account/find/apis/findApi';

 export const AccountFindUserId =  props  => {
-  // const validationSchema = yup.object().shape({
-  //   memberName: yup
-  //     .string()
-  //     .required('이름을 입력해 주세요.'),
-  //   hpno: yup.string().required('휴대폰번호를 입력해 주세요.')
-  // })
-
-  // const { register, getValues, setValue, errors, handleSubmit } = useForm({
-  //   defaultValues: {
-  //     memberName: '',
-  //     hpno: '',
-  //   },
-  //   resolver: yupResolver(validationSchema)
-  // })
  const dispatch = useDispatch();
  const [activeTab, setActiveTab] = useState('2')
  
@ -66,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;
@ -135,6 +131,12 @@ export const AccountFindUserId =  props  => {
        setIsRunning(false);
        // setValue('crtfyNo', '');
        // setCrtfyNo('');
+        setModal({
+          isOpen: true,
+          title: '인증번호 만료',
+          desc: '인증번호가 만료되었습니다.',
+          color: 'modal-danger'
+        })
      }
    }, 1000);

@ -146,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;
@ -187,15 +199,30 @@ export const AccountFindUserId =  props  => {
    }
  }

-  const handlerChange = (e) => {
+  let memberName = '';
+  let hpno = '';
+  let crtfyhp = '';
+  const handlerChange = e => {
    const {name, value} = e.target;

    if(name == 'memberName') {
-      setInputName(value);
+      const regex = /^[ㄱ-ㅎ|ㅏ-ㅣ|가-힣|a-z]{0,10}$/;
+      if(regex.test(value)) {
+        memberName = value;
+        setInputName(memberName)
+      }
    } else if(name == 'hpno') {
-      setInputHpno(value);
+      const regex = /^[0-9]{0,11}$/;
+      if(regex.test(value)) {
+        hpno = value;
+        setInputHpno(hpno)
+      }
    } else if(name == 'crtfyhpNo') {
-      setInputCrtfy(value);
+      const regex = /^[0-9]{0,6}$/;
+      if(regex.test(value)) {
+        crtfyhp = value;
+        setInputCrtfy(crtfyhp)
+      }
    }
  }

@ -223,13 +250,7 @@ export const AccountFindUserId =  props  => {
              placeholder='이름'
              value={inputName}
              onChange={handlerChange}
-              // className={classnames({
-              //   'is-invalid': errors.memberName
-              // })}
            />
-            {/* {errors && errors.memberName && (
-              <FormFeedback>{errors.memberName.message}</FormFeedback>
-            )} */}
          </InputGroup>
        </FormGroup>
        <FormGroup>
@ -237,7 +258,6 @@ export const AccountFindUserId =  props  => {
            <Col md='3' xs='12'>
              <Input type='select' id='cntryCd' name='cntryCd' placeholder='+(국가번호)'>
                <option>+82</option>
-                {/* <option>21111</option> */}
              </Input>
            </Col>
            <Col md='6' xs='12'>
@ -248,13 +268,7 @@ export const AccountFindUserId =  props  => {
                placeholder='01012345678'
                value={inputHpno}
                onChange={handlerChange}
-                // className={classnames({
-                //   'is-invalid': errors.hpno
-                // })}
              />
-              {/* {errors && errors.hpno && (
-                <FormFeedback>{errors.hpno.message}</FormFeedback>
-              )} */}
            </Col>       
            <Col md='3' xs='12'>
              <Button
@ -274,6 +288,7 @@ export const AccountFindUserId =  props  => {
                id='crtfyhpNo'
                name='crtfyhpNo'
                placeholder='인증번호 입력'
+                value={inputCrtfy}
                onChange={handlerChange} 
                {...sendCount > 0 ? 
                  {}
@ -318,18 +333,27 @@ export const AccountFindUserId =  props  => {
                {disabled: true}
              }
            >확인</Button>
-              <Modal isOpen={confirmModal} toggle={() => setConfirmModal(!confirmModal)} className='modal-dialog-centered user-search-modal'>
-                <ModalHeader toggle={() => setConfirmModal(!confirmModal)}>아이디 확인</ModalHeader>
-                  <ModalBody>
-                    회원님의 아이디는<br/><span className='user-search-id'>{userId?.data.userId}</span> 입니다.
-                    {/* 회원님의 아이디는<br/><span className='user-search-id'>{result?.data.userId}</span> 입니다. */}
-                  </ModalBody>
-                  <ModalFooter>
-                    <Button color='primary' onClick={props.handlerClose}>
-                      로그인
-                    </Button>{' '}
-                  </ModalFooter>
+
+              <Modal
+                isOpen={confirmModal}
+                toggle={() => setConfirmModal(!confirmModal)}
+                modalClassName='modal-primary'
+                className='modal-dialog-centered'
+              >
+                <ModalHeader toggle={() => setConfirmModal(!confirmModal)}>
+                  아이디 확인
+                </ModalHeader>
+                <ModalBody>
+                  회원님의 아이디는<br/><span className='user-search-id'>{userId?.data.userId}</span> 입니다.
+                  {/* 회원님의 아이디는<br/><span className='user-search-id'>{result?.data.userId}</span> 입니다. */}
+                </ModalBody>
+                <ModalFooter>
+                  <Button color='primary' onClick={props.handlerClose}>
+                    로그인
+                  </Button>{' '}
+                </ModalFooter>
              </Modal>
+
          </div>
        </FormGroup>

--- a/src/components/account/mypage/AccountMypagePwForm.js
+++ b/src/components/account/mypage/AccountMypagePwForm.js
@ -53,6 +53,8 @@ const AccountMypagePwForm = ({ user }) => {
      history.push('/');
    }
    return (
+        <Card>
+          <CardBody className='card-body-tab-cont'>
        <form onSubmit={handleSubmit(onSubmit)}>
            <TabPane tabId='2'>
                <div className='search-info-box'>
@ -92,7 +94,8 @@ const AccountMypagePwForm = ({ user }) => {
                </div>
            </TabPane>
        </form>
-
+    </CardBody>
+    </Card>
    )
 }
 export default AccountMypagePwForm;
--- 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 [memberName, setMemberName] = useState();
  const ref = useRef(null);

  // console.log(props);
@ -36,6 +37,8 @@ export const AccountRegister = ({ props }) => {
          stepper={stepper}
          type='wizard-horizontal'
          movePage={movePage}
+          memberName={memberName}
+          setMemberName={setMemberName}
        />
      )
    },
@ -48,6 +51,7 @@ export const AccountRegister = ({ props }) => {
          stepper={stepper}
          type='wizard-horizontal'
          movePage={movePage}
+          memberName={memberName}
        />
      )
    }
--- 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, memberName}) => {
  const handlerLogin = () => {
    movePage('/account/login');
  };
@ -30,7 +31,7 @@ export const AccountRegisterComplete = ({ stepper, type, movePage }) => {
    <Fragment>
      <div className='complete-txt'>
        <img src={completeImg} />
-        <span className='big-txt'>환영합니다. 홍길동 님</span>
+        <span className='big-txt'>환영합니다. {memberName}님</span>
        <span className='d-block'>
          모든 회원가입절차가 완료되었습니다. 로그인 후 사용해주세요.
        </span>
--- 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, 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 }) => {
        });
        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
@ -272,6 +272,10 @@ export const AccountRegisterForm = ({ stepper, type, movePage }) => {
    // console.log(register);
    const { name, value } = e.target;

+    if(name == 'memberName') {
+      setMemberName(value);
+    }
+
    if (name == 'brthdyDate') {
      const regex = /^[0-9\b]{0,8}$/;

--- a/src/components/analysis/simulation/AnalysisSimulationDetail.js
+++ b/src/components/analysis/simulation/AnalysisSimulationDetail.js
@ -210,7 +210,7 @@ export const AnalysisSimulationDetail = props => {
                </div> */}
                {props.stcsList?.map(item => {
                  return (
-                    <div
+                    <div key={item.timeCd}
                      className={
                        props.timeCd === item.timeCd
                          ? 'simulation-date-num date-num-focus'
--- a/src/components/analysis/simulation/AnalysisSimulationReport.js
+++ b/src/components/analysis/simulation/AnalysisSimulationReport.js
@ -6,7 +6,6 @@ import { Button, Input, InputGroup } from 'reactstrap';

 export const AnalysisSimulationReport = props => {
  // console.log(props.params);
-  console.log(11111111111111);
  return (
    <div className='left-layer'>
      <div className='layer-content'>
--- 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 (
    <div className='simulation-slider'>
--- 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 => {
            </span>
          </Button.Ripple>
        </div>
+        <div className='vertically-centered-modal'>
+          <Modal
+            isOpen={props.modal.isOpen}
+            toggle={() => props.setModal({ ...props.modal, isOpen: !props.modal.isOpen })}
+            modalClassName={props.modal.color}
+            className='modal-dialog-centered'
+          >
+            <ModalHeader
+              toggle={() => props.setModal({ ...props.modal, isOpen: !props.modal.isOpen })}
+            >
+              {props.modal.title}
+            </ModalHeader>
+            <ModalBody>{props.modal.desc}</ModalBody>
+            <ModalFooter>
+                <Button
+                  color='danger'
+                  onClick={() => props.setModal({ ...props.modal, isOpen: !props.modal.isOpen })}
+                >
+                  확인
+                </Button>
+            </ModalFooter>
+          </Modal>
+        </div>
        {/* <div className='sm-txt mt-1'>이미지 최적 크기 300*300</div> */}
      </Media>
    </Media>
--- a/src/components/basis/group/BasisGroupApprovalSearch.js
+++ b/src/components/basis/group/BasisGroupApprovalSearch.js
@ -26,30 +26,88 @@ import { useEffect, useState } from 'react';
 import moment from 'moment';

 export const BasisGroupApprovalSearch = props => {
-  const [isCheckBox, setIsCheckBox] = useState({
-    all: true,
-    yes: false,
-    no: false
-  });
+  // const [isCheckBox, setIsCheckBox] = useState({
+  //   all: true,
+  //   yes: false,
+  //   no: false
+  // });

-  useEffect(() => {
-    let aprvYn = '';
+  // useEffect(() => {
+  //   let aprvYn = '';

-    if (!isCheckBox.all) {
-      if (isCheckBox.yes) {
-        aprvYn = 'Y';
-      } else if (isCheckBox.no) {
-        aprvYn = 'N';
-      } else {
-        aprvYn = '-';
-      }
+  //   if (!isCheckBox.all) {
+  //     if (isCheckBox.yes) {
+  //       aprvYn = 'Y';
+  //     } else if (isCheckBox.no) {
+  //       aprvYn = 'N';
+  //     } else {
+  //       aprvYn = '-';
+  //     }
+  //   }
+  //   props.setParams({
+  //     ...props.params,
+  //     aprvYn: aprvYn
+  //   });
+  // }, [isCheckBox]);
+  let aprvYn='N';
+  const initCheckState = {
+    'all': aprvYn == 'A',
+    'yes': (aprvYn == 'Y' || aprvYn == 'A'),
+    'no': (aprvYn == 'N' || aprvYn == 'A'),
+  }
+  const [checkState, setCheckState] = useState(initCheckState);
+
+  const handleChangeCheckbox = (e) => {
+    const {name, value, checked} = e.target;
+    let val;
+    switch(value) {
+      case 'A' :
+        val = checked ? '' : '-';
+        props.setParams({
+          ...props.params,
+          aprvYn: val
+        })
+        setCheckState({
+          'all': checked,
+          'yes': checked,
+          'no': checked
+        })
+        break;
+      case 'Y':
+        if (checked && checkState.no) val = ''
+        else if (checked && !checkState.no) val = 'Y'
+        else if (!checked && checkState.no) val = 'N'
+        else if (!checked && !checkState.no) val = '-'
+        props.setParams({
+          ...props.params,
+          aprvYn: val
+        })
+        setCheckState(prevState => ({
+          'all': prevState.no && checked,
+          'yes': checked,
+          'no': prevState.no
+        }))
+        break;
+      case 'N':
+        if (checked && checkState.yes) val = ''
+        else if (checked && !checkState.yes) val = 'N'
+        else if (!checked && checkState.yes) val = 'Y'
+        else if (!checked && !checkState.yes) val = '-'
+        props.setParams({
+          ...props.params,
+          aprvYn: val
+        })
+        setCheckState(prevState => ({
+          'all': prevState.yes && checked,
+          'yes': prevState.yes,
+          'no': checked
+        }))
+        break;
+      default:
+        break;
    }
+  }

-    props.setParams({
-      ...props.params,
-      aprvYn: aprvYn
-    });
-  }, [isCheckBox]);
  return (
    <div className='pal-card-box'>
      <Row>
@ -138,40 +196,52 @@ export const BasisGroupApprovalSearch = props => {
                            type='checkbox'
                            id='exampleCustomCheckbox'
                            label='전체'
-                            defaultChecked={isCheckBox.all}
-                            onClick={() =>
-                              setIsCheckBox({
-                                all: !isCheckBox.all,
-                                yes: !isCheckBox.all,
-                                no: !isCheckBox.all
-                              })
-                            }
+                            name='aprvlYn'
+                            value='A'
+                            checked={checkState.all}
+                            onChange={handleChangeCheckbox}
+                            // defaultChecked={isCheckBox.all}
+                            // onClick={() =>
+                            //   setIsCheckBox({
+                            //     all: !isCheckBox.all,
+                            //     yes: !isCheckBox.all,
+                            //     no: !isCheckBox.all
+                            //   })
+                            // }
                          />
                          <CustomInput
                            inline
                            type='checkbox'
                            id='exampleCustomCheckbox2'
                            label='승인'
-                            defaultChecked={isCheckBox.yes || isCheckBox.all}
-                            onClick={() =>
-                              setIsCheckBox({
-                                all: false,
-                                yes: !isCheckBox.yes
-                              })
-                            }
+                            name='aprvlYn'
+                            value='Y'
+                            checked={checkState.yes}
+                            onChange={handleChangeCheckbox}
+                            // defaultChecked={isCheckBox.yes || isCheckBox.all}
+                            // onClick={() =>
+                            //   setIsCheckBox({
+                            //     all: false,
+                            //     yes: !isCheckBox.yes
+                            //   })
+                            // }
                          />
                          <CustomInput
                            inline
                            type='checkbox'
                            id='exampleCustomCheckbox3'
                            label='미승인'
-                            defaultChecked={isCheckBox.no || isCheckBox.all}
-                            onClick={() =>
-                              setIsCheckBox({
-                                all: false,
-                                no: !isCheckBox.no
-                              })
-                            }
+                            name='aprvlYn'
+                            value='N'
+                            checked={checkState.no}
+                            onChange={handleChangeCheckbox}
+                            // defaultChecked={isCheckBox.no || isCheckBox.all}
+                            // onClick={() =>
+                            //   setIsCheckBox({
+                            //     all: false,
+                            //     no: !isCheckBox.no
+                            //   })
+                            // }
                          />
                        </div>
                      </div>
--- 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='그룹코드를 입력하세요'
--- 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'
--- a/src/components/map/google/GoogleMap.js
+++ b/src/components/map/google/GoogleMap.js
@ -49,7 +49,7 @@ export const GoogleCustomMap = () => {
    url: 'https://maps.googleapis.com/maps/api/js?v=3.exp&libraries=drawing,geometryplaces'
  };

-  console.log(`${mapProps.url}&key=${mapProps.key}`);
+  // console.log(`${mapProps.url}&key=${mapProps.key}`);
  return (
    <div style={{ width: '100vw', height: '100vh' }}>
      <GoogleMapWrapped
--- a/src/components/map/naver/draw/FlightPlanDraw_JQuery.js
+++ b/src/components/map/naver/draw/FlightPlanDraw_JQuery.js
@ -25,7 +25,7 @@ export const FlightPlanDraw = props => {
    constructor: Measure,

    setMap: function(map) {
-      console.log('setMap')
+      // console.log('setMap')
      if (this.map) {
        this._unbindMap(this.map);
      }
@ -38,7 +38,7 @@ export const FlightPlanDraw = props => {
    },

    startMode: function(mode) {
-      console.log('startMode')
+      // console.log('startMode')
      if (!mode) return;

      if (mode === 'line') {
@ -53,7 +53,7 @@ export const FlightPlanDraw = props => {
    },

    _startDistance: function() {
-      console.log('startDistance')
+      // console.log('startDistance')
      var map = this.map;
      this._distanceListeners = [
        naver.maps.Event.addListener(map, 'click', this._onClickDistance.bind(this))
@ -61,7 +61,7 @@ export const FlightPlanDraw = props => {
    },

    _startArea: function() {
-      console.log('startArea')
+      //console.log('startArea')
      var map = this.map;

      this._areaListeners = [
@ -73,7 +73,7 @@ export const FlightPlanDraw = props => {
    },

    _startCircle: function() {
-      console.log('startCircle')
+      //console.log('startCircle')
      var map = this.map;
      this._circleListeners = [
        naver.maps.Event.addListener(map, 'click', this._onClickCircle.bind(this)),
@ -82,7 +82,7 @@ export const FlightPlanDraw = props => {
    },

    _startRectangle: function() {
-      console.log('startRectangle')
+      //console.log('startRectangle')
      var map = this.map;
      this._rectangleListeners = [
        naver.maps.Event.addListener(map, 'click', this._onClickRectangle.bind(this)),
@ -91,7 +91,7 @@ export const FlightPlanDraw = props => {
    },

    _finishDistance: function() {
-      console.log('finishDistance')
+      //console.log('finishDistance')

      naver.maps.Event.removeListener(this._distanceListeners);
      delete this._distanceListeners;
@ -120,7 +120,7 @@ export const FlightPlanDraw = props => {
          obj = JSON.stringify(obj);
          polypathJSON.push(JSON.parse(obj));  
        }
-        console.log(polypathJSON, 'json polyline path')
+       // console.log(polypathJSON, 'json polyline path')


        //버퍼 생성에 필요한 coordinates 배열 변환
@ -128,7 +128,7 @@ export const FlightPlanDraw = props => {
        for(let i = 0; i < this._polyline.getPath().length; i++) {
          lineStringPaths.push([this._polyline.getPath()._array[i].x, this._polyline.getPath()._array[i].y]);
        }
-        console.log(lineStringPaths, 'polyline path')
+       // console.log(lineStringPaths, 'polyline path')

        //버퍼 생성을 위한 line 객체
        const originalGeojson = {
@ -144,14 +144,14 @@ export const FlightPlanDraw = props => {
            }
          ]
        };
-        console.log(originalGeojson)
+       // console.log(originalGeojson)

        //버퍼 객체
        const bufferObj = buffer(originalGeojson, 50, {units:'meters'});

        //버퍼 라인 생성
        let bufferPath = bufferObj.features[0].geometry.coordinates[0];
-        console.log(bufferPath, 'buffer path')
+       // console.log(bufferPath, 'buffer path')

        this.bufferPolyline = new naver.maps.Polyline({
          strokeColor: '#ff0000',
@ -174,7 +174,7 @@ export const FlightPlanDraw = props => {
    },

    _finishArea: function() {
-      console.log('finishArea')
+     // console.log('finishArea')
      naver.maps.Event.removeListener(this._areaListeners);
      delete this._areaListeners;

@ -193,7 +193,7 @@ export const FlightPlanDraw = props => {
    },

    _finishCircle: function() {
-      console.log('finishCircle')
+     // console.log('finishCircle')

      naver.maps.Event.removeListener(this._circleListeners);
      delete this._circleListeners;
@ -219,7 +219,7 @@ export const FlightPlanDraw = props => {
    },

    _finishRectangle: function() {
-      console.log('finishRectangle')
+     // console.log('finishRectangle')

      naver.maps.Event.removeListener(this._rectangleListeners);
      delete this._rectangleListeners;
@ -237,7 +237,7 @@ export const FlightPlanDraw = props => {
    },

    finishMode: function(mode) {
-      console.log('finishMode')
+     // console.log('finishMode')
      if (!mode) return;

      if (mode === 'line') {
@ -297,7 +297,7 @@ export const FlightPlanDraw = props => {
    },

    _onClickDistance: function(e) {
-      console.log('onClickDistance')
+     // console.log('onClickDistance')
      var map = this.map,
        coord = e.coord;

@ -342,7 +342,7 @@ export const FlightPlanDraw = props => {
    },

    _onMouseMoveDistance: function(e) {
-      console.log('onMouseMoveDistance')
+     // console.log('onMouseMoveDistance')
      var map = this.map,
          proj = this.map.getProjection(),
          coord = proj.fromPageXYToCoord(new naver.maps.Point(e.pageX, e.pageY)),
@ -358,7 +358,7 @@ export const FlightPlanDraw = props => {
    },

    _onClickArea: function(e) {
-      console.log('onClickArea')
+     // console.log('onClickArea')
      var map = this.map,
        coord = e.coord;

@ -376,7 +376,7 @@ export const FlightPlanDraw = props => {
    },

    _onMouseMoveArea: function(e) {
-      console.log('onMouseMoveArea')
+     // console.log('onMouseMoveArea')
      if (!this._polygon) return;

      var map = this.map,
@ -392,7 +392,7 @@ export const FlightPlanDraw = props => {
    },

    _onClickCircle: function(e) {
-      console.log('onClickCircle')
+     // console.log('onClickCircle')
      var map = this.map,
        coord = e.coord;

@ -449,7 +449,7 @@ export const FlightPlanDraw = props => {
    },

    _onMouseMoveCircle: function(e) {
-      console.log('onMouseMoveCircle')
+     // console.log('onMouseMoveCircle')
      if(!this._circle) return;

      var map = this.map,
@ -467,7 +467,7 @@ export const FlightPlanDraw = props => {
    },

    _onClickRectangle: function(e) {
-      console.log('onClickRectangle')
+     // console.log('onClickRectangle')
      var map = this.map,
        coord = e.coord;
      
@ -510,7 +510,7 @@ export const FlightPlanDraw = props => {
    },

    _onMouseMoveRectangle: function(e) {
-      console.log('onMouseMoveRectangle')
+     // console.log('onMouseMoveRectangle')
      if(!this._rectangle) return;

      var map = this.map,
@ -524,16 +524,16 @@ export const FlightPlanDraw = props => {
    },

    _bindMap: function(map) {
-      console.log('bindMap')
+     // console.log('bindMap')
    },

    _unbindMap: function() {
-      console.log('unbindMap')
+     // console.log('unbindMap')
      this.unbindAll();
    },

    _bindDOMEvents: function() {
-      console.log('bindDOMEvents')
+     // console.log('bindDOMEvents')
      this.$btnLine.on('click.measure', this._onClickButton.bind(this, 'line'));
      this.$btnPolygon.on('click.measure', this._onClickButton.bind(this, 'polygon'));
      this.$btnCircle.on('click.measure', this._onClickButton.bind(this, 'circle'));
@ -543,7 +543,7 @@ export const FlightPlanDraw = props => {

    _onClickButton: function(newMode, e) {
      //newMode는 방금 클릭한 값(line, polygon, circle...)
-      console.log('onClickButton')
+     // console.log('onClickButton')
      e.preventDefault();

      var btn = $(e.target),
@ -552,10 +552,10 @@ export const FlightPlanDraw = props => {
      //this._mode는 클릭하기 전 값(첫 클릭이면 null)

      if (btn.hasClass('control-on')) {
-        console.log('remove')
+       // console.log('remove')
        btn.removeClass('control-on');
      } else {
-        console.log('add')
+       // console.log('add')
        btn.addClass('control-on');
      }

@ -572,7 +572,7 @@ export const FlightPlanDraw = props => {
    },

    _clearMode: function(mode) {
-      console.log('clearMode')
+     // console.log('clearMode')
      if (!mode) return;

      if (mode === 'line') {
--- a/src/components/map/nhn/NMapMarker.js
+++ b/src/components/map/nhn/NMapMarker.js
@ -44,7 +44,9 @@ export const NMapMarker = props => {
      title: id,
      id: id,
      icon: {
-        url: DronIcon
+        url: DronIcon,
+        origin: new naver.maps.Point(0,0),
+        anchor: new naver.maps.Point(15, 15),
      }
    });
    props.map.setCenter(position);
--- a/src/components/mapDraw/google/GoogleMap.js
+++ b/src/components/mapDraw/google/GoogleMap.js
@ -18,7 +18,7 @@ const MapInit = () => {
  const [bounds, setBounds] = useState(null);

  useEffect(() => {
-    console.log('GoogleMap >>>>>', controlGpList);
+   // console.log('GoogleMap >>>>>', controlGpList);
  }, [controlGpList]);
  const onSearchBoxMounted = () => {};

@ -50,7 +50,7 @@ export const GoogleCustomMap = () => {
    url: 'https://maps.googleapis.com/maps/api/js?v=3.exp&libraries=drawing,geometryplaces'
  };

-  console.log(`${mapProps.url}&key=${mapProps.key}`);
+ // console.log(`${mapProps.url}&key=${mapProps.key}`);
  return (
    <div style={{ width: '100vw', height: '100vh' }}>
      <GoogleMapWrapped
--- a/src/components/mapDraw/naver/draw/DrawMap.js
+++ b/src/components/mapDraw/naver/draw/DrawMap.js
@ -101,12 +101,12 @@ export const DrawMap = props => {

  const addEvent = (drawingManager) => { 
    drawingManager.addListener('drawing_added', function(overlay) {
-      console.log(overlay)
-      if(overlay.OVERLAY_TYPE === 'Polygon') {
-        console.log(overlay.paths._array[0]._array)
-      } else if(overlay.OVERLAY_TYPE === 'Ellipse') {
-        console.log(overlay.bounds)
-      }
+     // console.log(overlay)
+      // if(overlay.OVERLAY_TYPE === 'Polygon') {
+      //   console.log(overlay.paths._array[0]._array)
+      // } else if(overlay.OVERLAY_TYPE === 'Ellipse') {
+      //   console.log(overlay.bounds)
+      // }
      setOverlay(prev=> ([...prev, overlay]));
    });
  }
--- a/src/components/mapDraw/naver/draw/JQueryDraw.js
+++ b/src/components/mapDraw/naver/draw/JQueryDraw.js
@ -23,7 +23,7 @@ export const JQueryDraw = props => {
    constructor: Measure,

    setMap: function(map) {
-      console.log('setMap')
+     // console.log('setMap')
      if (this.map) {
        this._unbindMap(this.map);
      }
@ -36,7 +36,7 @@ export const JQueryDraw = props => {
    },

    startMode: function(mode) {
-      console.log('startMode')
+     // console.log('startMode')
      if (!mode) return;

      if (mode === 'line') {
@ -51,7 +51,7 @@ export const JQueryDraw = props => {
    },

    _startDistance: function() {
-      console.log('startDistance')
+     // console.log('startDistance')
      var map = this.map;
      this._distanceListeners = [
        naver.maps.Event.addListener(map, 'click', this._onClickDistance.bind(this))
@ -59,7 +59,7 @@ export const JQueryDraw = props => {
    },

    _startArea: function() {
-      console.log('startArea')
+     // console.log('startArea')
      var map = this.map;

      this._areaListeners = [
@ -71,7 +71,7 @@ export const JQueryDraw = props => {
    },

    _startCircle: function() {
-      console.log('startCircle')
+     // console.log('startCircle')
      var map = this.map;
      this._circleListeners = [
        naver.maps.Event.addListener(map, 'click', this._onClickCircle.bind(this)),
@ -80,7 +80,7 @@ export const JQueryDraw = props => {
    },

    _startRectangle: function() {
-      console.log('startRectangle')
+     // console.log('startRectangle')
      var map = this.map;
      this._rectangleListeners = [
        naver.maps.Event.addListener(map, 'click', this._onClickRectangle.bind(this)),
@ -89,7 +89,7 @@ export const JQueryDraw = props => {
    },

    _finishDistance: function() {
-      console.log('finishDistance')
+     // console.log('finishDistance')

      naver.maps.Event.removeListener(this._distanceListeners);
      delete this._distanceListeners;
@ -118,7 +118,7 @@ export const JQueryDraw = props => {
          obj = JSON.stringify(obj);
          polypathJSON.push(JSON.parse(obj));  
        }
-        console.log(polypathJSON, 'json polyline path')
+       // console.log(polypathJSON, 'json polyline path')


        //버퍼 생성에 필요한 coordinates 배열 변환
@ -126,7 +126,7 @@ export const JQueryDraw = props => {
        for(let i = 0; i < this._polyline.getPath().length; i++) {
          lineStringPaths.push([this._polyline.getPath()._array[i].x, this._polyline.getPath()._array[i].y]);
        }
-        console.log(lineStringPaths, 'polyline path')
+       // console.log(lineStringPaths, 'polyline path')

        //버퍼 생성을 위한 line 객체
        const originalGeojson = {
@ -142,14 +142,14 @@ export const JQueryDraw = props => {
            }
          ]
        };
-        console.log(originalGeojson)
+       // console.log(originalGeojson)

        //버퍼 객체
        const bufferObj = buffer(originalGeojson, 50, {units:'meters'});

        //버퍼 라인 생성
        let bufferPath = bufferObj.features[0].geometry.coordinates[0];
-        console.log(bufferPath, 'buffer path')
+       // console.log(bufferPath, 'buffer path')

        this.bufferPolyline = new naver.maps.Polyline({
          strokeColor: '#ff0000',
@ -172,7 +172,7 @@ export const JQueryDraw = props => {
    },

    _finishArea: function() {
-      console.log('finishArea')
+     // console.log('finishArea')
      naver.maps.Event.removeListener(this._areaListeners);
      delete this._areaListeners;

@ -191,7 +191,7 @@ export const JQueryDraw = props => {
    },

    _finishCircle: function() {
-      console.log('finishCircle')
+     // console.log('finishCircle')

      naver.maps.Event.removeListener(this._circleListeners);
      delete this._circleListeners;
@ -217,7 +217,7 @@ export const JQueryDraw = props => {
    },

    _finishRectangle: function() {
-      console.log('finishRectangle')
+     // console.log('finishRectangle')

      naver.maps.Event.removeListener(this._rectangleListeners);
      delete this._rectangleListeners;
@ -235,7 +235,7 @@ export const JQueryDraw = props => {
    },

    finishMode: function(mode) {
-      console.log('finishMode')
+     // console.log('finishMode')
      if (!mode) return;

      if (mode === 'line') {
@ -295,7 +295,7 @@ export const JQueryDraw = props => {
    },

    _onClickDistance: function(e) {
-      console.log('onClickDistance')
+     // console.log('onClickDistance')
      var map = this.map,
        coord = e.coord;

@ -340,7 +340,7 @@ export const JQueryDraw = props => {
    },

    _onMouseMoveDistance: function(e) {
-      console.log('onMouseMoveDistance')
+     // console.log('onMouseMoveDistance')
      var map = this.map,
          proj = this.map.getProjection(),
          coord = proj.fromPageXYToCoord(new naver.maps.Point(e.pageX, e.pageY)),
@ -356,7 +356,7 @@ export const JQueryDraw = props => {
    },

    _onClickArea: function(e) {
-      console.log('onClickArea')
+     // console.log('onClickArea')
      var map = this.map,
        coord = e.coord;

@ -374,7 +374,7 @@ export const JQueryDraw = props => {
    },

    _onMouseMoveArea: function(e) {
-      console.log('onMouseMoveArea')
+     // console.log('onMouseMoveArea')
      if (!this._polygon) return;

      var map = this.map,
@ -390,7 +390,7 @@ export const JQueryDraw = props => {
    },

    _onClickCircle: function(e) {
-      console.log('onClickCircle')
+     // console.log('onClickCircle')
      var map = this.map,
        coord = e.coord;

@ -447,7 +447,7 @@ export const JQueryDraw = props => {
    },

    _onMouseMoveCircle: function(e) {
-      console.log('onMouseMoveCircle')
+     // console.log('onMouseMoveCircle')
      if(!this._circle) return;

      var map = this.map,
@ -465,7 +465,7 @@ export const JQueryDraw = props => {
    },

    _onClickRectangle: function(e) {
-      console.log('onClickRectangle')
+     // console.log('onClickRectangle')
      var map = this.map,
        coord = e.coord;
      
@ -508,7 +508,7 @@ export const JQueryDraw = props => {
    },

    _onMouseMoveRectangle: function(e) {
-      console.log('onMouseMoveRectangle')
+     // console.log('onMouseMoveRectangle')
      if(!this._rectangle) return;

      var map = this.map,
@ -522,16 +522,16 @@ export const JQueryDraw = props => {
    },

    _bindMap: function(map) {
-      console.log('bindMap')
+     // console.log('bindMap')
    },

    _unbindMap: function() {
-      console.log('unbindMap')
+     // console.log('unbindMap')
      this.unbindAll();
    },

    _bindDOMEvents: function() {
-      console.log('bindDOMEvents')
+     // console.log('bindDOMEvents')
      this.$btnLine.on('click.measure', this._onClickButton.bind(this, 'line'));
      this.$btnPolygon.on('click.measure', this._onClickButton.bind(this, 'polygon'));
      this.$btnCircle.on('click.measure', this._onClickButton.bind(this, 'circle'));
@ -541,7 +541,7 @@ export const JQueryDraw = props => {

    _onClickButton: function(newMode, e) {
      //newMode는 방금 클릭한 값(line, polygon, circle...)
-      console.log('onClickButton')
+     // console.log('onClickButton')
      e.preventDefault();

      var btn = $(e.target),
@ -550,10 +550,10 @@ export const JQueryDraw = props => {
      //this._mode는 클릭하기 전 값(첫 클릭이면 null)

      if (btn.hasClass('control-on')) {
-        console.log('remove')
+       // console.log('remove')
        btn.removeClass('control-on');
      } else {
-        console.log('add')
+       // console.log('add')
        btn.addClass('control-on');
      }

@ -570,7 +570,7 @@ export const JQueryDraw = props => {
    },

    _clearMode: function(mode) {
-      console.log('clearMode')
+     // console.log('clearMode')
      if (!mode) return;

      if (mode === 'line') {
--- a/src/components/mapDraw/naver/dron/DronMarker.js
+++ b/src/components/mapDraw/naver/dron/DronMarker.js
@ -26,7 +26,7 @@ export const DronMarker = props => {
  }, [controlGpList]);

  useEffect(() => {
-    console.log('>>>>>>>>>>>>>>>>', objectId, isClickObject);
+   // console.log('>>>>>>>>>>>>>>>>', objectId, isClickObject);

    props.arrMarkers.map(clickMarker => {
      if (objectId === clickMarker.id && isClickObject) {
@ -43,7 +43,7 @@ export const DronMarker = props => {
  useEffect(() => {
    props.arrMarkers.map(clickMarker => {
      if (objectId === clickMarker.id) {
-        console.log(clickMarker);
+       // console.log(clickMarker);
        props.map.setCenter(clickMarker.getPosition());
        // $('#btn_modal').click();
        props.map.setZoom(13, true);
@ -94,7 +94,7 @@ export const DronMarker = props => {
    // console.log(marker.id);
    const markerId = marker.id;
    const contorlId = marker.controlId;
-    console.log('contorlId ::::::::::< ', marker.controlId);
+   // console.log('contorlId ::::::::::< ', marker.controlId);
    //히스토리 불러오기

    dispatch(objectClickAction(markerId));
--- a/src/components/mapDraw/naver/feature/FeatureAirZone.js
+++ b/src/components/mapDraw/naver/feature/FeatureAirZone.js
@ -122,7 +122,7 @@ export const FeatureAirZone = props => {
  const featureAirEvent = () => {
    props.map.data.addListener('click', function (e) {
      //   e.feature.setProperty('isColorful', true);
-      console.log(e.feature.property_name);
+     // console.log(e.feature.property_name);
    });

    props.map.data.addListener('mouseover', function (e) {
--- a/src/components/mapDraw/naver/search/NaverMapSearch.js
+++ b/src/components/mapDraw/naver/search/NaverMapSearch.js
@ -2,7 +2,7 @@ import { useEffect } from 'react';

 export const NaverMapSearch = props => {
  useEffect(() => {
-    console.log('>>>>', props.naver.maps.Service);
+   // console.log('>>>>', props.naver.maps.Service);
    props.naver.maps.Service.geocode(
      {
        address: '산곡동'
@ -14,7 +14,7 @@ export const NaverMapSearch = props => {

        var result = response.result, // 검색 결과의 컨테이너
          items = result.items; // 검색 결과의 배열
-        console.log(result);
+       // console.log(result);

        // do Something
      }
--- 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 = () => {
          <div className='pal-card'>
            <AccountFindTab  />
          </div>
+          <div className='user-search-link'>
+            <Button.Ripple
+              color='flat-warning'
+              onClick={handlerRegister}
+            >
+              회원가입 바로가기
+            </Button.Ripple>
+          </div>
        </div>
      </div>
    </>
--- a/src/containers/analysis/simulator/AnalysisSimulationContainer.js
+++ b/src/containers/analysis/simulator/AnalysisSimulationContainer.js
@ -96,7 +96,7 @@ export const AnalysisSimulationContainer = props => {
        setTimeCd(moment(log[playCount]?.srvrRcvDt).format('HH:mm'));
      }

-      console.log('sliderCount>>>>', sliderCount);
+     // console.log('sliderCount>>>>', sliderCount);
    }
  }, [sliderCount]);

--- 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,7 +101,21 @@ export const BasisDronDetailContainer = props => {
  const handlerImageChange = e => {
    const reader = new FileReader(),
      files = e.target.files;
-    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 = () => {
@ -148,6 +167,8 @@ export const BasisDronDetailContainer = props => {
          handlerImageDelete={handlerImageDelete}
          data={register}
          img={img}
+          modal={modal}
+          setModal={setModal}
        />
      </Col>
      <Col md={7} lg={9}>
--- a/src/containers/basis/group/BasisGroupApprovalContainer.js
+++ b/src/containers/basis/group/BasisGroupApprovalContainer.js
@ -8,6 +8,7 @@ import { CustomMainLayout } from '../../../components/layout/CustomMainLayout';
 import { ConfirmModal } from '../../../components/modal/ConfirmModal';
 import * as Actions from '../../../modules/basis/group/actions/basisGroupAction';

+
 export const BasisGroupApprovalContainer = props => {
  const { aprvList, aprvCount } = useSelector(state => state.groupState);

@ -126,16 +127,19 @@ export const BasisGroupApprovalContainer = props => {
    }
  ];

+
  useEffect(() => {
    if (user?.cstmrSno) {
      setParams({
        ...params,
-        cstmrSno: user?.cstmrSno
+        cstmrSno: user?.cstmrSno,
+        aprvYn: 'N'
      });

      dispatch(
        Actions.APPROVAL_LIST.request({
-          searchParams: { cstmrSno: user?.cstmrSno }
+          searchParams: { cstmrSno: user?.cstmrSno, aprvYn: 'N'}
+          //  searchParams: params 
        })
      );
    }
@ -147,9 +151,6 @@ export const BasisGroupApprovalContainer = props => {
    }
  };

-  useEffect(() => {
-  }, [params]);
-
  const handlerSearch = () => {
    dispatch(Actions.APPROVAL_LIST.request({ searchParams: params }));
  };
@ -198,10 +199,10 @@ export const BasisGroupApprovalContainer = props => {
    <CustomMainLayout title={titleName}>
      <BasisGroupApprovalSearch
        handlerInput={handlerInput}
-        handlerSearch={handlerSearch}
-        params={params}
        onKeyPress={onKeyPress}
+        params={params}
        setParams={setParams}
+        handlerSearch={handlerSearch}
      />

      <BasisGroupApprovalGrid
--- a/src/containers/system/auth/SystemAuthContainer.js
+++ b/src/containers/system/auth/SystemAuthContainer.js
@ -91,7 +91,7 @@ export const SystemAuthContainer = props => {
  };

  const handlerWidthrowConfirm = () => {
-    console.log('탈퇴!!!');
+   // console.log('탈퇴!!!');
  };

  const handlerGroupJoin = () => {
--- a/src/containers/system/user/SystemUserContainer.js
+++ b/src/containers/system/user/SystemUserContainer.js
@ -93,7 +93,7 @@ export const SystemUserContainer = props => {
  };

  const handlerWidthrowConfirm = () => {
-    console.log('탈퇴!!!');
+   // console.log('탈퇴!!!');
  };

  const handlerGroupJoin = () => {
--- a/src/modules/account/find/sagas/findSaga.ts
+++ b/src/modules/account/find/sagas/findSaga.ts
@ -52,7 +52,6 @@ function* updatePwSaga(
    const {userId, hpno, newPw} = action.payload;

    const res = yield call(findAPI.updatePw, {userId, hpno, newPw});
-    console.log(res, '>>>')
    yield put(Actions.updatePwAction.success(res));
  } catch (error) {
    yield put(Actions.updatePwAction.failure(error));
--- a/src/modules/account/login/sagas/authSaga.ts
+++ b/src/modules/account/login/sagas/authSaga.ts
@ -139,7 +139,7 @@ function* userPageSaga(
    const controlId = action.payload;

    const { data } = yield call(authAPI.getUserPage, controlId);
-    console.log('userPageData : ', data)
+   // console.log('userPageData : ', data)
    yield put(Actions.userPageAction.success(data));
  } catch (error) {
    yield put(Actions.userPageAction.failure(error));
@ -189,7 +189,7 @@ function* userPwSaga(
  try{
    const { data,errorCode } = yield call(authAPI.pwupdate, param);
    //yield put(Actions.pwUpdateAction.success(data));
-    console.log("saaa",data);  
+   // console.log("saaa",data);  
    if (data.errorCode==='-1') {
      yield put(
          MessageActions.IS_ERROR({
--- a/src/modules/account/login/service/jwtTokenUtil.ts
+++ b/src/modules/account/login/service/jwtTokenUtil.ts
@ -68,7 +68,7 @@ const refreshTokenAPI = async (cstmrSno: number, refreshToken: string) => {
  })
    .then(response => response.json())
    .catch(error => {
-      console.log('>>>>error ', error);
+     // console.log('>>>>error ', error);
    });

  return result;
@ -76,7 +76,7 @@ const refreshTokenAPI = async (cstmrSno: number, refreshToken: string) => {

 export const getRefreshToken = () => {
  const token = cookieStorage.getCookie(COOKIE_REFRESH_TOKEN);
-  console.log('token::::::::::', token);
+ // console.log('token::::::::::', token);
  if (
    !token ||
    token == undefined ||
--- a/src/modules/analysis/history/reducers/analysisHitoryReducer.ts
+++ b/src/modules/analysis/history/reducers/analysisHitoryReducer.ts
@ -33,7 +33,6 @@ export const analysisHistoryReducer = createReducer<
  )
  .handleAction(Actions.detail.success, (state, action) =>
    produce(state, draft => {
-      console.log('>>111>>>', action.payload);
      const { detail } = action.payload;

      draft.detail = detail;
--- 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({
--- a/src/modules/utils/customAxiosUtil.ts
+++ b/src/modules/utils/customAxiosUtil.ts
@ -21,7 +21,7 @@ clientInstance.interceptors.request.use(
    return config;
  },
  error => {
-    console.log(error);
+   // console.log(error);
    return Promise.reject(error);
  }
 );
@ -49,7 +49,7 @@ clientInstance.interceptors.response.use(
      // window.location.href = '/account/login';
      store.dispatch(Actions.logout.request());
    } else {
-      console.log('서버 응답에 실패 하였습니다.');
+     // console.log('서버 응답에 실패 하였습니다.');
    }

    return Promise.reject(error);
--- a/src/redux/reducers/navbar/index.js
+++ b/src/redux/reducers/navbar/index.js
@ -27,7 +27,7 @@ const navbarReducer = (state = initialState, action) => {
        }
      });
    case 'CLICK_HEADER_MENU':
-      console.log('action>>>>', action);
+     // console.log('action>>>>', action);
      // ** Get index to add or remove bookmark from array
      const bookmarkIndex = state.bookmarks.findIndex(x => x.id === action.id);

--- a/src/utility/hooks/useFooterType.js
+++ b/src/utility/hooks/useFooterType.js
@ -11,7 +11,7 @@ export const useFooterType = () => {
      return themeConfig.layout.footer.type
    } catch (error) {
      // ** If error also initialValue
-      console.log(error)
+     // console.log(error)
      return themeConfig.layout.footer.type
    }
  })
@ -26,7 +26,7 @@ export const useFooterType = () => {
      setFooterType(valueToStore)
    } catch (error) {
      // ** A more advanced implementation would handle the error case
-      console.log(error)
+     // console.log(error)
    }
  }

--- a/src/utility/hooks/useLayout.js
+++ b/src/utility/hooks/useLayout.js
@ -12,7 +12,7 @@ export const useLayout = () => {
      return themeConfig.layout.type
    } catch (error) {
      // ** If error return initialValue
-      console.log(error)
+     // console.log(error)
      return themeConfig.layout.type
    }
  })
@ -27,7 +27,7 @@ export const useLayout = () => {
      setLayout(valueToStore)
    } catch (error) {
      // ** A more advanced implementation would handle the error case
-      console.log(error)
+     // console.log(error)
    }
  }

--- a/src/utility/hooks/useNavbarColor.js
+++ b/src/utility/hooks/useNavbarColor.js
@ -11,7 +11,7 @@ export const useNavbarColor = () => {
      return themeConfig.layout.navbar.backgroundColor
    } catch (error) {
      // ** If error return initialValue
-      console.log(error)
+     // console.log(error)
      return themeConfig.layout.navbar.backgroundColor
    }
  })
@ -26,7 +26,7 @@ export const useNavbarColor = () => {
      setNavbarColor(valueToStore)
    } catch (error) {
      // ** A more advanced implementation would handle the error case
-      console.log(error)
+     // console.log(error)
    }
  }

--- a/src/utility/hooks/useNavbarType.js
+++ b/src/utility/hooks/useNavbarType.js
@ -11,7 +11,7 @@ export const useNavbarType = () => {
      return themeConfig.layout.navbar.type
    } catch (error) {
      // ** If error return initialValue
-      console.log(error)
+     // console.log(error)
      return themeConfig.layout.navbar.type
    }
  })
@ -26,7 +26,7 @@ export const useNavbarType = () => {
      setNavbarType(valueToStore)
    } catch (error) {
      // ** A more advanced implementation would handle the error case
-      console.log(error)
+     // console.log(error)
    }
  }

--- a/src/utility/hooks/useRTL.js
+++ b/src/utility/hooks/useRTL.js
@ -18,7 +18,7 @@ export const useRTL = () => {
      dispatch(handleRTL(valueToStore))
    } catch (error) {
      // ** A more advanced implementation would handle the error case
-      console.log(error)
+     // console.log(error)
    }
  }

--- a/src/utility/hooks/useRouterTransition.js
+++ b/src/utility/hooks/useRouterTransition.js
@ -11,7 +11,7 @@ export const useRouterTransition = () => {
      return themeConfig.layout.routerTransition
    } catch (error) {
      // ** If error return initialValue
-      console.log(error)
+     // console.log(error)
      return themeConfig.layout.routerTransition
    }
  })
@ -26,7 +26,7 @@ export const useRouterTransition = () => {
      setTransition(valueToStore)
    } catch (error) {
      // ** A more advanced implementation would handle the error case
-      console.log(error)
+     // console.log(error)
    }
  }

--- a/src/utility/hooks/useSkin.js
+++ b/src/utility/hooks/useSkin.js
@ -14,7 +14,7 @@ export const useSkin = () => {
      return item ? JSON.parse(item) : themeConfig.layout.skin
    } catch (error) {
      // ** If error also return initialValue
-      console.log(error)
+     // console.log(error)
      return themeConfig.layout.skin
    }
  })
@ -30,7 +30,7 @@ export const useSkin = () => {
      window.localStorage.setItem('skin', JSON.stringify(valueToStore))
    } catch (error) {
      // ** A more advanced implementation would handle the error case
-      console.log(error)
+     // console.log(error)
    }
  }

--- a/src/views/control/main/ControlMain.js
+++ b/src/views/control/main/ControlMain.js
@ -62,7 +62,7 @@ const ControlMain = () => {
  };

  const openReportDetailParam = val => {
-    console.log(val);
+   // console.log(val);
    setOpenReportDetail(true);
  };

--- a/src/views/testDraw/main/ControlMainDraw.js
+++ b/src/views/testDraw/main/ControlMainDraw.js
@ -63,7 +63,7 @@ const ControlMainDraw = () => {
  };

  const openReportDetailParam = val => {
-    console.log(val);
+   // console.log(val);
    setOpenReportDetail(true);
  };

--- a/src/views/testDraw/report/ControlReportList.js
+++ b/src/views/testDraw/report/ControlReportList.js
@ -63,7 +63,7 @@ const ControlReportList = props => {
          // console.log(item);

          if (item.objectId && item.objectId.indexOf(filterId) != -1) {
-            console.log(item);
+           // console.log(item);
            return (
              <div
                className='layer-content-list'
--- a/src/views/testDraw/setting/ControlSetting.js
+++ b/src/views/testDraw/setting/ControlSetting.js
@ -19,7 +19,7 @@ const ControlSetting = props => {
  const mapControl = useSelector(state => state.controlMapReducer);

  useEffect(() => {
-    console.log('>>>>', mapControl);
+   // console.log('>>>>', mapControl);
  }, [mapControl]);

  const handlerMapType = val => {