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

src/views/control/setting/ControlSetting.js

@@ -190,7 +190,7 @@ const ControlSetting = props => {
         </div>
         <button
           className='btn btn-primary laanc-btn'
-          onClick={() => history.push('/laanc/index')}
+          onClick={() => history.push(`/laanc/index?map=${true}`)}
         >
           승인요청 바로가기
         </button>

src/views/laanc/LaancStep1.js

@@ -68,10 +68,7 @@ export default function LaancStep1({
     console.log(areaCoordList, '저장상태');
   }, [areaCoordList]);
 
-  const handlerLaanc = () => {
+  console.log('>', data);
-    history.replace('/control');
-  };
-
   return (
     <>
       <ModalHeader>
@@ -315,11 +312,21 @@ export default function LaancStep1({
                     </Label>
                     <Input
                       type='text'
-                      id='test'
+                      id='selffltMethod'
-                      // value={}
+                      name='selffltMethod'
                       bssize='sm'
+                      onChange={e => {
+                        const { name, value } = e.target;
+                        handleChange({
+                          type: 'area',
+                          name,
+                          value
+                        });
+                      }}
                       placeholder='직접입력 선택 후 활성화'
-                      disabled
+                      disabled={
+                        data.areaList[0].fltMethod === '직접입력' ? false : true
+                      }
                     />
                   </FormGroup>
                 </Col>
@@ -333,7 +340,13 @@ export default function LaancStep1({
                     <Label for='test'>
                       <span className='necessary'>*</span>기체 중량
                     </Label>
-                    <Input type='select' id='test' bssize='sm' placeholder=''>
+                    <Input
+                      type='select'
+                      id='test'
+                      bssize='sm'
+                      placeholder=''
+                      value={data.arcrftList[0].arcrftWdth}
+                    >
                       <option value=''>= 선택 =</option>
                       <option value='최대이륙중량 250g 이하'>
                         = 최대이륙중량 250g 이하 =
@@ -373,9 +386,9 @@ export default function LaancStep1({
                     >
                       <option value=''>= 선택 =</option>
                       <option>무인 비행기</option>
-                      <option>무인 헬리콥터</option>
-                      <option>무인 멀티콥터</option>
                       <option>무인 비행선</option>
+                      <option>무인 멀티콥터</option>
+                      <option>무인 헬리콥터</option>
                     </Input>
                   </FormGroup>
                 </Col>
@@ -410,7 +423,8 @@ export default function LaancStep1({
         </div>
         <div>
           <div className='ti'>
-            <Button bssize='sm' onClick={() => setCenteredModal(true)}>
+            비행 구역 설정
+            <Button size='sm' onClick={() => setCenteredModal(!centeredModal)}>
               자세히보기
             </Button>
           </div>