diff --git a/src/icons/svg/device.svg b/src/icons/svg/device.svg new file mode 100644 index 0000000..37b4769 --- /dev/null +++ b/src/icons/svg/device.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/system.svg b/src/icons/svg/system.svg new file mode 100644 index 0000000..478cf51 --- /dev/null +++ b/src/icons/svg/system.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/lang/en.js b/src/lang/en.js index 04332f2..e4822ef 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -8,6 +8,8 @@ export default { device: 'Device', detail: 'Detail', logs: 'Logs', + deviceSetting: 'Device Setting', + systemSetting: 'System Setting', guide: 'Guide', permission: 'Permission', pagePermission: 'Page Permission', diff --git a/src/lang/zh.js b/src/lang/zh.js index 7b142f7..8422669 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -1,13 +1,15 @@ export default { route: { - dashboard: '首页', + dashboard: '仪表盘', introduction: '简述', documentation: '文档', - counter: '灭蚊器', + counter: '数据分析', statistic: '统计', device: '设备', detail: '详情', logs: '日志', + deviceSetting: '设备设置', + systemSetting: '系统设置', guide: '引导页', permission: '权限测试页', pagePermission: '页面权限', diff --git a/src/router/index.js b/src/router/index.js index 3337a31..f574b38 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -87,43 +87,54 @@ export default new Router({ }) export const asyncRouterMap = [ + // { + // path: '/permission', + // component: Layout, + // redirect: '/permission/index', + // alwaysShow: true, // will always show the root menu + // meta: { + // title: 'permission', + // icon: 'lock', + // roles: ['admin', 'editor'] // you can set roles in root nav + // }, + // children: [{ + // path: 'page', + // component: () => import('@/views/permission/page'), + // name: 'pagePermission', + // meta: { + // title: 'pagePermission', + // roles: ['admin'] // or you can only set roles in sub nav + // } + // }, { + // path: 'directive', + // component: () => import('@/views/permission/directive'), + // name: 'directivePermission', + // meta: { + // title: 'directivePermission' + // // if do not set roles, means: this page does not require permission + // } + // }] + // }, + { - path: '/permission', + path: '/settings/device', component: Layout, - redirect: '/permission/index', - alwaysShow: true, // will always show the root menu - meta: { - title: 'permission', - icon: 'lock', - roles: ['admin', 'editor'] // you can set roles in root nav - }, children: [{ - path: 'page', - component: () => import('@/views/permission/page'), - name: 'pagePermission', - meta: { - title: 'pagePermission', - roles: ['admin'] // or you can only set roles in sub nav - } - }, { - path: 'directive', - component: () => import('@/views/permission/directive'), - name: 'directivePermission', - meta: { - title: 'directivePermission' - // if do not set roles, means: this page does not require permission - } + path: 'index', + component: () => import('@/views/settings/device'), + name: 'deviceSetting', + meta: { title: 'deviceSetting', icon: 'device', noCache: true } }] }, { - path: '/icon', + path: '/settings/system', component: Layout, children: [{ path: 'index', - component: () => import('@/views/svg-icons/index'), - name: 'icons', - meta: { title: 'icons', icon: 'icon', noCache: true } + component: () => import('@/views/settings/system'), + name: 'systemSetting', + meta: { title: 'systemSetting', icon: 'system', noCache: true } }] }, diff --git a/src/views/settings/index.vue b/src/views/settings/device.vue similarity index 65% rename from src/views/settings/index.vue rename to src/views/settings/device.vue index 57b6297..0d91804 100644 --- a/src/views/settings/index.vue +++ b/src/views/settings/device.vue @@ -1,12 +1,12 @@ diff --git a/src/views/settings/system.vue b/src/views/settings/system.vue new file mode 100644 index 0000000..6bd2545 --- /dev/null +++ b/src/views/settings/system.vue @@ -0,0 +1,15 @@ + + + + +