diff --git a/agent/app/service/file.go b/agent/app/service/file.go index b0c954189..a41ebc919 100644 --- a/agent/app/service/file.go +++ b/agent/app/service/file.go @@ -466,7 +466,7 @@ func (f *FileService) ReadLogByLine(req request.FileReadByLineReq) (*response.Fi if req.TaskID != "" { opts = append(opts, taskRepo.WithByID(req.TaskID)) } else { - opts = append(opts, repo.WithByType(req.TaskType), taskRepo.WithOperate(req.TaskOperate), taskRepo.WithResourceID(req.ID)) + opts = append(opts, repo.WithByType(req.TaskType), taskRepo.WithOperate(req.TaskOperate), taskRepo.WithResourceID(req.ResourceID)) } taskModel, err := taskRepo.GetFirst(opts...) if err != nil { diff --git a/frontend/src/routers/index.ts b/frontend/src/routers/index.ts index 50daaca18..e93449a9e 100644 --- a/frontend/src/routers/index.ts +++ b/frontend/src/routers/index.ts @@ -39,9 +39,12 @@ router.beforeEach((to, from, next) => { return; } + if (to.path === '/apps/all' && to.query.install != undefined) { + return next(); + } + const activeMenuKey = 'cachedRoute' + (to.meta.activeMenu || ''); const cachedRoute = localStorage.getItem(activeMenuKey); - if ( to.meta.activeMenu && to.meta.activeMenu != from.meta.activeMenu &&