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 2c7fc5d9eb..ea550161fe 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 5f3c327c7a..cfd82da2d8 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 f9fd22cc36..7af4d66e5f 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 7856fd5ae4..5cd1f09d62 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 d3272fdcd6..bc31fe2655 100644 --- a/frontend/src/performance/components/project/MsProject.vue +++ b/frontend/src/performance/components/project/MsProject.vue @@ -5,18 +5,19 @@
- 项目 + {{$t('commons.project')}} -
- - + +