diff --git a/src/@core/layouts/components/menu/vertical-menu/index.js b/src/@core/layouts/components/menu/vertical-menu/index.js index e01b659e..7b428379 100644 --- a/src/@core/layouts/components/menu/vertical-menu/index.js +++ b/src/@core/layouts/components/menu/vertical-menu/index.js @@ -20,6 +20,8 @@ import VerticalMenuHeader from './VerticalMenuHeader'; import VerticalNavMenuItems from './VerticalNavMenuItems'; import { useSelector } from 'react-redux'; +import finevt_logo from '../../../../../assets/images/finevt_logo.png'; + const Sidebar = props => { const { topMenuCd } = useSelector(state => state.menuState); @@ -123,6 +125,15 @@ const Sidebar = props => { currentActiveItem={currentActiveItem} /> + {menuHover ? ( + + ) : ( + <> + )} )} diff --git a/src/assets/images/finevt_logo.png b/src/assets/images/finevt_logo.png new file mode 100644 index 00000000..38e492ef Binary files /dev/null and b/src/assets/images/finevt_logo.png differ diff --git a/src/assets/images/uam_icon.png b/src/assets/images/uam_icon.png index 3bbee79e..4ef5ce0d 100644 Binary files a/src/assets/images/uam_icon.png and b/src/assets/images/uam_icon.png differ diff --git a/src/assets/images/uam_icon_purple.png b/src/assets/images/uam_icon_purple.png index e41099fe..defc9c75 100644 Binary files a/src/assets/images/uam_icon_purple.png and b/src/assets/images/uam_icon_purple.png differ diff --git a/src/components/map/naver/dron/DronMarker.js b/src/components/map/naver/dron/DronMarker.js index 9f1b2645..d894674b 100644 --- a/src/components/map/naver/dron/DronMarker.js +++ b/src/components/map/naver/dron/DronMarker.js @@ -267,7 +267,7 @@ export const DronMarker = props => { controlId: controlId, type: markerOption.type, icon: { - content: ``, + content: ``, origin: markerOption.origin, anchor: markerOption.anchor }, diff --git a/src/views/control/main/ControlMain.js b/src/views/control/main/ControlMain.js index 13446551..61185a6b 100644 --- a/src/views/control/main/ControlMain.js +++ b/src/views/control/main/ControlMain.js @@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react'; import '../../../assets/css/custom.css'; import logo from '../../../assets/images/pal_logo.png'; +import finevt_logo from '../../../assets/images/finevt_logo.png'; import { Sun, @@ -42,6 +43,11 @@ const ControlMain = () => { const { controlGpCountDrone, controlGpCountFlight } = useSelector( state => state.controlGpCountState ); + // pav박람회 -> uam, 드론 구별을 위한 임시 코드 + // (이 작업으로 고도화 하려면 추후에 서버에서 uam타입을 새로 더 받아 작업해야 함) + const [droneCount, setDroneCount] = useState(0); + const [uamCount, setUamCount] = useState(0); + const [alarm, setAlarm] = useState(false); const { user } = useSelector(state => state.authState); const [oepnReportList, setOpenReportList] = useState(false); @@ -102,6 +108,20 @@ const ControlMain = () => { } }, [isClickObject]); + useEffect(() => { + if (controlGpCountDrone) { + const uamCnt = controlGpCountDrone.filter(i => + i.gps.objectId.includes('UAM') + ); + const droneCnt = controlGpCountDrone.filter( + i => !i.gps.objectId.includes('UAM') + ); + + setUamCount(uamCnt.length); + setDroneCount(droneCnt.length); + } + }, [controlGpCountDrone]); + const handlerClose = () => { setOpenReportList(true); dispatch(objectUnClickAction()); @@ -136,6 +156,7 @@ const ControlMain = () => { PAL + @@ -185,7 +212,11 @@ const ControlMain = () => {
- {!isClickObject ? '인천광역시' : !controlDetail?.stAreaNm ? `${controlDetail?.res.area1} ${controlDetail?.res.area2} ${controlDetail?.res.area3} ${controlDetail?.res.landNm} ${controlDetail?.res.landNum} ` : controlDetail?.stAreaNm} + {!isClickObject + ? '인천광역시' + : !controlDetail?.stAreaNm + ? `${controlDetail?.res.area1} ${controlDetail?.res.area2} ${controlDetail?.res.area3} ${controlDetail?.res.landNm} ${controlDetail?.res.landNum} ` + : controlDetail?.stAreaNm}  {weathericon()}
@@ -233,11 +264,16 @@ const ControlMain = () => {
드론 {/* {controlGpList ? controlGpList.length : 0} */} - + {/* {controlGpCountDrone?.length > 0 ? controlGpCountDrone?.length : 0} - + */} + {droneCount} +
+
+ UAM + {uamCount}
항공기 diff --git a/src/views/control/report/ControlReportList.js b/src/views/control/report/ControlReportList.js index fffd0f6f..3189af53 100644 --- a/src/views/control/report/ControlReportList.js +++ b/src/views/control/report/ControlReportList.js @@ -101,10 +101,7 @@ const ControlReportList = props => { {item.objectId.includes('NAMWON') ? (
- + 실시간 영상보기