diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml index 2c7fc5d9ebb25ef6d4877925d2748919adaaabea..ea550161fe2e9fe19855764d9149718965b81717 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml @@ -18,6 +18,9 @@ AND project.workspace_id = #{request.workspaceId} + + AND project.id = #{request.projectId} + order by load_test.update_time desc diff --git a/frontend/src/i18n/en_US.js b/frontend/src/i18n/en_US.js index 5f3c327c7aea2b7c1487fa20559103458ce311bf..cfd82da2d87bca91731e5a48b30e9fda692cbd0e 100644 --- a/frontend/src/i18n/en_US.js +++ b/frontend/src/i18n/en_US.js @@ -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': 'Organizationn 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', diff --git a/frontend/src/i18n/zh_CN.js b/frontend/src/i18n/zh_CN.js index f9fd22cc36e03d321d3659e14863c5c84274bd98..7af4d66e5f721e70ea87b7e27de9b66c5c889bf5 100644 --- a/frontend/src/i18n/zh_CN.js +++ b/frontend/src/i18n/zh_CN.js @@ -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': '首页', diff --git a/frontend/src/performance/components/HeaderMenus.vue b/frontend/src/performance/components/HeaderMenus.vue index 7856fd5ae478d9928f765efc0e98204d19299693..5cd1f09d6292ab972b8c6b10ee6ff772bcc8016c 100644 --- a/frontend/src/performance/components/HeaderMenus.vue +++ b/frontend/src/performance/components/HeaderMenus.vue @@ -18,7 +18,7 @@ - + 所有测试 diff --git a/frontend/src/performance/components/project/MsProject.vue b/frontend/src/performance/components/project/MsProject.vue index d3272fdcd6f9ebda093217d10c2eb40a36997e56..bc31fe265503bbdfca973555b5e6f8d4ab97c3c9 100644 --- a/frontend/src/performance/components/project/MsProject.vue +++ b/frontend/src/performance/components/project/MsProject.vue @@ -5,18 +5,19 @@
- 项目 + {{$t('commons.project')}} -
- - + +