Browse Source

비행관제 hisotry 버그 수정

pull/2/head
노승철 2 years ago
parent
commit
f54a728b4d
  1. 8
      src/components/map/naver/NaverMap.js
  2. 40
      src/components/map/naver/dron/DronHistory.js
  3. 9
      src/modules/control/gp/sagas/controlGpSaga.ts

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

@ -14,10 +14,8 @@ export const NaverCustomMap = () => {
const naver = window.naver; const naver = window.naver;
const [mapObject, setMapObject] = useState(null); const [mapObject, setMapObject] = useState(null);
const [arrPolyline, setArrPolyline] = useState([]); const [arrPolyline, setArrPolyline] = useState([]);
let arrMarkers = []; // 마커 배열
// let arrPolyline = []; // 폴리라인 배열
let features = geoJson.features; let features = geoJson.features;
useEffect(() => { useEffect(() => {
@ -68,7 +66,7 @@ export const NaverCustomMap = () => {
<DronHistory <DronHistory
map={mapObject} map={mapObject}
naver={naver} naver={naver}
arrPolyline={arrPolyline} arrPolyline={arrPolyline}
handleHistoryInit={handleHistoryInit} handleHistoryInit={handleHistoryInit}
/> />

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

@ -8,32 +8,40 @@ export const DronHistory = props => {
const { controlGpList } = useSelector(state => state.controlGpState); const { controlGpList } = useSelector(state => state.controlGpState);
const { objectId, isClickObject } = useSelector(state => state.controlMapReducer); const { objectId, isClickObject } = useSelector(state => state.controlMapReducer);
const [arrHistory, setArrHistory] = useState([]);
let naver = props.naver; let naver = props.naver;
let polyline; let polyline;
let polylinePath = []; let polylinePath = [];
const dispatch = useDispatch(); const dispatch = useDispatch();
useEffect(() => { useEffect(() => {
if(objectId && isClickObject) { 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 = {
objectId: gps.objectId,
lat: gps.lat,
lng: gps.lng
}
const history = [...arrHistory, addHistory];
polylineInit(history);
if(gps) { setArrHistory((his) => {
const addHistory = { return [...his, addHistory];
objectId: gps.objectId, });
lat: gps.lat, }
lng: gps.lng }
}
const history = [...controlGpHistory, addHistory];
polylineInit(history);
}
} }
}, [controlGpList]); }, [controlGpList]);
useEffect(() => { useEffect(() => {
polylineInit(controlGpHistory) setArrHistory(controlGpHistory);
polylineInit(controlGpHistory);
}, [controlGpHistory]); }, [controlGpHistory]);
useEffect(() => { useEffect(() => {

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

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

Loading…
Cancel
Save