提交 712ca07a 编写于 作者: J jinlan.du

Merge branch 'gin-vue-admin_v2_dev' of...

Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev
......@@ -18,12 +18,6 @@ const baseRouters = [{
name: 'register',
component: () =>
import ('@/view/login/register.vue')
},
{
path: "/404",
name: "404",
component: () =>
import ('@/view/error/index.vue')
}
]
......
......@@ -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)
......
......@@ -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;
......
......@@ -4,6 +4,7 @@
<div class="inner">
<img src="../../assets/notFound.png">
<p>页面被神秘力量吸走了,请联系我们修复</p>
<p style="font-size:18px;line-height:40px;">常见问题为菜单未分配仪表盘,可自行分配仪表盘或修改默认路由</p>
<p></p>
<img src="../../assets/qm.png" class="leftPic">
</div>
......@@ -21,7 +22,7 @@ export default {
<style lang="scss">
.big{
width: 100%;
height: 100vh;
height: calc(100vh - 220px);
background-color: rgb(244,244,244);
position: relative;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册