From 5d2e823d4e95571f4b1944209ad8bc82e0b9c23b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?= Date: Mon, 18 Mar 2024 13:54:21 +0900 Subject: [PATCH] =?UTF-8?q?vertiport=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/menu/vertical-menu/index.js | 3 ++ .../layouts/components/navbar/NavbarUser.js | 12 +++++- .../dashboard/DroneFlightSchedule.js | 6 ++- src/navigation/vertiport/index.js | 13 +++++++ src/router/routes/RouteVertiport.js | 10 +++++ src/router/routes/index.js | 2 + src/views/control/main/ControlMain.js | 1 - src/views/vertiport/VertiportView.js | 37 +++++++++++++++++++ 8 files changed, 79 insertions(+), 5 deletions(-) create mode 100644 src/navigation/vertiport/index.js create mode 100644 src/router/routes/RouteVertiport.js create mode 100644 src/views/vertiport/VertiportView.js diff --git a/src/@core/layouts/components/menu/vertical-menu/index.js b/src/@core/layouts/components/menu/vertical-menu/index.js index df3411b..cc4e232 100644 --- a/src/@core/layouts/components/menu/vertical-menu/index.js +++ b/src/@core/layouts/components/menu/vertical-menu/index.js @@ -12,6 +12,7 @@ import analysis from '@src/navigation/analysis'; import laanc from '@src/navigation/laanc'; import cstmrService from '@src/navigation/cstmrService'; import statistics from '@src/navigation/statistics'; +import vertiport from '@src/navigation/vertiport'; // ** Third Party Components import classnames from 'classnames'; @@ -49,6 +50,8 @@ const Sidebar = props => { return statistics; case 'cstmrService': return cstmrService; + case 'vertiport': + return vertiport; } }; diff --git a/src/@core/layouts/components/navbar/NavbarUser.js b/src/@core/layouts/components/navbar/NavbarUser.js index 2ff6c9b..08e427e 100644 --- a/src/@core/layouts/components/navbar/NavbarUser.js +++ b/src/@core/layouts/components/navbar/NavbarUser.js @@ -123,6 +123,14 @@ const NavbarUser = props => { 고객 서비스 + + handlerTopMenu('vertiport')} + active={topMenuCd === 'vertiport'} + > + vertiport + + @@ -148,13 +156,13 @@ const NavbarUser = props => { -
+
-
+
{/*
diff --git a/src/components/dashboard/DroneFlightSchedule.js b/src/components/dashboard/DroneFlightSchedule.js index 91f8e7b..dbb9907 100644 --- a/src/components/dashboard/DroneFlightSchedule.js +++ b/src/components/dashboard/DroneFlightSchedule.js @@ -140,8 +140,10 @@ export default function DroneFlightSchedule({ }} > - {competentAgency?.map(i => ( - + {competentAgency?.map((i, idx) => ( + ))} )} diff --git a/src/navigation/vertiport/index.js b/src/navigation/vertiport/index.js new file mode 100644 index 0000000..0a38b4c --- /dev/null +++ b/src/navigation/vertiport/index.js @@ -0,0 +1,13 @@ +export default [ + { + id: 'vertiport_001', + title: 'vertiport', + navLink: '#' + }, + { + id: 'vertiport_001_01', + type: 'item', + title: '버티 포트', + navLink: '/vertiport/index' + } +]; diff --git a/src/router/routes/RouteVertiport.js b/src/router/routes/RouteVertiport.js new file mode 100644 index 0000000..b72e25a --- /dev/null +++ b/src/router/routes/RouteVertiport.js @@ -0,0 +1,10 @@ +import { lazy } from 'react'; + +const RouteVertiport = [ + { + path: '/vertiport/index', + component: lazy(() => import('../../views/vertiport/VertiportView')) + } +]; + +export default RouteVertiport; diff --git a/src/router/routes/index.js b/src/router/routes/index.js index b04c409..a063548 100644 --- a/src/router/routes/index.js +++ b/src/router/routes/index.js @@ -8,6 +8,7 @@ import RouteWeather from './RouteWeather'; import RouteLaance from './RouteLaance'; import RouterCstmrService from './RouterCstmrService'; import RouteStatistics from './RouteStatistics'; +import RouteVertiport from './RouteVertiport'; // ** Document title const TemplateTitle = '%s - Dron Control System'; @@ -25,6 +26,7 @@ const Routes = [ ...RouteLaance, ...RouterCstmrService, ...RouteStatistics, + ...RouteVertiport, { path: '/home', component: lazy(() => import('../../views/Home')) diff --git a/src/views/control/main/ControlMain.js b/src/views/control/main/ControlMain.js index c40cd94..73223de 100644 --- a/src/views/control/main/ControlMain.js +++ b/src/views/control/main/ControlMain.js @@ -113,7 +113,6 @@ const ControlMain = () => { // 화면 왼쪽 사이드 메뉴 오픈 시 다른 메뉴 닫기 const openMenu = val => { - console.log(val, '--'); if (val === 'reportList') { setOpenReportList(true); setOpenAlarmList(false); diff --git a/src/views/vertiport/VertiportView.js b/src/views/vertiport/VertiportView.js new file mode 100644 index 0000000..e09de2c --- /dev/null +++ b/src/views/vertiport/VertiportView.js @@ -0,0 +1,37 @@ +import '@styles/react/libs/flatpickr/flatpickr.scss'; +import '@styles/react/libs/tables/react-dataTable-component.scss'; +import '../../assets/css/custom.css'; + +import { useState } from 'react'; +import { Map } from 'react-feather'; + +export default function VertiportView() { + // 오른쪽 사이드 메뉴 표출 여부 + const [openSetting, setOpenSetting] = useState(true); + + return ( + <> + {openSetting ? ( +
+ +
{/* 오른쪽 레이어 영역 */}
+
+ ) : ( +
+ +
+
+ )} + + ); +}