Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
e1d83236
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,发现更多精彩内容 >>
提交
e1d83236
编写于
2月 26, 2020
作者:
S
shiziyuan9527
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # frontend/src/i18n/en_US.js # frontend/src/i18n/zh_CN.js
上级
a7ea3340
9c7b776a
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
54 addition
and
39 deletion
+54
-39
backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
...java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
+3
-0
frontend/src/i18n/en_US.js
frontend/src/i18n/en_US.js
+6
-2
frontend/src/i18n/zh_CN.js
frontend/src/i18n/zh_CN.js
+5
-1
frontend/src/performance/components/HeaderMenus.vue
frontend/src/performance/components/HeaderMenus.vue
+1
-1
frontend/src/performance/components/project/MsProject.vue
frontend/src/performance/components/project/MsProject.vue
+17
-18
frontend/src/performance/components/project/RecentProject.vue
...tend/src/performance/components/project/RecentProject.vue
+6
-9
frontend/src/performance/components/router/router.js
frontend/src/performance/components/router/router.js
+2
-2
frontend/src/performance/components/testPlan/AllTestPlan.vue
frontend/src/performance/components/testPlan/AllTestPlan.vue
+14
-6
未找到文件。
backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
浏览文件 @
e1d83236
...
...
@@ -18,6 +18,9 @@
<if
test=
"request.workspaceId != null"
>
AND project.workspace_id = #{request.workspaceId}
</if>
<if
test=
"request.projectId != null"
>
AND project.id = #{request.projectId}
</if>
</where>
<if
test=
"request.recent"
>
order by load_test.update_time desc
...
...
frontend/src/i18n/en_US.js
浏览文件 @
e1d83236
...
...
@@ -2,6 +2,7 @@ const en_US = {
commons
:
{
'
workspace
'
:
'
Workspace
'
,
'
organization
'
:
'
Organization
'
,
'
project
'
:
'
Project
'
,
'
name
'
:
'
Name
'
,
'
description
'
:
'
Description
'
,
'
save
'
:
'
Save
'
,
...
...
@@ -21,7 +22,7 @@ const en_US = {
'
input_name
'
:
'
Please enter a workspace name
'
,
'
input_name_2_50
'
:
'
2 to 50 characters in length
'
,
'
search_by_name
'
:
'
Search by name
'
,
'
organization_name
'
:
'
Organization
n
Name
'
,
'
organization_name
'
:
'
Organization Name
'
,
'
please_choose_organization
'
:
'
Please Choose Organization
'
,
},
organization
:
{
...
...
@@ -34,7 +35,10 @@ const en_US = {
'
special_characters_are_not_supported
'
:
'
Special characters are not supported
'
,
},
project
:
{
'
recent
'
:
'
Recent Projects
'
'
recent
'
:
'
Recent Projects
'
,
'
create
'
:
'
Create Project
'
,
'
delete_confirm
'
:
'
Are you sure you want to delete this project?
'
,
'
search_by_name
'
:
'
Search by name
'
,
},
i18n
:
{
'
home
'
:
'
Home
'
,
...
...
frontend/src/i18n/zh_CN.js
浏览文件 @
e1d83236
...
...
@@ -2,6 +2,7 @@ const zh_CN = {
commons
:
{
'
workspace
'
:
'
工作空间
'
,
'
organization
'
:
'
组织
'
,
'
project
'
:
'
项目
'
,
'
name
'
:
'
名称
'
,
'
description
'
:
'
描述
'
,
'
save
'
:
'
保存
'
,
...
...
@@ -34,7 +35,10 @@ const zh_CN = {
'
special_characters_are_not_supported
'
:
'
不支持特殊字符
'
,
},
project
:
{
'
recent
'
:
'
最近的项目
'
'
recent
'
:
'
最近的项目
'
,
'
create
'
:
'
创建项目
'
,
'
delete_confirm
'
:
'
这个项目确定要删除吗?
'
,
'
search_by_name
'
:
'
根据名称搜索
'
,
},
i18n
:
{
'
home
'
:
'
首页
'
,
...
...
frontend/src/performance/components/HeaderMenus.vue
浏览文件 @
e1d83236
...
...
@@ -18,7 +18,7 @@
<
template
slot=
"title"
>
测试
</
template
>
<ms-recent-test-plan/>
<el-divider/>
<el-menu-item
index=
"/allTest"
>
<el-menu-item
index=
"/allTest
/all
"
>
<font-awesome-icon
:icon=
"['fa', 'list-ul']"
/>
<span
style=
"padding-left: 5px;"
>
所有测试
</span>
</el-menu-item>
...
...
frontend/src/performance/components/project/MsProject.vue
浏览文件 @
e1d83236
...
...
@@ -5,18 +5,19 @@
<div
slot=
"header"
>
<el-row
type=
"flex"
justify=
"space-between"
align=
"middle"
>
<span
class=
"title"
>
项目
{{
$t
(
'
commons.project
'
)
}}
<ms-create-box
:tips=
"btnTips"
:exec=
"create"
/>
</span>
<span
class=
"search"
>
<el-input
type=
"text"
size=
"small"
placeholder=
"根据名称搜索"
prefix-icon=
"el-icon-search"
<el-input
type=
"text"
size=
"small"
:placeholder=
"$t('project.search_by_name')"
prefix-icon=
"el-icon-search"
maxlength=
"60"
v-model=
"condition"
clearable
/>
</span>
</el-row>
</div>
<el-table
:data=
"items"
style=
"width: 100%"
>
<el-table-column
prop=
"name"
label=
"名称
"
/>
<el-table-column
prop=
"description"
label=
"描述
"
/>
<el-table-column
prop=
"name"
:label=
"$t('commons.name')
"
/>
<el-table-column
prop=
"description"
:label=
"$t('commons.description')
"
/>
<el-table-column>
<template
slot-scope=
"scope"
>
<el-button
@
click=
"edit(scope.row)"
type=
"primary"
icon=
"el-icon-edit"
size=
"mini"
circle
/>
...
...
@@ -43,17 +44,17 @@
</div>
</el-card>
<el-dialog
title=
"创建项目
"
:visible.sync=
"createVisible"
>
<el-dialog
:title=
"$t('project.create')
"
:visible.sync=
"createVisible"
>
<el-form
:model=
"form"
:rules=
"rules"
ref=
"form"
label-position=
"left"
label-width=
"100px"
size=
"small"
>
<el-form-item
label=
"名称
"
>
<el-form-item
:label=
"$t('commons.name')
"
>
<el-input
v-model=
"form.name"
autocomplete=
"off"
></el-input>
</el-form-item>
<el-form-item
label=
"描述
"
>
<el-form-item
:label=
"$t('commons.description')
"
>
<el-input
type=
"textarea"
v-model=
"form.description"
></el-input>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
type=
"primary"
@
click=
"submit('form')"
size=
"medium"
>
创建
</el-button>
<el-button
type=
"primary"
@
click=
"submit('form')"
size=
"medium"
>
{{$t('commons.save')}}
</el-button>
</div>
</el-dialog>
</div>
...
...
@@ -71,7 +72,7 @@
return
{
createVisible
:
false
,
result
:
{},
btnTips
:
"
添加项目
"
,
btnTips
:
this
.
$t
(
'
project.create
'
)
,
condition
:
""
,
items
:
[],
form
:
{},
...
...
@@ -99,7 +100,7 @@
},
edit
(
row
)
{
this
.
createVisible
=
true
;
this
.
form
=
row
;
this
.
form
=
Object
.
assign
({},
row
)
;
},
submit
(
formName
)
{
this
.
$refs
[
formName
].
validate
((
valid
)
=>
{
...
...
@@ -111,7 +112,7 @@
this
.
result
=
this
.
$post
(
"
/project/
"
+
saveType
,
this
.
form
,
()
=>
{
this
.
createVisible
=
false
;
this
.
list
();
Message
.
success
(
'
保存成功
'
);
Message
.
success
(
this
.
$t
(
'
commons.save_success
'
)
);
});
}
else
{
return
false
;
...
...
@@ -119,17 +120,15 @@
});
},
del
(
row
)
{
this
.
$confirm
(
'
这个项目确定要删除吗?
'
,
'
提示
'
,
{
confirmButtonText
:
'
确定
'
,
cancelButtonText
:
'
取消
'
,
this
.
$confirm
(
this
.
$t
(
'
project.delete_confirm
'
),
this
.
$t
(
'
commons.prompt
'
)
,
{
confirmButtonText
:
this
.
$t
(
'
commons.confirm
'
)
,
cancelButtonText
:
this
.
$t
(
'
commons.cancel
'
)
,
type
:
'
warning
'
}
).
then
(
()
=>
{
}
,
()
=>
{
this
.
$get
(
'
/project/delete/
'
+
row
.
id
,
()
=>
{
Message
.
success
(
'
删除成功
'
);
Message
.
success
(
this
.
$t
(
'
commons.delete_success
'
)
);
this
.
list
();
});
}).
catch
(()
=>
{
});
},
list
()
{
...
...
frontend/src/performance/components/project/RecentProject.vue
浏览文件 @
e1d83236
<
template
>
<el-menu>
<el-menu
router
menu-trigger=
"click"
:default-active=
"$route.path"
>
<div
class=
"recent-text"
>
<i
class=
"el-icon-time"
/>
{{
$t
(
'
project.recent
'
)
}}
</div>
<el-menu-item
:key=
"recentProject.id"
v-for=
"recentProject in recentProjects"
@
click=
"goTest(recentProject)"
>
{{
recentProject
.
name
}}
<el-menu-item
:key=
"p.id"
v-for=
"p in recentProjects"
:index=
"'/allTest/' + p.id"
:route=
"
{name:'allTest', params:{projectId:p.id, projectName:p.name}}">
{{
p
.
name
}}
</el-menu-item>
</el-menu>
</
template
>
...
...
@@ -18,12 +20,7 @@
this
.
recentProjects
=
response
.
data
;
});
},
methods
:
{
goTest
(
project
)
{
window
.
console
.
log
(
project
);
// this.$router.push({path: '/allTest', params: {projectId: project.id, projectName: project.name}});
}
},
methods
:
{},
data
()
{
return
{
recentProjects
:
[],
...
...
frontend/src/performance/components/router/router.js
浏览文件 @
e1d83236
...
...
@@ -85,11 +85,11 @@ const router = new VueRouter({
}
},
{
path
:
"
/allTest
"
,
path
:
"
/allTest/:projectId
"
,
name
:
"
allTest
"
,
components
:
{
content
:
AllTestPlan
},
props
:
true
,
},
{
path
:
"
/project
"
,
...
...
frontend/src/performance/components/testPlan/AllTestPlan.vue
浏览文件 @
e1d83236
...
...
@@ -80,16 +80,13 @@
<
script
>
export
default
{
props
:
{
projectId
:
String
,
projectName
:
String
},
data
()
{
return
{
result
:
{},
queryPath
:
"
/testplan/list
"
,
deletePath
:
"
/testplan/delete
"
,
condition
:
""
,
projectId
:
null
,
tableData
:
[],
multipleSelection
:
[],
currentPage
:
1
,
...
...
@@ -98,20 +95,31 @@
loading
:
false
,
}
},
watch
:
{
'
$route
'
(
to
)
{
this
.
projectId
=
to
.
params
.
projectId
;
this
.
initTableData
();
}
},
created
:
function
()
{
this
.
projectId
=
this
.
$route
.
params
.
projectId
;
this
.
initTableData
();
},
methods
:
{
initTableData
()
{
let
param
=
{
name
:
this
.
condition
name
:
this
.
condition
,
};
if
(
this
.
projectId
!==
'
all
'
)
{
param
.
projectId
=
this
.
projectId
;
}
this
.
result
=
this
.
$post
(
this
.
buildPagePath
(
this
.
queryPath
),
param
,
response
=>
{
let
data
=
response
.
data
;
this
.
total
=
data
.
itemCount
;
this
.
tableData
=
data
.
listObject
;
})
})
;
},
search
()
{
this
.
initTableData
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录