diff --git a/src/components/map/naver/dron/DronToast.js b/src/components/map/naver/dron/DronToast.js
index 1630b92..bbfa6d4 100644
--- a/src/components/map/naver/dron/DronToast.js
+++ b/src/components/map/naver/dron/DronToast.js
@@ -10,51 +10,48 @@ import 'react-toastify/dist/ReactToastify.css';
const DronToast = () => {
const dispatch = useDispatch();
-
- const { controlGpList } = useSelector(state => state.controlGpState);
+
const { controlGpArcrftWarnList } = useSelector(state => state.controlGpLogState);
const [toastId, setToastId] = useState();
useEffect(() => {
- if (controlGpArcrftWarnList) {
- // console.log("===================================")
- // console.log('tastID : ', toastId);
+ if (controlGpArcrftWarnList) {
if (!toastId) {
- controlGpArcrftWarnList.forEach(warn => {
- // console.log("Warn ==> ", gps.controlWarnCd);
- // console.log("Noti ==> ", gps.controlWarnNotyCd);
- if (warn.controlWarnCd) {
- // console.log('warn CD : ', warn.controlWarnCd);
-
+
+ for (let i=0; i {
- setToastId(null);
- handleNotiClick(warn.controlId, warn.idntfNum);
+ onClick: () => {
+ handleNotiClick(controlGpArcrftWarnList[i].cntrlId, controlGpArcrftWarnList[i].idntfNum);
+ // setToastId(null);
},
onClose: () => {
setToastId(null);
}
}
- )
+ );
setToastId(id);
-
- return false;
- }
- })
+
+ break;
+ }
+ }
}
}
}, [controlGpArcrftWarnList]);
const handleNotiClick = (controlId, idntfNum) => {
+ console.log(controlId + ', ' + idntfNum);
+
dispatch(objectClickAction(controlId));
dispatch(controlGpDtlAction.request(controlId));
dispatch(controlGpFlightPlanAction.request(idntfNum));
diff --git a/src/containers/analysis/history/AnalysisHistoryContainer.js b/src/containers/analysis/history/AnalysisHistoryContainer.js
index 582dd4e..d40d094 100644
--- a/src/containers/analysis/history/AnalysisHistoryContainer.js
+++ b/src/containers/analysis/history/AnalysisHistoryContainer.js
@@ -256,7 +256,10 @@ export const AnalysisHistoryContainer = props => {
desc: '그룹 선택 해주세요.',
color: 'modal-danger'
});
- } else dispatch(Actions.list.request({ searchParams: params, page: 1 }));
+ } else {
+ dispatch(Actions.LIST_INITAL());
+ dispatch(Actions.list.request({ searchParams: params, page: 1 }));
+ }
};
const handlerInput = (type, val) => {