Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
8ff3d8f0
M
metersphere
项目概览
MeterSphere
/
metersphere
上一次同步 大约 3 年
通知
25
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
metersphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8ff3d8f0
编写于
2月 25, 2020
作者:
S
shiziyuan9527
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
组织和工作空间切换0.5
上级
9e9951ad
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
19 addition
and
18 deletion
+19
-18
frontend/src/performance/App.vue
frontend/src/performance/App.vue
+2
-2
frontend/src/performance/components/HeaderUser.vue
frontend/src/performance/components/HeaderUser.vue
+17
-16
未找到文件。
frontend/src/performance/App.vue
浏览文件 @
8ff3d8f0
...
...
@@ -4,10 +4,10 @@
<el-col
:span=
"4"
>
<a
class=
"logo"
/>
</el-col>
<el-col
:span=
"
10
"
>
<el-col
:span=
"
6
"
>
<ms-top-menus/>
</el-col>
<el-col
:span=
"1
0
"
>
<el-col
:span=
"1
4
"
>
<ms-user/>
</el-col>
</el-row>
...
...
frontend/src/performance/components/HeaderUser.vue
浏览文件 @
8ff3d8f0
<
template
>
<el-row>
<el-col
:span=
"1
0"
:offset=
"8
"
>
<el-col
:span=
"1
4"
:offset=
"6
"
>
<el-menu
:unique-opened=
"true"
mode=
"horizontal"
router
menu-trigger=
"click"
class=
"header-user-menu"
background-color=
"rgb(44, 42, 72)"
text-color=
"#fff"
>
<el-submenu
index=
"1"
popper-class=
"submenu"
v-permission=
"['org_admin']"
>
<template
slot=
"title"
>
组织
</
template
>
<template
slot=
"title"
>
【组织】
{{
currrentOrganizationName
}}
</
template
>
<label
v-for=
"(item,index) in organizationList"
:key=
"index"
>
<el-menu-item
@
click=
"changeOrg(item)"
>
{{item.name}}
<i
class=
"el-icon-check"
...
...
@@ -16,7 +16,7 @@
</label>
</el-submenu>
<el-submenu
index=
"2"
popper-class=
"submenu"
v-permission=
"['test_manager', 'test_user', 'test_viewer']"
>
<
template
slot=
"title"
>
工作空间
</
template
>
<
template
slot=
"title"
>
【工作空间】
{{
currrentWorkspaceName
}}
</
template
>
<label
v-for=
"(item,index) in workspaceList"
:key=
"index"
>
<el-menu-item
@
click=
"changeWs(item)"
>
{{item.name}}
...
...
@@ -27,7 +27,7 @@
</el-menu>
</el-col>
<el-col
:span=
"
3"
:offset=
"3
"
>
<el-col
:span=
"
2"
:offset=
"2
"
>
<el-dropdown
size=
"medium"
@
command=
"handleCommand"
>
<span
class=
"dropdown-link"
>
{{currentUser.name}}
<i
class=
"el-icon-caret-bottom el-icon--right"
/>
...
...
@@ -61,7 +61,9 @@
],
currentUserInfo
:
{},
currentUserId
:
JSON
.
parse
(
Cookies
.
get
(
TokenKey
)).
id
,
workspaceIds
:
[]
workspaceIds
:
[],
currrentOrganizationName
:
'
选择组织
'
,
currrentWorkspaceName
:
'
选择工作空间
'
}
},
computed
:
{
...
...
@@ -69,16 +71,6 @@
let
user
=
Cookies
.
get
(
TokenKey
);
window
.
console
.
log
(
user
);
return
JSON
.
parse
(
user
);
},
workspaceParentId
()
{
let
result
=
''
;
if
(
this
.
workspaceIds
.
includes
(
this
.
currentUserInfo
.
lastSourceId
))
{
let
obj
=
this
.
workspaceList
.
filter
(
r
=>
r
.
id
===
this
.
currentUserInfo
.
lastSourceId
);
if
(
obj
.
length
>
0
)
{
result
=
obj
[
0
].
organizationId
;
}
}
return
result
;
}
},
methods
:
{
...
...
@@ -101,7 +93,12 @@
let
roles
=
this
.
currentUser
.
roles
.
map
(
r
=>
r
.
id
);
if
(
roles
.
indexOf
(
ROLE_ORG_ADMIN
)
>
-
1
)
{
this
.
$get
(
"
/organization/list/userorg/
"
+
this
.
currentUserId
,
response
=>
{
this
.
organizationList
=
response
.
data
;
let
data
=
response
.
data
;
this
.
organizationList
=
data
;
let
org
=
data
.
filter
(
r
=>
r
.
id
===
this
.
currentUser
.
lastOrganizationId
);
if
(
org
.
length
>
0
)
{
this
.
currrentOrganizationName
=
org
[
0
].
name
;
}
});
}
if
(
roles
.
indexOf
(
ROLE_TEST_MANAGER
)
>
-
1
||
roles
.
indexOf
(
ROLE_TEST_USER
)
>
-
1
||
roles
.
indexOf
(
ROLE_TEST_VIEWER
)
>
-
1
)
{
...
...
@@ -111,6 +108,10 @@
this
.
workspaceList
=
[{
index
:
'
1-1
'
,
name
:
'
无工作区间
'
}]
}
else
{
this
.
workspaceList
=
data
;
let
workspace
=
data
.
filter
(
r
=>
r
.
id
===
this
.
currentUser
.
lastWorkspaceId
);
if
(
workspace
.
length
>
0
)
{
this
.
currrentWorkspaceName
=
workspace
[
0
].
name
;
}
}
// this.workspaceIds = response.data.map(r = r.id);
})
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录