From 8174d4b6b32249232e5ac964a98631d8e569626a Mon Sep 17 00:00:00 2001 From: kuaifan Date: Tue, 15 Jun 2021 18:21:21 +0800 Subject: [PATCH] no message --- .../Controllers/Api/ProjectController.php | 41 ++++++ app/Models/ProjectLog.php | 30 +++++ .../js/pages/manage/components/ProjectLog.vue | 126 ++++++++++++++++++ .../js/pages/manage/components/TaskDetail.vue | 30 +++-- resources/assets/js/store/actions.js | 4 +- resources/assets/sass/pages/components/_.scss | 1 + .../sass/pages/components/dialog-wrapper.scss | 3 +- .../sass/pages/components/project-log.scss | 79 +++++++++++ .../sass/pages/components/task-detail.scss | 32 ++++- 9 files changed, 328 insertions(+), 18 deletions(-) create mode 100644 resources/assets/js/pages/manage/components/ProjectLog.vue create mode 100644 resources/assets/sass/pages/components/project-log.scss diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php index 7c20c9cd..2e88cb46 100755 --- a/app/Http/Controllers/Api/ProjectController.php +++ b/app/Http/Controllers/Api/ProjectController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api; use App\Models\AbstractModel; use App\Models\Project; use App\Models\ProjectColumn; +use App\Models\ProjectLog; use App\Models\ProjectTask; use App\Models\ProjectTaskFile; use App\Models\ProjectUser; @@ -798,4 +799,44 @@ class ProjectController extends AbstractController // return $task->deleteTask(); } + + /** + * 获取项目、任务日志 + * + * @apiParam {Number} project_id 项目ID + * @apiParam {Number} task_id 任务ID（与 项目ID 二选一，任务ID优先） + * + * @apiParam {Number} [page] 当前页，默认:1 + * @apiParam {Number} [pagesize] 每页显示数量，默认:20，最大:100 + */ + public function log__lists() + { + user::auth(); + // + $project_id = intval(Request::input('project_id')); + $task_id = intval(Request::input('task_id')); + // + $builder = ProjectLog::with(['user']); + if ($task_id > 0) { + $task = ProjectTask::userTask($task_id); + $builder->whereTaskId($task->id); + } else { + $project = Project::userProject($project_id); + $builder->whereTaskId($project->id); + } + // + $list = $builder->orderByDesc('created_at')->paginate(Base::getPaginate(100, 20)); + $list->transform(function (ProjectLog $log) { + $timestamp = Carbon::parse($log->created_at)->timestamp; + $log->time = [ + 'ymd' => date(date("Y", $timestamp) == date("Y", Base::time()) ? "m-d" : "Y-m-d", $timestamp), + 'hi' => date("h:i", $timestamp) , + 'week' => "周" . Base::getTimeWeek($timestamp), + 'segment' => Base::getTimeDayeSegment($timestamp), + ]; + return $log; + }); + // + return Base::retSuccess('success', $list); + } } diff --git a/app/Models/ProjectLog.php b/app/Models/ProjectLog.php index 96b6b449..d0047f67 100644 --- a/app/Models/ProjectLog.php +++ b/app/Models/ProjectLog.php @@ -4,9 +4,39 @@ namespace App\Models; /** * Class ProjectLog + * * @package App\Models + * @property int $id + * @property int|null $project_id 项目ID + * @property int|null $column_id 列表ID + * @property int|null $task_id 项目ID + * @property int|null $userid 会员ID + * @property string|null $detail 详细信息 + * @property \Illuminate\Support\Carbon|null $created_at + * @property \Illuminate\Support\Carbon|null $updated_at + * @property-read \App\Models\User|null $user + * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog query() + * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereColumnId($value) + * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereCreatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereDetail($value) + * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereId($value) + * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereProjectId($value) + * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereTaskId($value) + * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereUpdatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|ProjectLog whereUserid($value) + * @mixin \Eloquent */ class ProjectLog extends AbstractModel { + /** + * @return \Illuminate\Database\Eloquent\Relations\HasOne + */ + public function user(): \Illuminate\Database\Eloquent\Relations\HasOne + { + return $this->hasOne(User::class, 'userid', 'userid'); + } + } diff --git a/resources/assets/js/pages/manage/components/ProjectLog.vue b/resources/assets/js/pages/manage/components/ProjectLog.vue new file mode 100644 index 00000000..b9023b52 --- /dev/null +++ b/resources/assets/js/pages/manage/components/ProjectLog.vue @@ -0,0 +1,126 @@ + + + diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue index a7a5f779..8fc2d31a 100644 --- a/resources/assets/js/pages/manage/components/TaskDetail.vue +++ b/resources/assets/js/pages/manage/components/TaskDetail.vue @@ -330,24 +330,28 @@
- -
- -
-

{{$L('聊天')}}

-

{{$L('动态')}}

