From 10ff02b8a0bfd81e1d7012560d4e0066f5608eb2 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Wed, 23 Feb 2022 09:58:55 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/ProjectTask.php | 2 +- resources/assets/js/pages/manage/components/ProjectLog.vue | 6 ++++-- resources/assets/sass/pages/components/project-log.scss | 6 ++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php index c063872df..1145a8dc8 100644 --- a/app/Models/ProjectTask.php +++ b/app/Models/ProjectTask.php @@ -725,7 +725,7 @@ class ProjectTask extends AbstractModel } }); } - $newStringAt = $this->start_at ? ($oldAt[0]->toDateTimeString() . '~' . $oldAt[1]->toDateTimeString()) : ''; + $newStringAt = $this->start_at ? ($this->start_at->toDateTimeString() . '~' . $this->end_at->toDateTimeString()) : ''; $this->addLog("修改{任务}时间", [ 'change' => [$oldStringAt, $newStringAt] ]); diff --git a/resources/assets/js/pages/manage/components/ProjectLog.vue b/resources/assets/js/pages/manage/components/ProjectLog.vue index f36d151d4..8189a9f6e 100644 --- a/resources/assets/js/pages/manage/components/ProjectLog.vue +++ b/resources/assets/js/pages/manage/components/ProjectLog.vue @@ -172,9 +172,11 @@ export default { let [before, now] = record.change vNode.push(h('span', ': ')) if (before && before != now) { - vNode.push(h('span', `${before || '-'} => ${now || '-'}`)) + vNode.push(h('span', {class:'change-value'}, `${before || '-'}`)) + vNode.push(h('span', ' => ')) + vNode.push(h('span', {class:'change-value'}, `${now || '-'}`)) } else { - vNode.push(h('span', now || '-')) + vNode.push(h('span', {class:'change-value'}, now || '-')) } } if (record.userid) { diff --git a/resources/assets/sass/pages/components/project-log.scss b/resources/assets/sass/pages/components/project-log.scss index 2a6bec3f3..8ef767351 100644 --- a/resources/assets/sass/pages/components/project-log.scss +++ b/resources/assets/sass/pages/components/project-log.scss @@ -120,6 +120,12 @@ display: inline-block; color: rgba(0, 0, 0, .72); + .change-value { + &:hover { + border-bottom: 1px dotted rgba(0, 0, 0, .3); + } + } + .detail-user { display: inline-block; vertical-align: top;