权限增加不同角色不同默认首页

doc/RBAC 权限.sql

@@ -74,6 +74,16 @@ VALUES ('审核价格', '/products/offer/audit', 'products')
 INSERT INTO [dbo].[auth_resource] ([res_name] ,[res_pattern], [res_category])
 VALUES ('录入价格', '/products/offer/put', 'products')
 
+-- 默认页面
+INSERT INTO [dbo].[auth_resource] ([res_name] ,[res_pattern], [res_category])
+VALUES ('最新计划', 'route=/reservation/newest', 'page')
+INSERT INTO [dbo].[auth_resource] ([res_name] ,[res_pattern], [res_category])
+VALUES ('机票订票', 'route=/airticket', 'page')
+INSERT INTO [dbo].[auth_resource] ([res_name] ,[res_pattern], [res_category])
+VALUES ('产品管理(客服)', 'route=/products', 'page')
+INSERT INTO [dbo].[auth_resource] ([res_name] ,[res_pattern], [res_category])
+VALUES ('产品管理(供应商)', 'route=/products?from', 'page')
+
 INSERT INTO [dbo].[auth_permission] ([role_id] ,[res_id])
 VALUES (1, 1)
 INSERT INTO [dbo].[auth_permission] ([role_id] ,[res_id])

src/stores/Auth.js

@@ -60,6 +60,8 @@ const useAuthStore = create(obervseLifecycle((set, get) => ({
 
   loginStatus: 0,
 
+  defaltRoute: '',
+
   permissionList: [],
 
   isPermitted: (perm) => {
@@ -98,13 +100,26 @@ const useAuthStore = create(obervseLifecycle((set, get) => ({
     setStorage(KEY_USER_ID, userDetail.LMI_SN)
     setStorage(KEY_TRAVEL_AGENCY_ID, userDetail.LMI_VEI_SN)
     appendRequestParams('token', loginToken)
+    appendRequestParams('lmi_sn', userDetail.LMI_SN)
     // loadPageSpy(`${json.Result.VName}-${json.Result.LoginName}`)
     startTokenInterval()
   },
 
   loadUserPermission: async(userId) => {
+    let deaultPage = '/'
     const permissionResult = await fetchPermissionListByUserId(userId)
+    const pageList = permissionResult.filter(p => {
+      return p.res_category === 'page'
+    })
+    if (pageList.length > 0) {
+      const resPattern = pageList[0].res_pattern
+      const splitResult = resPattern.split('=')
+      if (splitResult.length > 1)
+        deaultPage = splitResult[1]
+    }
+
     set(() => ({
+      defaultRoute: deaultPage,
       permissionList: permissionResult.map(p => p.res_pattern)
     }))
   },

src/views/Login.jsx

@@ -6,9 +6,8 @@ import useAuthStore from '@/stores/Auth'
 import useNoticeStore from '@/stores/Notice'
 
 function Login() {
-  const [validateUserPassword, loginStatus] =
+  const [validateUserPassword, loginStatus, defaultRoute] =
-    useAuthStore((state) => [state.validateUserPassword, state.loginStatus])
+    useAuthStore((state) => [state.validateUserPassword, state.loginStatus, state.defaultRoute])
-    const getBulletinUnReadCount = useNoticeStore((state) => state.getBulletinUnReadCount)
 
   const { t, i18n } = useTranslation()
   const { notification } = App.useApp()
@@ -17,7 +16,7 @@ function Login() {
 
   useEffect (() => {
     if (loginStatus === 302) {
-      navigate('/')
+      navigate(defaultRoute)
     }
   }, [loginStatus])
 

src/views/account/Management.jsx

@@ -185,7 +185,7 @@ function Management() {
   }
 
   const showResetPasswordConfirm = (account) => {
-    const randomPassword = account.username + (Math.floor(Math.random() * 900) + 100)
+    const randomPassword = account.username + '@' + (Math.floor(Math.random() * 900) + 100)
     modal.confirm({
       title: 'Do you want to reset password?',
       icon: <ExclamationCircleFilled />,
@@ -194,8 +194,8 @@ function Management() {
         resetAccountPassword(account.userId, randomPassword)
           .then(() => {
             notification.info({
-              message: '新密码：' + randomPassword,
+              message: `请复制新密码给 [${account.realname}]`,
-              description: `请复制密码给 [${account.realname}]`,
+              description: '新密码：' + randomPassword,
               placement: 'top',
               duration: 60,
             })

src/views/account/RoleList.jsx

@@ -69,6 +69,7 @@ function RoleList() {
       ['domestic', '国内供应商'],
       ['air-ticket', '机票供应商'],
       ['products', '产品价格'],
+      ['page', '默认页面'],
     ]);
 
     const permissionTree = []