diff --git a/mock/controller/router.js b/mock/controller/router.js index 3b23b9b8a..42139cdc3 100644 --- a/mock/controller/router.js +++ b/mock/controller/router.js @@ -21,25 +21,25 @@ const data = [ component: 'Layout', redirect: 'noRedirect', name: 'PersonnelManagement', - meta: { title: '人员', icon: 'users-cog', permissions: ['admin'] }, + meta: { title: '标准法规部', icon: 'users-cog', permissions: ['admin'] }, children: [ { path: 'userManagement', name: 'UserManagement', component: '@/views/personnelManagement/userManagement/index', - meta: { title: '用户管理' }, + meta: { title: '动态&资料' }, }, { path: 'roleManagement', name: 'RoleManagement', component: '@/views/personnelManagement/roleManagement/index', - meta: { title: '角色管理' }, + meta: { title: '国内标准法规' }, }, { path: 'menuManagement', name: 'MenuManagement', component: '@/views/personnelManagement/menuManagement/index', - meta: { title: '菜单管理', badge: 'New' }, + meta: { title: '海外标准法规', badge: 'New' }, }, ], }, diff --git a/src/config/routes.js b/src/config/routes.js index 3c23356a1..993cc42cc 100644 --- a/src/config/routes.js +++ b/src/config/routes.js @@ -21,25 +21,25 @@ const data = [ component: 'Layout', redirect: 'noRedirect', name: 'PersonnelManagement', - meta: { title: '人员', icon: 'users-cog', permissions: ['admin'] }, + meta: { title: '标准法规部', icon: 'users-cog', permissions: ['admin'] }, children: [ { path: 'userManagement', name: 'UserManagement', component: '@/views/personnelManagement/userManagement/index', - meta: { title: '用户管理' }, + meta: { title: '动态&资料' }, }, { path: 'roleManagement', name: 'RoleManagement', component: '@/views/personnelManagement/roleManagement/index', - meta: { title: '角色管理' }, + meta: { title: '国内标准法规' }, }, { path: 'menuManagement', name: 'MenuManagement', component: '@/views/personnelManagement/menuManagement/index', - meta: { title: '菜单管理', badge: 'New' }, + meta: { title: '海外标准法规', badge: 'New' }, }, ], }, diff --git a/src/layouts/components/VabAd/index.vue b/src/layouts/components/VabAd/index.vue index 54416bf06..1f289e20b 100644 --- a/src/layouts/components/VabAd/index.vue +++ b/src/layouts/components/VabAd/index.vue @@ -1,70 +1,14 @@ - + diff --git a/src/layouts/components/VabAppMain/index.vue b/src/layouts/components/VabAppMain/index.vue index a76adc47c..6803e8a46 100644 --- a/src/layouts/components/VabAppMain/index.vue +++ b/src/layouts/components/VabAppMain/index.vue @@ -78,9 +78,6 @@ .vab-keel { margin: $base-padding; } - .app-main-height { - min-height: $base-app-main-height; - } .footer-copyright { min-height: 55px; diff --git a/src/layouts/components/VabAvatar/index.vue b/src/layouts/components/VabAvatar/index.vue index 67dc68bb6..318f4651b 100644 --- a/src/layouts/components/VabAvatar/index.vue +++ b/src/layouts/components/VabAvatar/index.vue @@ -1,10 +1,8 @@ - + diff --git a/src/layouts/components/VabThemeBar/index.vue b/src/layouts/components/VabThemeBar/index.vue index bd09aba24..2adeaf72a 100644 --- a/src/layouts/components/VabThemeBar/index.vue +++ b/src/layouts/components/VabThemeBar/index.vue @@ -1,259 +1,16 @@ - - + diff --git a/src/router/index.js b/src/router/index.js index 57d49004c..1efc1caa5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -37,17 +37,17 @@ export const constantRoutes = [ ] export const asyncRoutes = [ + // { + // path: '/', + // component: Home, + // meta: { + // title: '首页', + // icon: 'home', + // affix: true, + // }, + // }, { path: '/', - component: Home, - meta: { - title: '首页', - icon: 'home', - affix: true, - }, - }, - { - path: '/index', component: Layout, redirect: 'index', children: [ @@ -302,21 +302,21 @@ export const asyncRoutes = [ name: 'UserManagement', component: () => import('@/views/personnelManagement/userManagement/index'), - meta: { title: '用户管理' }, + meta: { title: '动态&资料' }, }, { path: 'roleManagement', name: 'RoleManagement', component: () => import('@/views/personnelManagement/roleManagement/index'), - meta: { title: '角色管理' }, + meta: { title: '国内标准法规' }, }, { path: 'menuManagement', name: 'MenuManagement', component: () => import('@/views/personnelManagement/menuManagement/index'), - meta: { title: '菜单管理', badge: 'New' }, + meta: { title: '海外标准法规', badge: 'New' }, }, ], }, diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 602b5a083..6406c10a2 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -181,7 +181,6 @@ margin-top: 1.3vh; line-height: 5.2vh; background: rgba(182, 213, 255, 0.22); - border: 1px solid #ddd; } } diff --git a/src/views/index/index.vue b/src/views/index/index.vue index 39f82f4e6..038134f6e 100644 --- a/src/views/index/index.vue +++ b/src/views/index/index.vue @@ -1,958 +1,26 @@ - + + diff --git a/src/views/personnelManagement/roleManagement/index.vue b/src/views/personnelManagement/roleManagement/index.vue index 5fcf65896..c1ffc519c 100644 --- a/src/views/personnelManagement/roleManagement/index.vue +++ b/src/views/personnelManagement/roleManagement/index.vue @@ -1,150 +1,15 @@