diff --git a/apps/finance/src/api/core/auth.ts b/apps/finance/src/api/core/auth.ts index 7907d2f..84c21da 100644 --- a/apps/finance/src/api/core/auth.ts +++ b/apps/finance/src/api/core/auth.ts @@ -39,7 +39,10 @@ export namespace AuthApi { * 登录 */ export async function loginApi(data: AuthApi.LoginParams) { - return requestClient.post>('/auth/login', data); + return requestClient.post>( + '/auth/login', + data, + ); } /** diff --git a/apps/finance/src/api/request.ts b/apps/finance/src/api/request.ts index d5f9415..303bf00 100644 --- a/apps/finance/src/api/request.ts +++ b/apps/finance/src/api/request.ts @@ -4,6 +4,7 @@ import type { RequestClientOptions } from '@vben/request'; import { useAppConfig } from '@vben/hooks'; +import { $t } from '@vben/locales'; import { preferences } from '@vben/preferences'; import { authenticateResponseInterceptor, @@ -39,11 +40,6 @@ function createRequestClient(baseURL: string, options?: RequestClientOptions) { if (preferences.app.loginExpiredMode === 'modal' && accessStore.isAccessChecked) { accessStore.setLoginExpired(true); } else { - // 显示登录过期提示 - message.error({ - content: '您的登录状态已过期,请重新登录', - duration: 3, - }); // 短暂延迟后跳转,让用户看到提示 setTimeout(() => { authStore.logout(); @@ -196,7 +192,7 @@ function createRequestClient(baseURL: string, options?: RequestClientOptions) { // 如果是401错误,已经在自定义拦截器中处理了,这里不需要额外提示 if (responseCode === 401) { - return Promise.reject(error); + return Promise.reject($t('ui.fallback.http.unauthorized')); } // 如果有后端返回的错误信息,优先显示 diff --git a/apps/finance/src/router/routes/modules/dashboard.ts b/apps/finance/src/router/routes/modules/dashboard.ts index c1385ff..1ce06d8 100644 --- a/apps/finance/src/router/routes/modules/dashboard.ts +++ b/apps/finance/src/router/routes/modules/dashboard.ts @@ -1,17 +1,15 @@ import type { RouteRecordRaw } from 'vue-router'; -import { $t } from '#/locales'; - const routes: RouteRecordRaw[] = [ { meta: { icon: 'lucide:layout-dashboard', order: -1, - title: $t('page.dashboard.title'), + title: '首页', }, name: 'Dashboard', path: '/dashboard', - component: () => import('#/views/dashboard/analytics/index.vue'), + component: () => import('#/views/dashboard/workspace/index.vue'), }, ]; diff --git a/apps/finance/src/router/routes/modules/posting.ts b/apps/finance/src/router/routes/modules/posting.ts index 25911e5..47469ef 100644 --- a/apps/finance/src/router/routes/modules/posting.ts +++ b/apps/finance/src/router/routes/modules/posting.ts @@ -3,7 +3,7 @@ import type { RouteRecordRaw } from 'vue-router'; const routes: RouteRecordRaw[] = [ { meta: { - icon: 'ic:baseline-view-in-ar', + icon: 'ant-design:book-twotone', keepAlive: true, order: 1000, title: '入账管理', diff --git a/apps/finance/src/router/routes/modules/system.ts b/apps/finance/src/router/routes/modules/system.ts index ce83239..4d42594 100644 --- a/apps/finance/src/router/routes/modules/system.ts +++ b/apps/finance/src/router/routes/modules/system.ts @@ -3,7 +3,7 @@ import type { RouteRecordRaw } from 'vue-router'; const routes: RouteRecordRaw[] = [ { meta: { - icon: 'ic:baseline-view-in-ar', + icon: 'ant-design:setting-twotone', keepAlive: true, order: 1000, title: '系统管理', diff --git a/apps/finance/src/views/dashboard/workspace/index.vue b/apps/finance/src/views/dashboard/workspace/index.vue index b95d613..1947e83 100644 --- a/apps/finance/src/views/dashboard/workspace/index.vue +++ b/apps/finance/src/views/dashboard/workspace/index.vue @@ -1,250 +1,249 @@ diff --git a/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-header.vue b/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-header.vue index a3ea3eb..a210fa4 100644 --- a/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-header.vue +++ b/packages/effects/common-ui/src/ui/dashboard/workbench/workbench-header.vue @@ -27,17 +27,20 @@ withDefaults(defineProps(), { -
-
+
+
待办 2/10
-
+
项目 8
-
+
团队 300
diff --git a/packages/stores/src/modules/user.ts b/packages/stores/src/modules/user.ts index c296be8..8a3dea5 100644 --- a/packages/stores/src/modules/user.ts +++ b/packages/stores/src/modules/user.ts @@ -31,10 +31,18 @@ export const useUserStore = defineStore('core-user', { this.userRoles = roles; }, }, - state: (): AccessState => ({ - userInfo: null, - userRoles: '', - }), + state: (): AccessState => { + // 从localStorage中读取用户信息 + const storedUserInfo = localStorage.getItem('userInfo'); + const userInfo = storedUserInfo ? JSON.parse(storedUserInfo) : null; + // 从用户信息中提取角色 + const roles = userInfo?.role ?? ''; + + return { + userInfo, + userRoles: roles, + }; + }, }); // 解决热更新问题