diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php index c063872d..1145a8dc 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 f36d151d..8189a9f6 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 2a6bec3f..8ef76735 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;