From b81be6e5c5ed76f9625c0f4bab31c6dd94e714c2 Mon Sep 17 00:00:00 2001 From: chenxf Date: Sun, 4 Jan 2026 19:35:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(permission):=20=E6=B7=BB=E5=8A=A0store?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=AF=BC=E5=85=A5=E5=B9=B6=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E7=94=9F=E6=88=90=E9=94=99=E8=AF=AF=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 导入store模块用于状态管理 - 修改generateRoutes方法添加reject参数以处理异步错误 - 当获取用户菜单失败时显示中文提示信息 - 获取菜单失败时自动执行用户登出操作并拒绝Promise - 更新生产环境、测试环境配置文件中的年报服务地址 --- .env.production | 2 +- .env.test129 | 2 +- .env.test238 | 2 +- src/store/modules/permission.js | 8 ++++++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.env.production b/.env.production index ab3a2a0..800702e 100644 --- a/.env.production +++ b/.env.production @@ -16,5 +16,5 @@ VUE_APP_CAS_SERVER_UNITE = 'http://10.194.188.69/cas' VUE_APP_AICEPS_URL = 'http://10.201.62.87:6891/gz-aiceps-manage' # 年报服务地址 无需写/aiceps-service-web 如和aiccs同域名同端口部署则置空 -VUE_APP_AICEPS_SERVICE_URL = '' +VUE_APP_AICEPS_SERVICE_URL = 'http://219.148.175.144:56666' diff --git a/.env.test129 b/.env.test129 index b202d4a..95cee90 100644 --- a/.env.test129 +++ b/.env.test129 @@ -14,4 +14,4 @@ VUE_APP_ENV=test129 VUE_APP_RANDOM_URL=http://172.22.80.156:8085/aicods_gz_old/login/sso_home.html # 年报服务地址 无需写/aiceps-service-web 如和aiccs同域名同端口部署则置空 -VUE_APP_AICEPS_SERVICE_URL = '' \ No newline at end of file +VUE_APP_AICEPS_SERVICE_URL = 'http://219.148.175.144:56666' diff --git a/.env.test238 b/.env.test238 index 607dfd5..f861c54 100644 --- a/.env.test238 +++ b/.env.test238 @@ -20,4 +20,4 @@ VUE_APP_CAS_SERVER=http://10.201.62.2:6889/cas VUE_APP_AICEPS_URL=http://10.201.62.87:6891/gz-aiceps-manage # 年报服务地址 无需写/aiceps-service-web 如和aiccs同域名同端口部署则置空 -VUE_APP_AICEPS_SERVICE_URL = '' \ No newline at end of file +VUE_APP_AICEPS_SERVICE_URL = 'http://219.148.175.144:56666' diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 5ac136d..0591168 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -4,6 +4,7 @@ import user from './user' import { Message } from 'element-ui' import Layout from '@/layout' import Empty from '@/layout/Empty' +import store from '@/store' /** * Use meta.role to determine if the current user has permission @@ -106,7 +107,7 @@ const mutations = { const actions = { generateRoutes({ commit }, roles) { - return new Promise(resolve => { + return new Promise((resolve, reject) => { // let accessedRoutes // console.log('222', roles) // roles = ['admin'] @@ -127,7 +128,10 @@ const actions = { getUserMenus(data).then(response => { let data = response if (response.code !== 0) { - Message.warning(response.msg) + Message.warning('获取用户菜单失败') + store.dispatch('user/logout').finally(() => { + reject() + }) } else { data = response.data.filter((item) => { return item.path