Browse Source

비정상 toast 수정

feature/auth
노승철 2 years ago
parent
commit
1568d86f31
  1. 3
      src/components/map/naver/NaverMap.js
  2. 22
      src/components/map/naver/dron/DronMarker.js
  3. 69
      src/components/map/naver/dron/DronToast.js

3
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}
/>
<DronToast />
<FeatureAirZone map={mapObject} naver={naver} features={features} />
{/* <NaverMapSearch map={mapObject} naver={naver} /> */}
{/* <SensorZone map={mapObject} naver={naver} /> */}

22
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(
<DronToast
title={`${gps.objectId} 비정상 상황 알림`}
message={'경로 상에 비행 구역을 이탈했습니다.'}
/>,
{
// autoClose: 3000,
hideProgressBar: true,
position: toast.POSITION.BOTTOM_RIGHT,
onClick: props => {
handlerDronClick(gps.controlId, gps.objectId);
}
}
)
}
})
}
}, [controlGpList]);
useEffect(() => {

69
src/components/map/naver/dron/DronToast.js

@ -4,29 +4,41 @@ 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 (
<Fragment>
<div className='toastify-header'>
<div className='title-wrapper'>
<Avatar size='sm' color='info' icon={<Info size={12} />} />
<h6 className='text-info ml-50 mb-0'>
<Avatar size='sm' color='info' icon={<Info size={10} />} />
<h6 className='text-info ml-50 mb-0' style={{'fontSize': 'small'}}>
{title}
</h6>
</div>
@ -39,6 +51,27 @@ const DronToast = ({ title, message }) => {
</div>
</Fragment>
)
}
return (
// <Fragment>
// <div className='toastify-header'>
// <div className='title-wrapper'>
// <Avatar size='sm' color='info' icon={<Info size={12} />} />
// <h6 className='text-info ml-50 mb-0'>
// {/* {title} */}
// </h6>
// </div>
// </div>
// <div className='toastify-body'>
// <span>
// {/* {message} */}
// </span>
// </div>
// </Fragment>
null
)
}

Loading…
Cancel
Save