+
-

{{$L('聊天')}}

-

{{$L('动态')}}

+

{{$L('聊天')}}

+

{{$L('动态')}}

-
+ +
{{$L('暂无消息')}}
id === data.id); if (index > -1) { state.projectOpenTask.sub_task.splice(index, 1, Object.assign(state.projectOpenTask.sub_task[index], data)) @@ -654,7 +654,7 @@ export default { } if (data.id == state.projectOpenTask.id) { state.projectOpenTask = Object.assign({}, state.projectOpenTask, {_show: false}); - } else if (data.parent_id == state.projectOpenTask.id) { + } else if (data.parent_id == state.projectOpenTask.id && state.projectOpenTask.sub_task) { let index = state.projectOpenTask.sub_task.findIndex(({id}) => id === data.id); if (index > -1) { state.projectOpenTask.sub_task.splice(index, 1) diff --git a/resources/assets/sass/pages/components/_.scss b/resources/assets/sass/pages/components/_.scss index 24ba0444..4edfe5ed 100755 --- a/resources/assets/sass/pages/components/_.scss +++ b/resources/assets/sass/pages/components/_.scss @@ -1,6 +1,7 @@ @import "dialog-wrapper"; @import "project-dialog"; @import "project-list"; +@import "project-log"; @import "task-add"; @import "task-add-simple"; @import "task-detail"; diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss index 98a33b57..bcfd39be 100644 --- a/resources/assets/sass/pages/components/dialog-wrapper.scss +++ b/resources/assets/sass/pages/components/dialog-wrapper.scss @@ -29,7 +29,7 @@ align-items: center; line-height: 22px; > h2 { - font-size: 18px; + font-size: 17px; font-weight: 600; } > em { @@ -43,7 +43,6 @@ flex-shrink: 0; font-size: 12px; line-height: 20px; - margin-top: 2px; color: #aaaaaa; &.pointer { cursor: pointer; diff --git a/resources/assets/sass/pages/components/project-log.scss b/resources/assets/sass/pages/components/project-log.scss new file mode 100644 index 00000000..14e127e6 --- /dev/null +++ b/resources/assets/sass/pages/components/project-log.scss @@ -0,0 +1,79 @@ +.project-log { + .logs-activity { + position: relative; + word-break: break-all; + padding: 12px 12px; + > li { + list-style: none; + padding-top: 0; + &.logs-loading, + &.logs-more, + &.logs-none { + height: 22px; + line-height: 22px; + } + &.logs-loading { + display: flex; + .common-loading { + margin: 0; + } + } + &.logs-more { + cursor: pointer; + &:hover { + color: #048be0; + } + } + &.logs-none { + cursor: pointer; + color: #bbbbbb; + } + .logs-date { + color: rgba(0, 0, 0, .36); + padding-bottom: 14px; + } + .logs-section { + margin: 4px; + .ivu-timeline { + > li { + padding-bottom: 8px; + &:last-child { + padding-bottom: 0; + } + .ivu-timeline-item-head-custom { + margin-top: 8px; + } + } + } + } + .logs-dot { + width: 18px; + height: 18px; + margin-left: 10px; + .avatar-box { + > em { + transform-origin: bottom right; + } + } + } + .log-summary { + > span, + > a { + padding-right: 6px; + word-wrap: break-word; + word-break: break-word; + } + .log-creator { + color:rgba(0, 0, 0, 0.85) + } + .log-text { + color: rgba(0,0,0,.54); + } + .log-time { + color: rgba(0,0,0,.3); + font-size: 12px; + } + } + } + } +} diff --git a/resources/assets/sass/pages/components/task-detail.scss b/resources/assets/sass/pages/components/task-detail.scss index a53f0338..38ccae8d 100644 --- a/resources/assets/sass/pages/components/task-detail.scss +++ b/resources/assets/sass/pages/components/task-detail.scss @@ -348,11 +348,13 @@ display: flex; align-items: center; margin-right: 24px; + cursor: pointer; &.active { margin-top: -2px; font-size: 16px; font-weight: 600; color: #555555; + cursor: default; } } } @@ -381,6 +383,22 @@ } } } + .project-log { + margin-left: 36px; + .logs-activity { + padding: 22px 0 0; + > li { + list-style: none; + padding-top: 0; + &.logs-loading, + &.logs-more, + &.logs-none { + height: 59px; + line-height: 59px; + } + } + } + } } &.open-dialog { @@ -419,9 +437,7 @@ padding-left: 0; > p { margin-right: 28px; - cursor: pointer; &.active { - cursor: default; font-size: 18px; } } @@ -445,6 +461,18 @@ margin-bottom: 0; } } + .project-log { + position: absolute; + top: 40px; + left: 0; + right: 0; + bottom: 0; + z-index: 1; + padding: 8px 8px; + margin-left: 8px; + background-color: #ffffff; + overflow: auto; + } } }