diff --git a/test-track/frontend/src/business/head/TrackHeaderMenus.vue b/test-track/frontend/src/business/head/TrackHeaderMenus.vue index 3899939d35..512202fd1d 100644 --- a/test-track/frontend/src/business/head/TrackHeaderMenus.vue +++ b/test-track/frontend/src/business/head/TrackHeaderMenus.vue @@ -83,12 +83,15 @@ export default { this.pathName = '/track/plan/all'; } else if (to.path.indexOf("/track/case") >= 0) { this.pathName = '/track/case/all?projectId=' + this.getProjectId(); + } else if (to.path.indexOf("/track/issue") >= 0) { + this.pathName = '/track/issue' } else if(to.path.indexOf("/track/home") >= 0) { // 默认跳转到首页 for (let menu of this.menus) { if (hasPermission(menu.permission)) { // 如果有首页的权限则不处理 if(menu.path.indexOf("/track/home") >= 0) { + this.pathName = menu.path; break; } else { // 否则跳转到第一个有权限的页面 diff --git a/test-track/frontend/src/business/home/TrackHome.vue b/test-track/frontend/src/business/home/TrackHome.vue index 55e3d646ff..400e5472a1 100644 --- a/test-track/frontend/src/business/home/TrackHome.vue +++ b/test-track/frontend/src/business/home/TrackHome.vue @@ -135,9 +135,14 @@ export default { ); break; case "issue": - home = this.$router.resolve( - "/track/issue/" + uuid + "/" + dataType + "/" + selectType - ); + home = this.$router.resolve({ + name: "issueManagement", + params: { + id: uuid, + projectId: dataType, + dataSelectRange: selectType, + } + }); } if (home) { window.open(home.href, "_blank"); diff --git a/test-track/frontend/src/business/issue/IssueList.vue b/test-track/frontend/src/business/issue/IssueList.vue index eac71f03ce..4ff1214c7c 100644 --- a/test-track/frontend/src/business/issue/IssueList.vue +++ b/test-track/frontend/src/business/issue/IssueList.vue @@ -301,7 +301,10 @@ export default { activated() { if (this.$route.params.dataSelectRange) { this.dataSelectRange = this.$route.params.dataSelectRange; + } else { + this.dataSelectRange = ""; } + console.log(this.dataSelectRange); this.loading = true; this.$nextTick(() => { // 解决错位问题 @@ -469,6 +472,8 @@ export default { this.page.condition.unClosedTestPlanIssue = true; } else if (this.dataSelectRange === 'AllRelatedTestPlan') { this.page.condition.allTestPlanIssue = true; + } else { + this.page.condition = {}; } this.page.condition.projectId = this.projectId; this.page.condition.workspaceId = this.workspaceId;