diff --git a/frontend/src/business/App.vue b/frontend/src/business/App.vue index a1d3dd29b6..d500708e0b 100644 --- a/frontend/src/business/App.vue +++ b/frontend/src/business/App.vue @@ -15,7 +15,7 @@ - + @@ -31,7 +31,7 @@ import MsTopMenus from "./components/common/head/HeaderTopMenus"; import MsView from "./components/common/router/View"; import MsUser from "./components/common/head/HeaderUser"; -import MsHeaderOrgWs from "./components/common/head/HeaderOrgWs"; +import MsHeaderWs from "./components/common/head/HeaderWs"; import MsLanguageSwitch from "./components/common/head/LanguageSwitch"; import {hasLicense, saveLocalStorage, setColor, setDefaultTheme} from "@/common/js/utils"; import {registerRequestHeaders} from "@/common/js/ajax"; @@ -199,7 +199,7 @@ export default { MsUser, MsView, MsTopMenus, - MsHeaderOrgWs, + MsHeaderWs, "LicenseMessage": header.default, "Theme": theme.default } diff --git a/frontend/src/business/components/common/head/HeaderOrgWs.vue b/frontend/src/business/components/common/head/HeaderWs.vue similarity index 94% rename from frontend/src/business/components/common/head/HeaderOrgWs.vue rename to frontend/src/business/components/common/head/HeaderWs.vue index 970b582f6c..9a8f7fbf3c 100644 --- a/frontend/src/business/components/common/head/HeaderOrgWs.vue +++ b/frontend/src/business/components/common/head/HeaderWs.vue @@ -31,14 +31,14 @@ import { fullScreenLoading, getCurrentUser, - getCurrentWorkspaceId, + getCurrentWorkspaceId, hasPermissions, saveLocalStorage, stopFullScreenLoading } from "@/common/js/utils"; -import {ORGANIZATION_ID, PROJECT_ID, WORKSPACE_ID} from "@/common/js/constants"; +import {PROJECT_ID, WORKSPACE_ID} from "@/common/js/constants"; export default { - name: "MsHeaderOrgWs", + name: "MsHeaderWs", created() { this.initMenuData(); }, @@ -81,9 +81,9 @@ export default { }, getRedirectUrl(user) { if (!user.lastProjectId || !user.lastWorkspaceId) { - // 没有项目级的权限直接回到 / - // 只是某一个工作空间的用户组也转到 / - return "/"; + // 没有项目级的权限直接回到 /setting/project/:type + // 只是某一个工作空间的用户组也转到 /setting/project/:type + return "/setting/project/:type"; } let redirectUrl = sessionStorage.getItem('redirectUrl'); if (redirectUrl.startsWith("/")) { diff --git a/frontend/src/business/components/common/router/router.js b/frontend/src/business/components/common/router/router.js index 857f41be43..f890077d97 100644 --- a/frontend/src/business/components/common/router/router.js +++ b/frontend/src/business/components/common/router/router.js @@ -65,7 +65,7 @@ function redirectLoginPath(originPath) { if (hasPermissions('PROJECT_USER:READ', 'PROJECT_ENVIRONMENT:READ', 'PROJECT_OPERATING_LOG:READ', 'PROJECT_FILE:READ+JAR', 'PROJECT_FILE:READ+FILE', 'PROJECT_CUSTOM_CODE:READ')) { redirectUrl = '/project/home'; } else if (hasPermissions('WORKSPACE_SERVICE:READ', 'WORKSPACE_MESSAGE:READ', 'WORKSPACE_USER:READ', 'WORKSPACE_PROJECT_MANAGER:READ', 'WORKSPACE_PROJECT_ENVIRONMENT:READ', 'WORKSPACE_OPERATING_LOG:READ', 'WORKSPACE_TEMPLATE:READ')) { - redirectUrl = '/setting'; + redirectUrl = '/setting/project/:type'; } else if (hasPermissions('SYSTEM_USER:READ', 'SYSTEM_WORKSPACE:READ', 'SYSTEM_GROUP:READ', 'SYSTEM_TEST_POOL:READ', 'SYSTEM_SETTING:READ', 'SYSTEM_AUTH:READ', 'SYSTEM_QUOTA:READ', 'SYSTEM_OPERATING_LOG:READ')) { redirectUrl = '/setting'; } else { diff --git a/frontend/src/business/components/settings/SettingHome.vue b/frontend/src/business/components/settings/SettingHome.vue index 04a250f8fd..b9588b0071 100644 --- a/frontend/src/business/components/settings/SettingHome.vue +++ b/frontend/src/business/components/settings/SettingHome.vue @@ -4,20 +4,23 @@
- {{ $t('commons.system_data')}} + {{ $t('commons.system_data') }}
- {{ $t('commons.system_user')}} {{statistic.userSize}} {{ $t('commons.user_unit') }} + {{ $t('commons.system_user') }} {{ statistic.userSize }} + {{ $t('commons.user_unit') }}
- {{ $t('commons.system_workspace')}} {{statistic.workspaceSize}} {{ $t('commons.workspace_unit') }} + {{ $t('commons.system_workspace') }} {{ statistic.workspaceSize }} + {{ $t('commons.workspace_unit') }}
- {{ $t('commons.system_project')}} {{statistic.projectSize}} {{ $t('commons.workspace_unit') }} + {{ $t('commons.system_project') }} {{ statistic.projectSize }} + {{ $t('commons.workspace_unit') }}
@@ -28,11 +31,13 @@