diff --git a/src/@core/layouts/components/menu/vertical-menu/VerticalNavMenuItems.js b/src/@core/layouts/components/menu/vertical-menu/VerticalNavMenuItems.js index 9bac715..3059c9f 100644 --- a/src/@core/layouts/components/menu/vertical-menu/VerticalNavMenuItems.js +++ b/src/@core/layouts/components/menu/vertical-menu/VerticalNavMenuItems.js @@ -1,10 +1,10 @@ // ** Vertical Menu Components -import VerticalNavMenuLink from './VerticalNavMenuLink' -import VerticalNavMenuGroup from './VerticalNavMenuGroup' -import VerticalNavMenuSectionHeader from './VerticalNavMenuSectionHeader' +import VerticalNavMenuLink from './VerticalNavMenuLink'; +import VerticalNavMenuGroup from './VerticalNavMenuGroup'; +import VerticalNavMenuSectionHeader from './VerticalNavMenuSectionHeader'; // ** Utils -import { resolveVerticalNavMenuItemComponent as resolveNavItemComponent } from '@layouts/utils' +import { resolveVerticalNavMenuItemComponent as resolveNavItemComponent } from '@layouts/utils'; const VerticalMenuNavItems = props => { // ** Components Object @@ -12,16 +12,16 @@ const VerticalMenuNavItems = props => { VerticalNavMenuSectionHeader, VerticalNavMenuGroup, VerticalNavMenuLink - } + }; // ** Render Nav Menu Items const RenderNavItems = props.items.map((item, index) => { - const TagName = Components[resolveNavItemComponent(item)] + const TagName = Components[resolveNavItemComponent(item)]; - return - }) + return ; + }); - return RenderNavItems -} + return RenderNavItems; +}; -export default VerticalMenuNavItems +export default VerticalMenuNavItems; diff --git a/src/@core/layouts/components/menu/vertical-menu/index.js b/src/@core/layouts/components/menu/vertical-menu/index.js index 7b4c828..e01b659 100644 --- a/src/@core/layouts/components/menu/vertical-menu/index.js +++ b/src/@core/layouts/components/menu/vertical-menu/index.js @@ -9,6 +9,7 @@ import basis from '@src/navigation/basis'; import statics from '@src/navigation/statics'; import system from '@src/navigation/system'; import analysis from '@src/navigation/analysis'; +import flightPlan from '@src/navigation/flightPlan'; // ** Third Party Components import classnames from 'classnames'; @@ -27,14 +28,17 @@ const Sidebar = props => { }, [topMenuCd]); const navData = () => { - if (topMenuCd === 'basis') { - return basis; - } else if (topMenuCd === 'system') { - return system; - } else if (topMenuCd === 'statics') { - return statics; - } else if (topMenuCd === 'analysis') { - return analysis; + switch (topMenuCd) { + case 'basis': + return basis; + case 'system': + return system; + case 'statics': + return statics; + case 'analysis': + return analysis; + case 'flightPlan': + return flightPlan; } }; diff --git a/src/@core/layouts/components/navbar/NavbarUser.js b/src/@core/layouts/components/navbar/NavbarUser.js index 4e330ce..8d8ffac 100644 --- a/src/@core/layouts/components/navbar/NavbarUser.js +++ b/src/@core/layouts/components/navbar/NavbarUser.js @@ -81,6 +81,17 @@ const NavbarUser = props => { 비행 이력 시스템 + + handlerTopMenu('flightPlan')} + active={topMenuCd === 'flightPlan'} + // onClick={() => { + // toggle('3') + // }} + > + 비행 계획 관리 + + window.open('/control', '_blank')} @@ -114,7 +125,6 @@ const NavbarUser = props => { 버퍼 테스트 */} - {/*
diff --git a/src/navigation/basis/index.js b/src/navigation/basis/index.js index d0ba5a7..850a6e8 100644 --- a/src/navigation/basis/index.js +++ b/src/navigation/basis/index.js @@ -45,25 +45,5 @@ export default [ } ], navLink: '#' - }, - { - id: 'basis_001_03', - type: 'dropdown', - title: '비행 계획 관리', - children: [ - { - id: 'basis_001_03_01', - type: 'item', - title: '비행 계획 목록', - navLink: '/basis/flight/plan/index' - }, - { - id: 'basis_001_03_02', - type: 'item', - title: '비행 계획 승인', - navLink: '/basis/flight/aprv/index' - } - ], - navLink: '#' } ]; diff --git a/src/navigation/flightPlan/index.js b/src/navigation/flightPlan/index.js new file mode 100644 index 0000000..2c13d2a --- /dev/null +++ b/src/navigation/flightPlan/index.js @@ -0,0 +1,34 @@ +export default [ + { + id: 'flight_plan_001', + title: '비행 계획 관리', + navLink: '#', + type: 'dropdown' + }, + { + id: 'flight_plan_001_01', + type: 'dropdown', + title: '비행 계획 관리', + children: [ + { + id: 'flight_plan_001_01_01', + type: 'item', + title: '비행 계획 목록', + navLink: '/basis/flight/plan/index' + }, + { + id: 'flight_plan_001_01_02', + type: 'item', + title: '비행 계획 승인', + navLink: '/basis/flight/aprv/index' + } + ], + navLink: '#' + }, + { + id: 'flight_plan_02', + title: '비행운항 스케줄', + navLink: '', + newTab: true + } +];