diff --git a/src/config/router.config.js b/src/config/router.config.js index eb6c656..a061f32 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -64,10 +64,10 @@ export const constantRouterMap = [ component: SignUpPage, hidden: true, }, - { - path: "/screen", - name: 'HomePage', - component: () => import(/* webpackChunkName: "user" */ "@/views/screen/HomePage"), - hidden: true, - }, + // { + // path: "/screen", + // name: 'HomePage', + // component: () => import(/* webpackChunkName: "user" */ "@/views/screen/HomePage"), + // hidden: true, + // }, ]; diff --git a/src/permission.js b/src/permission.js index 87e7570..7ef073a 100644 --- a/src/permission.js +++ b/src/permission.js @@ -75,7 +75,8 @@ router.beforeEach(async (to, from, next) => { console.log('redirect--------', redirect) console.log('to.path--------', to.path) // const redirect = decodeURIComponent(from.query.redirect || to.path) - if (to.path === redirect || to.path === '/screen') { + // 大屏的路由跳转 to.path === redirect || to.path === '/screen' + if (to.path === redirect) { // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record next({ ...to, replace: true }) } else { diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue index 550c156..6e3df24 100644 --- a/src/views/dashboard/Analysis.vue +++ b/src/views/dashboard/Analysis.vue @@ -16,19 +16,19 @@ -
- - 大屏 -
+ + + +
+ + + @@ -219,7 +227,7 @@ export default { } .download { - margin-top: 8px; + margin: 8px 0 12px; font-size: 16px; text-align: center; }