Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

点击返回首页 #1682

Merged
merged 8 commits into from
May 8, 2024
Merged

点击返回首页 #1682

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9e3b66d
点击返回首页
yzygyin Apr 28, 2024
fe4454e
Merge branch 'TencentBlueKing:main' into tenant-yzygyin
yzygyin Apr 29, 2024
cd7b23e
修改eslint问题
yzygyin Apr 30, 2024
d946669
修改eslint
yzygyin Apr 30, 2024
4edadd0
Merge branch 'TencentBlueKing:main' into tenant-yzygyin
yzygyin May 8, 2024
4867383
根据不同的角色返回不同页面
yzygyin May 8, 2024
7b3d895
Merge branch 'tenant-yzygyin' of https://github.com/yzygyin/bk-user i…
yzygyin May 8, 2024
b901ca8
Merge branch 'tenant-yzygyin' of https://github.com/yzygyin/bk-user i…
yzygyin May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/pages/src/views/Header.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
<template #side-header>
<div
style="display: flex; margin-right: 16px; text-decoration: none; align-items: center"
class="cursor-pointer"
@click="onGoBack"
>
<i class="user-icon icon-user-logo-i" />
<span class="title-desc">{{ $t('蓝鲸用户管理') }}</span>
Expand Down Expand Up @@ -149,7 +151,6 @@ const state = reactive({

const userStore = useUser();
const headerNav = ref([]);

const userInfo = computed(() => {
const { role } = userStore.user;
const baseNav = [
Expand Down Expand Up @@ -218,6 +219,16 @@ const toTenant = () => {
headerNav.value = [];
};

const onGoBack = () => {
const { role } = userStore.user;
if (role === 'super_manager' && route.name !== 'tenant') {
router.push({ name: 'tenant' });
headerNav.value = [];
} else if (role === 'tenant_manager' && route.name !== 'organization') {
router.push({ name: 'organization' });
} else if (role === 'natural_user') return;
};

// 产品文档
const docUrl = window.BK_USER_DOC_URL;

Expand Down