diff --git a/src/assets/css/custom.css b/src/assets/css/custom.css index a17d685e..b3686152 100644 --- a/src/assets/css/custom.css +++ b/src/assets/css/custom.css @@ -1540,6 +1540,7 @@ h1.logo span { color: #bbb; } /* .dblock-ti{border-bottom:1px solid #bbb;padding-bottom:4px;} */ +<<<<<<< HEAD .dblock-ti span, .dblock-txt .ti { color: #f4f4f4; @@ -1552,6 +1553,11 @@ h1.logo span { .dblock-txt-list + .dblock-txt-list { margin-top: 4px; } +======= +.dblock-ti span, .dblock-txt .ti{color:#f4f4f4;font-weight:500;display:block;} +.dblock-txt{line-height: 1.2;} +.dblock-txt-list + .dblock-txt-list{margin-top:4px;} +>>>>>>> 4f7f181e911d0e99ac69642af4e531a190325090 /* .dblock-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-txt-list span { font-size: 10px; diff --git a/src/components/map/naver/dron/DronMarker.js b/src/components/map/naver/dron/DronMarker.js index fc9e80ae..02dee5fd 100644 --- a/src/components/map/naver/dron/DronMarker.js +++ b/src/components/map/naver/dron/DronMarker.js @@ -233,11 +233,15 @@ export const DronMarker = props => { // naver.maps.Event.addListener(map, 'zoom_changed', function (zoom) { // const a = document.getElementsByClassName('dblock-box'); - // console.log(zoom * 10); - // console.log(zoom); + // for (let i = 0; i < a.length; i++) { - // a[i].style.width = `${zoom * 10 + 20}px`; - // a[i].style.fontSize = `${zoom}px`; + // if (zoom <= 9) { + // a[i].style.display = 'none'; + // } else { + // a[i].style.display = 'block'; + // a[i].style.width = `${zoom * 10 + 20}px`; + // a[i].style.fontSize = `${zoom}px`; + // } // } // // console.log(document.getElementsByClassName('dblock-box')); // // document.querySelector('.dblock-box').style.width = `${zoom * 10}px`; @@ -308,22 +312,20 @@ export const DronMarker = props => { info.setPosition(position, info); // info._element.html(`
${info?._id} // ${item?.speed}${item?.speedType} | ${item?.elev}${item?.elevType} | ${item?.heading}
`); - info._element.html(` -
- ${info?._id} -
-
-
- ${item?.speed}${ - item?.speedType - } | ${item?.elev}${item?.elevType} | ${item?.heading} - ${(item?.lat).toFixed( - 6 - )} | ${(item?.lng).toFixed(6)} + info._element.html(` + +
+ ${info?._id} +
+
+
+ ${item?.elev}M + ${item?.speed}km + ${(item?.lat).toFixed(6)} ${(item?.lng).toFixed(6)}
-
+ + `); } }; @@ -383,24 +385,18 @@ export const DronMarker = props => { const infoInit = (marker, gps, idx) => { CustomOverlay = function (options) { this._element = $(` - -
-
- ${marker?.id} -
-
-
- ${gps?.speed}${ - gps?.speedType - } | ${gps?.elev}${gps?.elevType} | ${gps?.heading} - ${(gps?.lat).toFixed( - 6 - )} | ${(gps?.lng).toFixed(6)} +
+
+ ${marker?.id} +
+
+
+ ${gps?.elev}M + ${gps?.speed}km + ${(gps?.lat).toFixed(6)} ${(gps?.lng).toFixed(6)}
-
`); // this._element = $(`