diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php index 52111573..53fc13b6 100755 --- a/app/Http/Controllers/Api/ProjectController.php +++ b/app/Http/Controllers/Api/ProjectController.php @@ -1005,7 +1005,7 @@ class ProjectController extends AbstractController $builder->whereTaskId($task->id); } else { $project = Project::userProject($project_id); - $builder->whereTaskId($project->id); + $builder->whereProjectId($project->id); } // $list = $builder->orderByDesc('created_at')->paginate(Base::getPaginate(100, 20)); diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue index daf517ef..3fa3123a 100644 --- a/resources/assets/js/pages/manage/components/ProjectList.vue +++ b/resources/assets/js/pages/manage/components/ProjectList.vue @@ -33,12 +33,14 @@ {{$L('项目设置')}} {{$L('成员管理')}} + {{$L('项目动态')}} {{$L('已归档任务')}} {{$L('移交项目')}} {{$L('归档项目')}} {{$L('删除项目')}} + {{$L('项目动态')}} {{$L('已归档任务')}} {{$L('退出项目')}} @@ -247,7 +249,7 @@ - +
@@ -262,7 +264,7 @@ - +
@@ -277,7 +279,7 @@ - +
@@ -358,6 +360,14 @@ + + + + +