From b17e9d0023842c65bacbc0e8d4d50ad47de13f33 Mon Sep 17 00:00:00 2001
From: sanguu <sanguu516@naver.com>
Date: Thu, 25 Aug 2022 15:54:46 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A1=B0=EC=A2=85=EC=82=AC=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C,=EA=B8=B0=EC=B2=B4=20=EC=A1=B0=ED=9A=8C(=EC=A7=80?=
 =?UTF-8?q?=EC=9D=80=EB=8C=80=EB=A6=AC=EB=8B=98)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/custom.css                     |  6 --
 .../basis/flight/plan/FlightPlanAreaMap.js    | 53 ++++++++----
 .../basis/flight/plan/FlightPlanForm.js       | 86 +++++++++----------
 3 files changed, 79 insertions(+), 66 deletions(-)

diff --git a/src/assets/css/custom.css b/src/assets/css/custom.css
index b3772b7..7afb0e1 100644
--- a/src/assets/css/custom.css
+++ b/src/assets/css/custom.css
@@ -191,12 +191,6 @@ button{border:0;background:transparent;}
 .tab-content{display:none;}
 .tab-content.active{display:block;}
 
-/*비행계획서 신청 버튼 css*/
-.arcrft-del-btn{float:right;margin-top: -39px;margin-right: 70px;
-}
-#ownerNm{width : 250px;}
-#email{width : 300px}
-.pilot-del-btn{float: right;margin-top: -39px;margin-right: 140px;}
 /*날씨상세정보*/
 .layer-weather-box{color:#bbb;}
 .layer-weather-box .layer-weather-table table{border:1px solid #404656;}
diff --git a/src/components/basis/flight/plan/FlightPlanAreaMap.js b/src/components/basis/flight/plan/FlightPlanAreaMap.js
index d528ccf..bd317be 100644
--- a/src/components/basis/flight/plan/FlightPlanAreaMap.js
+++ b/src/components/basis/flight/plan/FlightPlanAreaMap.js
@@ -44,24 +44,43 @@ const FlightPlanAreaMap = (props) => {
         setMode(mapControl.drawType)
        
     }
-
+    //console.log("상현>>",mapAreaCoordList[0].coordList[0].lat);
+    console.log("상현>>",map);
     const NaverMapInit = () => {
-        const mapOptions = {
-            // center: new naver.maps.LatLng(36.56793936069445, 127.85101412107547),
-            center: new naver.maps.LatLng(37.520357, 126.610166),
-            // zoom: 10,
-            zoom: 15,
-            zoomControl: true,
-            mapTypeId: naver.maps.MapTypeId.NORMAL,
-            zoomControlOptions: {
-                position: naver.maps.Position.LEFT_CENTER,
-                style: naver.maps.ZoomControlStyle.SMALL
-            }
-        };
-
-        setMap(new naver.maps.Map('map', mapOptions));
-    };
-
+         if(!mapAreaCoordList[0].coordList[0].lat){
+            debugger
+            const mapOptions = {
+                center: new naver.maps.LatLng(mapAreaCoordList[0].coordList[0].lat, mapAreaCoordList[0].coordList[0].lon),
+               // center: new naver.maps.LatLng(37.520357, 126.610166),
+                //center: new naver.maps.LatLng(, ),
+                // zoom: 10,
+                zoom: 15,
+                zoomControl: true,
+                mapTypeId: naver.maps.MapTypeId.NORMAL,
+                zoomControlOptions: {
+                    position: naver.maps.Position.LEFT_CENTER,
+                    style: naver.maps.ZoomControlStyle.SMALL
+                }
+            };
+           setMap(new naver.maps.Map('map', mapOptions));
+        }
+        else if(!(mapAreaCoordList[0].coordList[0].lat)){ 
+            debugger
+            const mapOptions = {
+                // center: new naver.maps.LatLng(36.56793936069445, 127.85101412107547),
+                center: new naver.maps.LatLng(37.520357, 126.610166),
+                // zoom: 10,
+                zoom: 15,
+                zoomControl: true,
+                mapTypeId: naver.maps.MapTypeId.NORMAL,
+                zoomControlOptions: {
+                    position: naver.maps.Position.LEFT_CENTER,
+                    style: naver.maps.ZoomControlStyle.SMALL
+                    }
+            };
+            setMap(new naver.maps.Map('map', mapOptions));
+        }
+    }
     const handlerDrawType = val => {
         dispatch(drawTypeChangeAction(val));
     }; 
diff --git a/src/components/basis/flight/plan/FlightPlanForm.js b/src/components/basis/flight/plan/FlightPlanForm.js
index 2dd3f9f..3c82257 100644
--- a/src/components/basis/flight/plan/FlightPlanForm.js
+++ b/src/components/basis/flight/plan/FlightPlanForm.js
@@ -272,6 +272,27 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
                                                             조종사 조회
                                                         </Button.Ripple>
                                                     </div>
+                                                    {data.groupNm?
+                                                        (
+                                                            <Col className='pilot-del-btn' xs={12} md={2} xl={2} >
+                                                            <Button.Ripple
+                                                                color='danger'
+                                                                className='text-nowrap px-2'
+                                                                onClick={() =>
+                                                                    handleDeleteArray({ type: 'pilot', index })
+                                                                }
+                                                                outline
+                                                            >
+                                                                <X size={14} className='mr-50' />
+                                                                <span>삭제</span>
+                                                            </Button.Ripple>
+                                                            </Col>
+                                                        )
+                                                        :
+                                                        (
+                                                            <></>
+                                                        )
+                                                    }
                                                     {pilotList
                                                         ? pilotList.map((item, i) =>
                                                             <PilotForm key={i}
@@ -294,6 +315,27 @@ const FlightPlanForm = ({data, handleModal, handleChange, handleSave, handleDele
                                                             기체 조회
                                                         </Button.Ripple>
                                                     </div>
+                                                    {data.groupNm?
+                                                        (
+                                                            <Col className='arcrft-del-btn' xs={12} md={2} xl={2} >
+                                                            <Button.Ripple
+                                                                color='danger'
+                                                                className='text-nowrap px-1'
+                                                                onClick={() =>
+                                                                    handleDeleteArray({ type: 'arcrft', index })
+                                                                }
+                                                                outline
+                                                            >
+                                                                <X size={14} className='mr-50' />
+                                                                <span>삭제</span>
+                                                            </Button.Ripple>
+                                                            </Col>
+                                                        )
+                                                        :
+                                                        (
+                                                            <></>
+                                                        )
+                                                        }
                                                     {arcrftList
                                                         ? arcrftList.map((item, i) =>
                                                             <ArcrftForm key={i}
@@ -622,30 +664,9 @@ const PilotForm = ({data, handleChange, index, handleDeleteArray}) => {
                         readOnly
 
                     />
-                     {data.groupNm?
-              (
-                <Col className='pilot-del-btn' xs={12} md={2} xl={2} >
-                  <Button.Ripple
-                      color='danger'
-                      className='text-nowrap px-2'
-                      onClick={() =>
-                          handleDeleteArray({ type: 'pilot', index })
-                      }
-                      outline
-                  >
-                      <X size={14} className='mr-50' />
-                      <span>삭제</span>
-                  </Button.Ripple>
-                </Col>
-              )
-            :
-              (
-                <></>
-              )
-            }
+               
                 </FormGroup>
             </Col>
-           
         </Row>
     </div>)
 }
@@ -760,27 +781,6 @@ const ArcrftForm = ({data, handleChange, index, handleDeleteArray}) => {
                         readOnly
 
                     />
-                    {data.groupNm?
-              (
-                <Col className='arcrft-del-btn' xs={12} md={2} xl={2} >
-                  <Button.Ripple
-                      color='danger'
-                      className='text-nowrap px-1'
-                      onClick={() =>
-                          handleDeleteArray({ type: 'arcrft', index })
-                      }
-                      outline
-                  >
-                      <X size={14} className='mr-50' />
-                      <span>삭제</span>
-                  </Button.Ripple>
-                </Col>
-              )
-            :
-              (
-                <></>
-              )
-            }
                 </FormGroup>
             </Col>
             {/* {index !== 0 ?