Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
02ab2f23
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,发现更多精彩内容 >>
提交
02ab2f23
编写于
5月 07, 2020
作者:
C
Captain.B
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/dev' into dev
上级
17c8a98f
dee5790a
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
15 addition
and
18 deletion
+15
-18
frontend/src/business/components/performance/report/PerformanceTestReport.vue
...s/components/performance/report/PerformanceTestReport.vue
+2
-8
frontend/src/business/components/settings/Setting.vue
frontend/src/business/components/settings/Setting.vue
+1
-1
frontend/src/business/components/settings/workspace/WorkspaceMember.vue
...usiness/components/settings/workspace/WorkspaceMember.vue
+8
-7
frontend/src/business/components/track/case/components/TestCaseMove.vue
...usiness/components/track/case/components/TestCaseMove.vue
+2
-2
frontend/src/i18n/en-US.js
frontend/src/i18n/en-US.js
+1
-0
frontend/src/i18n/zh-CN.js
frontend/src/i18n/zh-CN.js
+1
-0
未找到文件。
frontend/src/business/components/performance/report/PerformanceTestReport.vue
浏览文件 @
02ab2f23
...
...
@@ -136,10 +136,10 @@
},
handleEdit
(
report
)
{
if
(
report
.
status
===
"
Error
"
)
{
this
.
$warning
(
"
报告生成错误,无法查看!
"
);
this
.
$warning
(
this
.
$t
(
'
report.generation_error
'
)
);
return
false
}
else
if
(
report
.
status
===
"
Starting
"
)
{
this
.
$info
(
"
报告生成中...
"
)
this
.
$info
(
this
.
$t
(
'
being_generated
'
)
)
return
false
}
this
.
$router
.
push
({
...
...
@@ -172,10 +172,4 @@
width
:
100%
;
}
.table-page
{
padding-top
:
20px
;
margin-right
:
-9px
;
float
:
right
;
}
</
style
>
frontend/src/business/components/settings/Setting.vue
浏览文件 @
02ab2f23
...
...
@@ -3,7 +3,7 @@
<div
class=
"menus"
>
<ms-current-user/>
<el-divider/>
<h1>
设置
</h1>
<h1>
{{
$t
(
'
commons.setting
'
)
}}
</h1>
<ms-setting-menu/>
</div>
<div
class=
"container"
>
...
...
frontend/src/business/components/settings/workspace/WorkspaceMember.vue
浏览文件 @
02ab2f23
...
...
@@ -9,7 +9,7 @@
<el-table-column
prop=
"name"
:label=
"$t('commons.username')"
/>
<el-table-column
prop=
"email"
:label=
"$t('commons.email')"
/>
<el-table-column
prop=
"phone"
:label=
"$t('commons.phone')"
/>
<el-table-column
prop=
"roles"
label=
"角色
"
width=
"120"
>
<el-table-column
prop=
"roles"
:label=
"$t('commons.role')
"
width=
"120"
>
<
template
v-slot:default=
"scope"
>
<el-tag
v-for=
"(role, index) in scope.row.roles"
:key=
"index"
size=
"mini"
effect=
"dark"
type=
"success"
>
{{
role
.
name
}}
...
...
@@ -29,9 +29,9 @@
:total=
"total"
/>
</el-card>
<el-dialog
title=
"添加成员
"
:visible.sync=
"createVisible"
width=
"30%"
:destroy-on-close=
"true"
@
close=
"closeFunc"
>
<el-dialog
:title=
"$t('member.create')
"
:visible.sync=
"createVisible"
width=
"30%"
:destroy-on-close=
"true"
@
close=
"closeFunc"
>
<el-form
:model=
"form"
ref=
"form"
:rules=
"rules"
label-position=
"right"
label-width=
"100px"
size=
"small"
>
<el-form-item
label=
"成员
"
prop=
"userIds"
>
<el-form-item
:label=
"$t('commons.member')
"
prop=
"userIds"
>
<el-select
v-model=
"form.userIds"
multiple
:placeholder=
"$t('member.please_choose_member')"
class=
"select-width"
>
<el-option
...
...
@@ -44,7 +44,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"角色
"
prop=
"roleIds"
>
<el-form-item
:label=
"$t('commons.role')
"
prop=
"roleIds"
>
<el-select
v-model=
"form.roleIds"
multiple
:placeholder=
"$t('role.please_choose_role')"
class=
"select-width"
>
<el-option
v-for=
"item in form.roles"
...
...
@@ -63,7 +63,7 @@
</
template
>
</el-dialog>
<el-dialog
title=
"修改成员
"
:visible.sync=
"updateVisible"
width=
"30%"
:destroy-on-close=
"true"
@
close=
"closeFunc"
>
<el-dialog
:title=
"$t('member.modify')
"
:visible.sync=
"updateVisible"
width=
"30%"
:destroy-on-close=
"true"
@
close=
"closeFunc"
>
<el-form
:model=
"form"
label-position=
"right"
label-width=
"100px"
size=
"small"
ref=
"updateUserForm"
>
<el-form-item
label=
"ID"
prop=
"id"
>
<el-input
v-model=
"form.id"
autocomplete=
"off"
:disabled=
"true"
/>
...
...
@@ -77,7 +77,7 @@
<el-form-item
:label=
"$t('commons.phone')"
prop=
"phone"
>
<el-input
v-model=
"form.phone"
autocomplete=
"off"
/>
</el-form-item>
<el-form-item
label=
"角色
"
prop=
"roleIds"
>
<el-form-item
:label=
"$t('commons.role')
"
prop=
"roleIds"
>
<el-select
v-model=
"form.roleIds"
multiple
:placeholder=
"$t('role.please_choose_role')"
class=
"select-width"
>
<el-option
v-for=
"item in form.allroles"
...
...
@@ -104,10 +104,11 @@
import
{
TokenKey
}
from
"
../../../../common/js/constants
"
;
import
MsTablePagination
from
"
../../common/pagination/TablePagination
"
;
import
MsTableHeader
from
"
../../common/components/MsTableHeader
"
;
import
MsTag
from
"
../../common/components/MsTag
"
;
export
default
{
name
:
"
MsMember
"
,
components
:
{
MsCreateBox
,
MsTablePagination
,
MsTableHeader
},
components
:
{
MsCreateBox
,
MsTablePagination
,
MsTableHeader
,
MsTag
},
data
()
{
return
{
result
:
{},
...
...
frontend/src/business/components/track/case/components/TestCaseMove.vue
浏览文件 @
02ab2f23
<
template
>
<el-dialog
:title=
"$t('test_track.
plan_view.change_executor
')"
<el-dialog
:title=
"$t('test_track.
case.move
')"
:visible.sync=
"dialogVisible"
:before-close=
"close"
width=
"20%"
>
<el-select
v-model.trim=
"module"
:placeholder=
"$t('test_track.
plan_view.select_executor
')"
:placeholder=
"$t('test_track.
case.move
')"
filterable
>
<el-option
v-for=
"item in moduleOptions"
:key=
"item.id"
:label=
"item.path"
:value=
"item.id"
></el-option>
...
...
frontend/src/i18n/en-US.js
浏览文件 @
02ab2f23
...
...
@@ -2,6 +2,7 @@ export default {
commons
:
{
'
workspace
'
:
'
Workspace
'
,
'
organization
'
:
'
Organization
'
,
'
setting
'
:
'
Setting
'
,
'
project
'
:
'
Project
'
,
'
name
'
:
'
Name
'
,
'
description
'
:
'
Description
'
,
...
...
frontend/src/i18n/zh-CN.js
浏览文件 @
02ab2f23
...
...
@@ -2,6 +2,7 @@ export default {
commons
:
{
'
workspace
'
:
'
工作空间
'
,
'
organization
'
:
'
组织
'
,
'
setting
'
:
'
设置
'
,
'
project
'
:
'
项目
'
,
'
name
'
:
'
名称
'
,
'
description
'
:
'
描述
'
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录