Browse Source

비행관제 hisotry 버그 수정

feature/auth
노승철 2 years ago
parent
commit
f54a728b4d
  1. 2
      src/components/map/naver/NaverMap.js
  2. 16
      src/components/map/naver/dron/DronHistory.js
  3. 7
      src/modules/control/gp/sagas/controlGpSaga.ts

2
src/components/map/naver/NaverMap.js

@ -16,8 +16,6 @@ export const NaverCustomMap = () => {
const [mapObject, setMapObject] = useState(null);
const [arrPolyline, setArrPolyline] = useState([]);
let arrMarkers = []; // 마커 배열
// let arrPolyline = []; // 폴리라인 배열
let features = geoJson.features;
useEffect(() => {

16
src/components/map/naver/dron/DronHistory.js

@ -8,6 +8,8 @@ export const DronHistory = props => {
const { controlGpList } = useSelector(state => state.controlGpState);
const { objectId, isClickObject } = useSelector(state => state.controlMapReducer);
const [arrHistory, setArrHistory] = useState([]);
let naver = props.naver;
let polyline;
let polylinePath = [];
@ -16,7 +18,8 @@ export const DronHistory = props => {
useEffect(() => {
if(objectId && isClickObject) {
const gps = controlGpList.find((gps) => gps.controlId === objectId)
if(arrHistory && arrHistory.length > 0) {
const gps = controlGpList.find((gps) => gps.controlId === objectId);
if(gps) {
const addHistory = {
@ -25,15 +28,20 @@ export const DronHistory = props => {
lng: gps.lng
}
const history = [...controlGpHistory, addHistory];
const history = [...arrHistory, addHistory];
polylineInit(history);
setArrHistory((his) => {
return [...his, addHistory];
});
}
}
}
}, [controlGpList]);
useEffect(() => {
polylineInit(controlGpHistory)
setArrHistory(controlGpHistory);
polylineInit(controlGpHistory);
}, [controlGpHistory]);
useEffect(() => {

7
src/modules/control/gp/sagas/controlGpSaga.ts

@ -36,20 +36,19 @@ function* getControlGpSaga(
});
}
// console.log('gps>>>> ', gpsData);
console.log('gps data >>>> ', gpsData);
yield put(
Actions.controlGpAction.success({
controlGpList: data
controlGpList: gpsData
})
);
if (objectId && isClickObject) {
console.log(' mm ;;')
let detailData;
//상세 정보에서 실시간 데이터 호출
data.map(item => {
gpsData.map(item => {
if (item.controlId === objectId) {
detailData = item;
}

Loading…
Cancel
Save