test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/metersphere/metersphere

This commit is contained in:
chenjianxing 2021-01-26 18:03:17 +08:00
parent 33a397b65e f6a34e7076
commit b5b5d3aa54
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/track/controller/TestPlanController.java
View File

@ -50,7 +50,7 @@ public class TestPlanController {
QueryTestPlanRequest request = new QueryTestPlanRequest(); QueryTestPlanRequest request = new QueryTestPlanRequest();
request.setWorkspaceId(workspaceId); request.setWorkspaceId(workspaceId);
request.setProjectId(projectId); request.setProjectId(projectId);
return testPlanService.listTestPlan(request); return testPlanService.listTestPlanByProject(request);
} }
@PostMapping("/list/all") @PostMapping("/list/all")

5
frontend/src/business/components/common/router/router.js
View File

@ -1,7 +1,6 @@
import Vue from "vue"; import Vue from "vue";
import VueRouter from 'vue-router' import VueRouter from 'vue-router'
import RouterSidebar from "./RouterSidebar"; import RouterSidebar from "./RouterSidebar";
import axios from "axios";
import Setting from "@/business/components/settings/router"; import Setting from "@/business/components/settings/router";
import API from "@/business/components/api/router"; import API from "@/business/components/api/router";
import Performance from "@/business/components/performance/router"; import Performance from "@/business/components/performance/router";
@ -31,8 +30,8 @@ router.beforeEach((to, from, next) => {
//解决localStorage清空，cookie没失效导致的卡死问题 //解决localStorage清空，cookie没失效导致的卡死问题
if (!localStorage.getItem('Admin-Token')) { if (!localStorage.getItem('Admin-Token')) {
axios.get("/signout"); // axios.get("/signout");
console.log("signout"); // console.log("signout");
localStorage.setItem('Admin-Token', "{}"); localStorage.setItem('Admin-Token', "{}");
window.location.href = "/login"; window.location.href = "/login";
next(); next();