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 조종사 조회 + {data.groupNm? + ( + + + handleDeleteArray({ type: 'pilot', index }) + } + outline + > + + 삭제 + + + ) + : + ( + <> + ) + } {pilotList ? pilotList.map((item, i) => + {data.groupNm? + ( + + + handleDeleteArray({ type: 'arcrft', index }) + } + outline + > + + 삭제 + + + ) + : + ( + <> + ) + } {arcrftList ? arcrftList.map((item, i) => { readOnly /> - {data.groupNm? - ( - - - handleDeleteArray({ type: 'pilot', index }) - } - outline - > - - 삭제 - - - ) - : - ( - <> - ) - } + - ) } @@ -760,27 +781,6 @@ const ArcrftForm = ({data, handleChange, index, handleDeleteArray}) => { readOnly /> - {data.groupNm? - ( - - - handleDeleteArray({ type: 'arcrft', index }) - } - outline - > - - 삭제 - - - ) - : - ( - <> - ) - } {/* {index !== 0 ?