diff --git a/src/assets/css/custom.css b/src/assets/css/custom.css index 84834457..b44bdb65 100644 --- a/src/assets/css/custom.css +++ b/src/assets/css/custom.css @@ -414,6 +414,12 @@ h1.logo span{display:block;color:#f4f4f4;font-weight:bold;letter-spacing:2px;fon .tooltip-txt-list + .tooltip-txt-list{margin-top:4px;} .tooltip-box .arrow {position:absolute;bottom:-10px;left:50%;transform: translateX(-50%);display:block;width: 0px;height: 0px;border-top:10px solid #283046;border-bottom:10px solid none;border-right: 10px solid transparent;border-left: 10px solid transparent;} +/* 데이터블록 */ +.dblock-box{background:#283046;padding:10px;border-radius:6px;position:absolute;} +.dblock-box div{text-align:left;font-size:10px;color:#bbb;} +.dblock-ti span, .block-txt .ti{color:#f4f4f4;font-weight:500;display:block;} +.dblock-txt{padding-top:4px;} + /*회원가입*/ .pal-register .auth-wrapper.auth-v1 .auth-inner{max-width:1200px;} .pal-register .content-header .sub-txt{display:block;margin-bottom:1rem;} diff --git a/src/components/map/naver/dron/DronMarker.js b/src/components/map/naver/dron/DronMarker.js index 6733b78f..522f20e4 100644 --- a/src/components/map/naver/dron/DronMarker.js +++ b/src/components/map/naver/dron/DronMarker.js @@ -23,7 +23,7 @@ export const DronMarker = props => { let CustomOverlay; useEffect(() => { - if(arrMarkers.length != 0) markerInfo(arrMarkers); + if(arrMarkers.length != 0) markerInfo(); }, [arrMarkers]) @@ -99,7 +99,6 @@ export const DronMarker = props => { anchor: new naver.maps.Point(15, 15), } }); - marker.setMap(props.map); // drone 정보 창 @@ -151,23 +150,25 @@ export const DronMarker = props => { //데이터가 없는 마커를 모두 삭제 한다. const allRemoveMarkers = () => { if (arrMarkers && controlGpList) { + arrMarkers.map(marker => { - const isExists = controlGpList.find( - item => item.objectId === marker.id + const isExists = controlGpList.find( + item => item.objectId === marker.id + ); + if (!isExists) { + removeMarkers(marker); + const arrData = arrMarkers.filter( + item => item.id != marker.id ); - if (!isExists) { - removeMarkers(marker); - const arrData = arrMarkers.filter( - item => item.id != marker.id - ); - removeArrMarkers(arrData); - - dispatch(objectUnClickAction()); - } + removeArrMarkers(arrData); + + dispatch(objectUnClickAction()); + } }); + arrInfos.map(info => { - const isExists = controlGpList.find( - item => item.objectId === info._id + const isExists = arrMarkers.find( + marker => marker.id === info._id ); if (!isExists) { removeInfos(info); @@ -176,9 +177,10 @@ export const DronMarker = props => { ); removeArrInfos(arrData); - dispatch(objectUnClickAction()); + // dispatch(objectUnClickAction()); } }); + } }; @@ -209,25 +211,34 @@ export const DronMarker = props => { const infoInit = (marker, gps, idx) => { CustomOverlay = function(options) { this._element = $(` -