diff --git a/web/src/router/index.js b/web/src/router/index.js index 95b80d3fc33370543f6af543136c8bede3bdf396..3e41cdcb6e3d550b628f6755842e3f4e7f1671db 100644 --- a/web/src/router/index.js +++ b/web/src/router/index.js @@ -18,12 +18,6 @@ const baseRouters = [{ name: 'register', component: () => import ('@/view/login/register.vue') - }, - { - path: "/404", - name: "404", - component: () => - import ('@/view/error/index.vue') } ] diff --git a/web/src/store/module/router.js b/web/src/store/module/router.js index 548a42e178860a2093625b5dde5698d6db63f664..e6dac8e773debbd371fa6a3f3f5d7cac79092e15 100644 --- a/web/src/store/module/router.js +++ b/web/src/store/module/router.js @@ -37,11 +37,20 @@ export const router = { }] const asyncRouterRes = await asyncMenu() const asyncRouter = asyncRouterRes.data.menus + asyncRouter.push({ + path: "404", + name: "404", + hidden: true, + meta: { + title: "迷路了*。*", + }, + component: 'view/error/index.vue' + }) formatRouter(asyncRouter) baseRouter[0].children = asyncRouter baseRouter.push({ path: '*', - redirect: '/404' + redirect: '/layout/404' }) asyncRouterHandle(baseRouter) diff --git a/web/src/view/dashboard/index.vue b/web/src/view/dashboard/index.vue index b38e546419e62c79cfa024d946712061c4e62395..7e7433f18267b628dd8387c17022a7e3b4908ce3 100644 --- a/web/src/view/dashboard/index.vue +++ b/web/src/view/dashboard/index.vue @@ -172,7 +172,7 @@ export default { padding-top: 0; background-color: rgb(243,243,243);; .top{ - width: 98%; + width: 100%; height: 360px; margin-top: 20px; overflow: hidden; @@ -185,7 +185,7 @@ export default { } } .mid{ - width: 98%; + width: 100%; height: 380px; .chart-wrapper { height: 340px; @@ -195,9 +195,12 @@ export default { } } .bottom{ - width: 97%; + width: 100%; height: 300px; margin: 20px 0; + .el-row{ + margin-right: 4px !important; + } .chart-player{ width: 100%; height: 270px; diff --git a/web/src/view/error/index.vue b/web/src/view/error/index.vue index 23d9fa95221e2efc2319f3aeb00580acd4735550..ac91b44b650f9c43592e902f2819c803831ddb81 100644 --- a/web/src/view/error/index.vue +++ b/web/src/view/error/index.vue @@ -4,6 +4,7 @@

页面被神秘力量吸走了,请联系我们修复

+

常见问题为菜单未分配仪表盘,可自行分配仪表盘或修改默认路由

@@ -21,7 +22,7 @@ export default {