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/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/RecentProject.vue b/frontend/src/performance/components/project/RecentProject.vue
index 5ad0b05a3f..4c21e9486e 100644
--- a/frontend/src/performance/components/project/RecentProject.vue
+++ b/frontend/src/performance/components/project/RecentProject.vue
@@ -1,11 +1,13 @@
-
+
{{$t('project.recent')}}
-
- {{ recentProject.name }}
+
+
+ {{ p.name }}
@@ -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: [],
diff --git a/frontend/src/performance/components/router/router.js b/frontend/src/performance/components/router/router.js
index 9c3cbdb91d..22ef26fb81 100644
--- a/frontend/src/performance/components/router/router.js
+++ b/frontend/src/performance/components/router/router.js
@@ -85,11 +85,11 @@ const router = new VueRouter({
}
},
{
- path: "/allTest",
+ path: "/allTest/:projectId",
+ name: "allTest",
components: {
content: AllTestPlan
},
- props: true,
},
{
path: "/project",
diff --git a/frontend/src/performance/components/testPlan/AllTestPlan.vue b/frontend/src/performance/components/testPlan/AllTestPlan.vue
index 675e6769be..f675fbbe96 100644
--- a/frontend/src/performance/components/testPlan/AllTestPlan.vue
+++ b/frontend/src/performance/components/testPlan/AllTestPlan.vue
@@ -80,16 +80,13 @@