diff --git a/frontend/src/login/Login.vue b/frontend/src/login/Login.vue
index a0ddc5ac2b..fd8dccca81 100644
--- a/frontend/src/login/Login.vue
+++ b/frontend/src/login/Login.vue
@@ -109,8 +109,10 @@
this.$post("signin", this.form, (response) => {
// 登录信息保存 cookie
Cookies.set(TokenKey, response.data);
- // 保存上次角色
- localStorage.setItem("lastSourceId", JSON.parse(Cookies.get(TokenKey)).lastSourceId);
+ let rolesArray = response.data.roles;
+ let roles = rolesArray.map(r => r.id);
+ // 保存角色
+ localStorage.setItem("roles", roles);
window.location.href = "/"
});
} else {
diff --git a/frontend/src/performance/App.vue b/frontend/src/performance/App.vue
index de6a245a25..45dadf7905 100644
--- a/frontend/src/performance/App.vue
+++ b/frontend/src/performance/App.vue
@@ -2,7 +2,6 @@
-
+
创建测试
@@ -30,7 +29,6 @@
import MsSetting from "./components/HeaderSetting";
import MsView from "./components/router/View";
import MsUser from "./components/HeaderUser";
- import MsSwitchUser from "./components/HeaderSwitchUser";
import MsWebSocket from "./components/websocket/WebSocket";
export default {
@@ -51,7 +49,7 @@
window.location.href = "/login"
});
},
- components: {MsWebSocket, MsUser, MsMenus, MsSetting, MsView, MsSwitchUser},
+ components: {MsWebSocket, MsUser, MsMenus, MsSetting, MsView},
methods: {
}
}
diff --git a/frontend/src/performance/components/settings/SettingMenu.vue b/frontend/src/performance/components/settings/SettingMenu.vue
index 9f2237b346..147ec2f87f 100644
--- a/frontend/src/performance/components/settings/SettingMenu.vue
+++ b/frontend/src/performance/components/settings/SettingMenu.vue
@@ -1,17 +1,17 @@
-
+
账号
用户
- 测试资源池
+ 测试资源池
组织
工作空间
API Keys
-
+
工作空间
diff --git a/frontend/src/performance/permission.js b/frontend/src/performance/permission.js
index 2862e6fac5..07e52ca0c2 100644
--- a/frontend/src/performance/permission.js
+++ b/frontend/src/performance/permission.js
@@ -7,10 +7,13 @@ const whiteList = ['/login']; // no redirect whitelist
export const permission = {
inserted(el, binding) {
const { value } = binding;
- const roles = localStorage.getItem("lastSourceId");
+ const rolesString = localStorage.getItem("roles");
+ const roles = rolesString.split(',');
if (value && value instanceof Array && value.length > 0) {
const permissionRoles = value;
- const hasPermission = permissionRoles.includes(roles);
+ const hasPermission = roles.some(role => {
+ return permissionRoles.includes(role)
+ });
if (!hasPermission) {
el.parentNode && el.parentNode.removeChild(el)
}