diff --git a/src/permission.js b/src/permission.js index dd31173..1990cb9 100644 --- a/src/permission.js +++ b/src/permission.js @@ -14,7 +14,15 @@ const { start, done } = useNProgress() const { loadStart, loadDone } = usePageLoading() // 路由不重定向白名单 -const whiteList = ['/login', '/social-login', '/auth-redirect', '/bind', '/register', '/swagger'] +const whiteList = [ + '/login', + '/mp-login', + '/social-login', + '/auth-redirect', + '/bind', + '/register', + '/swagger' +] // 路由加载前 router.beforeEach(async (to, from, next) => { diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index 3508257..a5e6863 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -161,6 +161,16 @@ const remainingRouter: AppRouteRecordRaw[] = [ noTagsView: true } }, + { + path: '/mp-login', + component: () => import('@/views/Login/MPLogin.vue'), + name: 'MPLogin', + meta: { + hidden: true, + title: '用户绑定', + noTagsView: true + } + }, { path: '/sso', component: () => import('@/views/Login/Login.vue'), diff --git a/src/views/Basic/Dept/DeptForm.vue b/src/views/Basic/Dept/DeptForm.vue index 9f61981..ca5e3a0 100644 --- a/src/views/Basic/Dept/DeptForm.vue +++ b/src/views/Basic/Dept/DeptForm.vue @@ -1,76 +1,129 @@ - diff --git a/src/views/Basic/Role/Comp/ReportDaily.vue b/src/views/Basic/Role/Comp/ReportDaily.vue index c6fde32..7e420e4 100644 --- a/src/views/Basic/Role/Comp/ReportDaily.vue +++ b/src/views/Basic/Role/Comp/ReportDaily.vue @@ -1,7 +1,140 @@ - + diff --git a/src/views/Basic/Role/index.vue b/src/views/Basic/Role/index.vue index 2f894b1..ede7e35 100644 --- a/src/views/Basic/Role/index.vue +++ b/src/views/Basic/Role/index.vue @@ -75,9 +75,13 @@ @success="getList" /> - + + + @@ -89,7 +93,7 @@ import RoleForm from './RoleForm.vue' import RoleEmployee from './Comp/RoleEmployee.vue' import RoleAssignMenuForm from './RoleAssignMenuForm.vue' import RoleDataPermissionForm from './RoleDataPermissionForm.vue' -// import ReportDaily from './Comp/ReportDaily.vue' +import ReportDaily from './Comp/ReportDaily.vue' import * as RoleApi from '@/api/system/role' const message = useMessage() // 消息弹窗 diff --git a/src/views/Login/MPLogin.vue b/src/views/Login/MPLogin.vue new file mode 100644 index 0000000..6be8279 --- /dev/null +++ b/src/views/Login/MPLogin.vue @@ -0,0 +1,65 @@ + + + + +