From 54e4ed27ae41c10493e6ea30313dba9b1ab165bd Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 17 Feb 2022 19:11:23 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=B6=E9=97=B4=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/ProjectTask.php                            | 11 +++++++++--
 .../assets/js/pages/manage/components/ProjectLog.vue  |  6 +++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php
index e40ac184..c063872d 100644
--- a/app/Models/ProjectTask.php
+++ b/app/Models/ProjectTask.php
@@ -661,6 +661,7 @@ class ProjectTask extends AbstractModel
             // 计划时间（原则：子任务时间在主任务时间内）
             if (Arr::exists($data, 'times')) {
                 $oldAt = [Carbon::parse($this->start_at), Carbon::parse($this->end_at)];
+                $oldStringAt = $this->start_at ? ($oldAt[0]->toDateTimeString() . '~' . $oldAt[1]->toDateTimeString()) : '';
                 $this->start_at = null;
                 $this->end_at = null;
                 $times = $data['times'];
@@ -724,7 +725,10 @@ class ProjectTask extends AbstractModel
                         }
                     });
                 }
-                $this->addLog("修改{任务}时间");
+                $newStringAt = $this->start_at ? ($oldAt[0]->toDateTimeString() . '~' . $oldAt[1]->toDateTimeString()) : '';
+                $this->addLog("修改{任务}时间", [
+                    'change' => [$oldStringAt, $newStringAt]
+                ]);
             }
             // 以下紧顶级任务可修改
             if ($this->parent_id === 0) {
@@ -794,6 +798,7 @@ class ProjectTask extends AbstractModel
                 }
                 // 优先级
                 $p = false;
+                $oldPName = $this->p_name;
                 if (Arr::exists($data, 'p_level') && $this->p_level != $data['p_level']) {
                     $this->p_level = intval($data['p_level']);
                     $p = true;
@@ -807,7 +812,9 @@ class ProjectTask extends AbstractModel
                     $p = true;
                 }
                 if ($p) {
-                    $this->addLog("修改{任务}优先级");
+                    $this->addLog("修改{任务}优先级", [
+                        'change' => [$oldPName, $this->p_name]
+                    ]);
                 }
             }
             $this->save();
diff --git a/resources/assets/js/pages/manage/components/ProjectLog.vue b/resources/assets/js/pages/manage/components/ProjectLog.vue
index 120b0f96..f36d151d 100644
--- a/resources/assets/js/pages/manage/components/ProjectLog.vue
+++ b/resources/assets/js/pages/manage/components/ProjectLog.vue
@@ -171,10 +171,10 @@ export default {
                 if ($A.isArray(record.change)) {
                     let [before, now] = record.change
                     vNode.push(h('span', ': '))
-                    if (before) {
-                        vNode.push(h('span', `${before} => ${now}`))
+                    if (before && before != now) {
+                        vNode.push(h('span', `${before || '-'} => ${now || '-'}`))
                     } else {
-                        vNode.push(h('span', now))
+                        vNode.push(h('span', now || '-'))
                     }
                 }
                 if (record.userid) {