From e3e5fa7eebf63678f941727e7b3ef7f1e77e190f Mon Sep 17 00:00:00 2001 From: qsh <> Date: Mon, 26 Aug 2024 16:32:52 +0800 Subject: [PATCH 01/17] shangc --- src/views/Basic/Role/Comp/ReportDaily.vue | 129 +++++++++++++++++++++- src/views/Basic/Role/index.vue | 12 +- 2 files changed, 135 insertions(+), 6 deletions(-) diff --git a/src/views/Basic/Role/Comp/ReportDaily.vue b/src/views/Basic/Role/Comp/ReportDaily.vue index c6fde32..a58a93d 100644 --- a/src/views/Basic/Role/Comp/ReportDaily.vue +++ b/src/views/Basic/Role/Comp/ReportDaily.vue @@ -1,7 +1,132 @@ - + 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() // 消息弹窗 -- 2.38.1.windows.1 From 076f301920aaa40f9e785c739cf3952b7fd9a512 Mon Sep 17 00:00:00 2001 From: qsh <> Date: Wed, 28 Aug 2024 10:09:23 +0800 Subject: [PATCH 02/17] sc --- src/permission.js | 10 +++- src/router/modules/remaining.ts | 10 ++++ src/views/Basic/Role/Comp/ReportDaily.vue | 8 +++ src/views/Login/MPLogin.vue | 65 +++++++++++++++++++++++ 4 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 src/views/Login/MPLogin.vue 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/Role/Comp/ReportDaily.vue b/src/views/Basic/Role/Comp/ReportDaily.vue index a58a93d..7e420e4 100644 --- a/src/views/Basic/Role/Comp/ReportDaily.vue +++ b/src/views/Basic/Role/Comp/ReportDaily.vue @@ -1,6 +1,13 @@