Browse Source

드론 관제 드론 클릭 풀림 이슈 수정

ctrlDraw
김장현 2 years ago
parent
commit
44e50d5530
  1. 14
      src/components/map/naver/dron/DronMarker.js

14
src/components/map/naver/dron/DronMarker.js

@ -1,6 +1,6 @@
import $ from 'jquery'; import $ from 'jquery';
import { useEffect, useState, useLayoutEffect } from 'react'; import { useEffect, useState, useLayoutEffect } from 'react';
import { useDispatch, useSelector } from 'react-redux'; import { useDispatch, useSelector, shallowEqual } from 'react-redux';
import '../../../../assets/css/custom.css'; import '../../../../assets/css/custom.css';
import FlightIcon from '../../../../assets/images/airplan_org.svg'; import FlightIcon from '../../../../assets/images/airplan_org.svg';
import FlightDetailIcon from '../../../../assets/images/airplan_pp.svg'; import FlightDetailIcon from '../../../../assets/images/airplan_pp.svg';
@ -25,7 +25,8 @@ export const DronMarker = props => {
state => state.controlGpState state => state.controlGpState
); );
const { objectId, isClickObject } = useSelector( const { objectId, isClickObject } = useSelector(
state => state.controlMapReducer state => state.controlMapReducer,
shallowEqual
); );
// const { controlGroupAuthInfo } = useSelector( // const { controlGroupAuthInfo } = useSelector(
// state => state.controlGroupAuthState // state => state.controlGroupAuthState
@ -332,6 +333,7 @@ export const DronMarker = props => {
//데이터가 없는 마커를 모두 삭제 한다. //데이터가 없는 마커를 모두 삭제 한다.
const allRemoveMarkers = () => { const allRemoveMarkers = () => {
let isUnClick = false;
if (arrMarkers && controlGpList) { if (arrMarkers && controlGpList) {
arrMarkers.map(marker => { arrMarkers.map(marker => {
const isExists = controlGpList.find( const isExists = controlGpList.find(
@ -341,8 +343,9 @@ export const DronMarker = props => {
removeMarkers(marker); removeMarkers(marker);
const arrData = arrMarkers.filter(item => item.id != marker.id); const arrData = arrMarkers.filter(item => item.id != marker.id);
removeArrMarkers(arrData); removeArrMarkers(arrData);
if (marker.controlId === objectId) {
// dispatch(objectUnClickAction()); dispatch(objectUnClickAction());
}
} }
}); });
arrInfos.map(info => { arrInfos.map(info => {
@ -351,11 +354,10 @@ export const DronMarker = props => {
removeInfos(info); removeInfos(info);
const arrData = arrInfos.filter(item => item.id != info._id); const arrData = arrInfos.filter(item => item.id != info._id);
removeArrInfos(arrData); removeArrInfos(arrData);
// dispatch(objectUnClickAction());
} }
}); });
} }
return isUnClick;
}; };
//마커를 셋팅 한다. //마커를 셋팅 한다.

Loading…
Cancel
Save