diff --git a/src/components/map/naver/NaverMap.js b/src/components/map/naver/NaverMap.js index 8573137..043237b 100644 --- a/src/components/map/naver/NaverMap.js +++ b/src/components/map/naver/NaverMap.js @@ -8,6 +8,7 @@ import { FeatureAirZone } from './feature/FeatureAirZone'; import geoJson from '../geojson/airArea.json'; import { controlGroupAuthAction } from '../../../modules/control/gp'; import DronPlan from './dron/DronPlan'; +import DronToast from './dron/DronToast'; export const NaverCustomMap = () => { const dispatch = useDispatch(); @@ -70,6 +71,8 @@ export const NaverCustomMap = () => { handleHistoryInit={handleHistoryInit} /> + + {/* */} {/* */} diff --git a/src/components/map/naver/dron/DronMarker.js b/src/components/map/naver/dron/DronMarker.js index 5080460..d7f89db 100644 --- a/src/components/map/naver/dron/DronMarker.js +++ b/src/components/map/naver/dron/DronMarker.js @@ -87,28 +87,6 @@ export const DronMarker = props => { useEffect(() => { markerInit(); - - if (controlGpList) { - controlGpList.forEach(gps => { - if (gps.controlWarnCd && gps.controlWarnNotyCd) { - toast.info( - , - { - // autoClose: 3000, - hideProgressBar: true, - position: toast.POSITION.BOTTOM_RIGHT, - onClick: props => { - handlerDronClick(gps.controlId, gps.objectId); - } - } - ) - } - }) - } - }, [controlGpList]); useEffect(() => { diff --git a/src/components/map/naver/dron/DronToast.js b/src/components/map/naver/dron/DronToast.js index 3b2bea5..fa437df 100644 --- a/src/components/map/naver/dron/DronToast.js +++ b/src/components/map/naver/dron/DronToast.js @@ -4,40 +4,73 @@ import { Fragment } from 'react'; import { toast } from 'react-toastify'; import Avatar from '../../../../@core/components/avatar'; import { Bell, Check, X, AlertTriangle, Info } from 'react-feather' -import { - Card, - CardHeader, - CardBody, - CardTitle, - Button, - Toast, - ToastBody, - ToastHeader, - Row, - Col, -} from 'reactstrap'; -import log from '../../../../assets/images/logo/logo.png'; - - -const DronToast = ({ title, message }) => { + +const DronToast = () => { + const { controlGpList } = useSelector(state => state.controlGpState); + + useEffect(() => { + if (controlGpList) { + controlGpList.forEach(gps => { + if (gps.controlWarnCd && gps.controlWarnNotyCd) { + toast.info( + toastRender( + `${gps.objectId} 비정상 상황 알림`, + '경로 상에 비행 구역을 이탈했습니다.' + ), + { + autoClose: 3000, + hideProgressBar: true, + position: toast.POSITION.BOTTOM_RIGHT, + onClick: props => { + handlerDronClick(gps.controlId, gps.objectId); + } + } + ) + } + }) + } + }, [controlGpList]); + + const toastRender = (title, message) => { + + return ( + +
+
+ } /> +
+ {title} +
+
+
+ +
+ + {message} + +
+
+ ) + } return ( - -
-
- } /> -
- {title} -
-
-
- -
- - {message} - -
-
+ // + //
+ //
+ // } /> + //
+ // {/* {title} */} + //
+ //
+ //
+ + //
+ // + // {/* {message} */} + // + //
+ //
+ null ) }