diff --git a/report-ui/src/router/index.js b/report-ui/src/router/index.js index e952d54a..a93a416d 100644 --- a/report-ui/src/router/index.js +++ b/report-ui/src/router/index.js @@ -28,28 +28,13 @@ import Layout from '../views/layout/Layout' export const constantRouterMap = [ { path: '/login', component: () => import('@/views/login'), hidden: true }, { - path: '/helpCenList', component: () => import('@/views/helpCenList/list'), hidden: true, - children: [ - { path: 'list', component: () => import('@/views/helpCenList/list-title'), hidden: true }, - { path: 'detail', component: () => import('@/views/helpCenList/list-detail'), hidden: true }, - { path: 'search', component: () => import('@/views/helpCenList/list-search'), hidden: true } - ] - }, - { - path: '/index', - component: Layout, - redirect: '/access/accessAuthority', - name: '首页', - meta: { title: '首页', icon: 'iconhome2' }, + path: '/index', component: Layout, redirect: '/access/accessAuthority', name: '首页', meta: { title: '首页', icon: 'iconhome2' }, children: [ { path: '', name: 'accessUser', component: () => import('@/views/home/index'), meta: { title: '首页', icon: 'iconhome2', keepAlive: true, isBack: true, requireAuth: true } }, ] }, { - path: '/access', - component: Layout, - name: 'access', - meta: { title: '用户权限', icon: 'icondfzq-' }, + path: '/access', component: Layout, name: 'access', meta: { title: '用户权限', icon: 'icondfzq-' }, children: [ { path: 'authority', name: 'authority', component: () => import('@/views/accessAuthority/index'), meta: { title: '权限管理', icon: 'iconquanxian', keepAlive: true, isBack: true } }, { path: 'role', name: 'role', component: () => import('@/views/accessRole/index'), meta: { title: '角色管理', icon: 'iconjiaose1', keepAlive: true, isBack: true } }, @@ -57,59 +42,29 @@ export const constantRouterMap = [ ] }, { - path: '/datasource', - component: Layout, - redirect: '/report/datasource', - name: '数据源', - meta: { title: '数据源', icon: 'iconnavicon-ywcs' }, + path: '/report', component: Layout, name: '报表设计', meta: { title: '报表设计', icon: 'iconnavicon-ywcs' }, children: [ { path: 'datasource', name: 'datasource', component: () => import('@/views/report/datasource/index'), meta: { title: '数据源', icon: 'iconeventbridgexiaoxishijianzongxian', keepAlive: true, isBack: true } }, - ] - }, - { - path: '/resultset', - component: Layout, - redirect: '/report/resultset', - name: '数据集', - meta: { title: '数据集', icon: 'iconnavicon-ywcs' }, - children: [ { path: 'resultset', name: 'resultset', component: () => import('@/views/report/resultset/index'), meta: { title: '数据集', icon: 'iconalikafkaxiaoxiduilieKafka', keepAlive: true, isBack: true } }, - ] - }, - { - path: '/report', - component: Layout, - redirect: '/report/report', - name: '报表管理', - meta: { title: '报表管理', icon: 'iconnavicon-ywcs' }, - children: [ { path: 'report', name: 'reportIndex', component: () => import('@/views/report/report/index'), meta: { title: '报表管理', icon: 'iconnavicon-ywcs', keepAlive: true, isBack: true } }, - ] - }, - { - path: '/bigscreen', - component: Layout, - redirect: '/report/bigscreen', - name: '大屏报表', - meta: { title: '大屏报表', icon: 'iconnavicon-ywcs' }, - children: [ - { path: 'bigscreen', name: 'bigscreen', component: () => import('@/views/report/bigscreen/index'), meta: { title: '大屏报表', icon: 'iconchufaqipeizhi-hui', keepAlive: true, isBack: true } }, + { path: 'bigscreen', name: 'bigscreen', component: () => import('@/views/report/bigscreen/index'), meta: { title: '大屏报表', icon: 'iconchufaqipeizhi-hui', keepAlive: true, isBack: true }, }, + //{ path: 'excelreport', name: 'excelreport', component: () => import('@/views/report/excelreport/index'), meta: { title: '表格报表', icon: 'iconliebiao', keepAlive: true, isBack: true } }, ] }, { path: '/bigscreen/viewer', component: () => import('@/views/report/bigscreen/viewer'), hidden: true }, { path: '/bigscreen/designer', component: () => import('@/views/report/bigscreen/designer'), hidden: true }, - // { - // path: '/report', - // component: Layout, - // redirect: '/report/excelreport', - // name: '表格报表', - // meta: { title: '表格报表', icon: 'iconnavicon-ywcs' }, - // children: [ - // { path: 'excelreport', name: 'excelreport', component: () => import('@/views/report/excelreport/index'), meta: { title: '表格报表', icon: 'iconliebiao', keepAlive: true, isBack: true } }, - // ] - // }, { path: '/404', component: () => import('@/views/404'), hidden: true }, { path: '*', redirect: '/login', hidden: true }, + /* + { + path: '/helpCenList', component: () => import('@/views/helpCenList/list'), hidden: true, + children: [ + { path: 'list', component: () => import('@/views/helpCenList/list-title'), hidden: true }, + { path: 'detail', component: () => import('@/views/helpCenList/list-detail'), hidden: true }, + { path: 'search', component: () => import('@/views/helpCenList/list-search'), hidden: true } + ] + }, + */ ] export default new Router({ diff --git a/report-ui/src/views/layout/components/Sidebar/index.vue b/report-ui/src/views/layout/components/Sidebar/index.vue index cb569253..54d3b416 100644 --- a/report-ui/src/views/layout/components/Sidebar/index.vue +++ b/report-ui/src/views/layout/components/Sidebar/index.vue @@ -39,7 +39,7 @@ export default { methods: { goBigScreen () { let routeUrl = this.$router.resolve({ - path: "/bigScreen" + path: "/report/bigScreen" }); window.open(routeUrl.href, '_blank'); }