From 05bcd217fc5be357e64a9b109a00075f3502ede4 Mon Sep 17 00:00:00 2001 From: sanguu Date: Tue, 30 Aug 2022 16:14:51 +0900 Subject: [PATCH 1/3] =?UTF-8?q?console=EC=9E=91=EC=97=85(=EC=88=98?= =?UTF-8?q?=EC=A0=95)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/containers/analysis/history/AnalysisHistoryContainer.js | 1 - src/containers/system/auth/SystemAuthContainer.js | 1 - src/containers/system/code/SystemCodeContainer.js | 1 - src/containers/system/menu/SystemMenuContainer.js | 1 - src/containers/system/user/SystemUserContainer.js | 1 - 5 files changed, 5 deletions(-) diff --git a/src/containers/analysis/history/AnalysisHistoryContainer.js b/src/containers/analysis/history/AnalysisHistoryContainer.js index 5bbce4f1..1294de50 100644 --- a/src/containers/analysis/history/AnalysisHistoryContainer.js +++ b/src/containers/analysis/history/AnalysisHistoryContainer.js @@ -150,7 +150,6 @@ export const AnalysisHistoryContainer = props => { }; useEffect(() => { - console.log('changeParam >>>', params); }, [params]); const handlerSearch = () => { diff --git a/src/containers/system/auth/SystemAuthContainer.js b/src/containers/system/auth/SystemAuthContainer.js index 428d022e..8b01a83c 100644 --- a/src/containers/system/auth/SystemAuthContainer.js +++ b/src/containers/system/auth/SystemAuthContainer.js @@ -72,7 +72,6 @@ export const SystemAuthContainer = props => { }, []); useEffect(() => { - console.log('changeParam >>>', params); }, [params]); const handlerSearch = () => { // dispatch(Actions.list.request({ searchParams: params })); diff --git a/src/containers/system/code/SystemCodeContainer.js b/src/containers/system/code/SystemCodeContainer.js index 9d03bd83..5ef3523f 100644 --- a/src/containers/system/code/SystemCodeContainer.js +++ b/src/containers/system/code/SystemCodeContainer.js @@ -73,7 +73,6 @@ export const SystemCodeContainer = props => { }, []); useEffect(() => { - console.log('changeParam >>>', params); }, [params]); const handlerSearch = () => { // dispatch(Actions.list.request({ searchParams: params })); diff --git a/src/containers/system/menu/SystemMenuContainer.js b/src/containers/system/menu/SystemMenuContainer.js index 93f18187..20d23fe2 100644 --- a/src/containers/system/menu/SystemMenuContainer.js +++ b/src/containers/system/menu/SystemMenuContainer.js @@ -73,7 +73,6 @@ export const SystemMenuContainer = props => { }, []); useEffect(() => { - console.log('changeParam >>>', params); }, [params]); const handlerSearch = () => { // dispatch(Actions.list.request({ searchParams: params })); diff --git a/src/containers/system/user/SystemUserContainer.js b/src/containers/system/user/SystemUserContainer.js index 97ebddb4..2b6d7584 100644 --- a/src/containers/system/user/SystemUserContainer.js +++ b/src/containers/system/user/SystemUserContainer.js @@ -74,7 +74,6 @@ export const SystemUserContainer = props => { }, []); useEffect(() => { - console.log('changeParam >>>', params); }, [params]); const handlerSearch = () => { // dispatch(Actions.list.request({ searchParams: params })); From f5ed16ab8f63fc7a4b95f1020df7d6a9499e36a5 Mon Sep 17 00:00:00 2001 From: junh_eee Date: Tue, 30 Aug 2022 16:24:29 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EA=B4=80=EC=A0=9C=20-=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=EB=B8=94=EB=A1=9D=20css=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/custom.css | 6 ++ src/components/map/naver/dron/DronMarker.js | 97 ++++++++++++--------- 2 files changed, 60 insertions(+), 43 deletions(-) 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 = $(` -
-
- ${marker.id} -
-
-
- 속도: ${gps.speed}${gps.speedType} -
-
- 고도: ${gps.elev}${gps.elevType} -
-
- 헤딩방향: ${gps.heading} -
+
+
+ ${marker?.id} + ${gps?.speed}${gps?.speedType} | ${gps?.elev}${gps?.elevType} | ${gps?.heading}
-
`) + + // this._element = $(` + //
+ //
+ // ${marker?.id} + //
+ //
+ //
+ // 속도: ${gps?.speed}${gps?.speedType} + //
+ //
+ // 고도: ${gps?.elev}${gps?.elevType} + //
+ //
+ // 헤딩방향: ${gps?.heading} + //
+ //
+ //
+ //
+ // `) this.setPosition(options.position, idx); this.setMap(options.map || null); @@ -255,15 +266,13 @@ export const DronMarker = props => { position = this.getPosition(), pixelPosition = projection.fromCoordToOffset(position); - let cnt = 0; - - if(idx) { - let index = idx._idx; - cnt = index * 100; - this._element.css('left', pixelPosition.x) - this._element.css('top', pixelPosition.y + -cnt) + // let cnt = 0; + // let index = idx?._idx; + // cnt = index * 98; + this._element.css('left', pixelPosition.x) + this._element.css('top', pixelPosition.y) + // this._element.css('top', pixelPosition.y + -cnt) - } }; CustomOverlay.prototype.onRemove = function() { @@ -308,16 +317,18 @@ export const DronMarker = props => { setArrInfos(arrData); }; - const markerInfo = (arrMarkers) => { + const markerInfo = () => { arrMarkers.forEach((marker, idx) => { infoInit(marker, controlGpList[idx], idx); + if(controlGpList.length != 0) { const info = new CustomOverlay({ - position: new naver.maps.LatLng(controlGpList[idx].lat, controlGpList[idx].lng), - map: map, + position: new naver.maps.LatLng(controlGpList[idx]?.lat, controlGpList[idx]?.lng), + // map: map, id: marker.id, idx: idx }); + info.setMap(map); // console.log(info) setArrInfos(m => [...m, info]); } From f077600239402cf3562c78c0bf8aedd192357b97 Mon Sep 17 00:00:00 2001 From: sanguu Date: Tue, 30 Aug 2022 17:22:49 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/@core/layouts/components/navbar/UserDropdown.js | 10 +++++++++- src/views/design/mypage/myinfo/DesignMyinfo1.js | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/@core/layouts/components/navbar/UserDropdown.js b/src/@core/layouts/components/navbar/UserDropdown.js index fbad55bd..37060cfd 100644 --- a/src/@core/layouts/components/navbar/UserDropdown.js +++ b/src/@core/layouts/components/navbar/UserDropdown.js @@ -54,6 +54,14 @@ const UserDropdown = () => { //** Vars const userAvatar = (userData && userData.avatar) || defaultAvatar; + + const movePage = url => { + history.push(url); + }; + + const profileInfo = () => { + history.push('/mypage/myinfo/sample1'); + }; return ( @@ -70,7 +78,7 @@ const UserDropdown = () => { - e.preventDefault()}> + Profile diff --git a/src/views/design/mypage/myinfo/DesignMyinfo1.js b/src/views/design/mypage/myinfo/DesignMyinfo1.js index e040fd08..0b422542 100644 --- a/src/views/design/mypage/myinfo/DesignMyinfo1.js +++ b/src/views/design/mypage/myinfo/DesignMyinfo1.js @@ -57,7 +57,7 @@ const UserEdit = () => { - +