From ed1a1163a4701612ad1880d2b8c4779f41783fe0 Mon Sep 17 00:00:00 2001
From: zhuyu <czhuyu@163.com>
Date: Tue, 27 May 2025 14:21:59 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feature:=20=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Dashboard.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/application/admin/controller/Dashboard.php b/application/admin/controller/Dashboard.php
index c260fcf..760e029 100755
--- a/application/admin/controller/Dashboard.php
+++ b/application/admin/controller/Dashboard.php
@@ -110,19 +110,24 @@ class Dashboard extends Backend
     public function task()
     {
 
+        $dateTime = \date('Y-m-d H:i:s');
+
         $dayTasks =  (new Task())
             ->where('exec_admin_id','=',$this->auth->id)
             ->where('type','=',1)
+            ->where('expire_end_time','>=', $dateTime)
             ->select();
 
         $weekTasks =  (new Task())
             ->where('exec_admin_id','=',$this->auth->id)
             ->where('type','=',2)
+            ->where('expire_end_time','>=', $dateTime)
             ->select();
 
         $monthTasks =  (new Task())
             ->where('exec_admin_id','=',$this->auth->id)
             ->where('type','=',3)
+            ->where('expire_end_time','>=', $dateTime)
             ->select();
 
         $this->view->assign('day', $dayTasks);

From fd312b32e23b086c5d5f6a2289daf6d52283f05b Mon Sep 17 00:00:00 2001
From: zhuyu <czhuyu@163.com>
Date: Tue, 27 May 2025 14:22:48 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feature:=20=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Dashboard.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/application/admin/controller/Dashboard.php b/application/admin/controller/Dashboard.php
index 760e029..395604f 100755
--- a/application/admin/controller/Dashboard.php
+++ b/application/admin/controller/Dashboard.php
@@ -179,7 +179,15 @@ class Dashboard extends Backend
         if (!$task) {
             $this->error('任务状态已变更，请刷新后操作');
         }
-        $task->save(['status' => 3, 'prove_desc' => $params['prove_desc'], 'prove_file_path' => $params['prove_file_path']]);
+
+        $dateTime = \date('Y-m-d H:i:s');
+
+        $task->save([
+            'status' => 3,
+            'prove_desc' => $params['prove_desc'],
+            'prove_file_path' => $params['prove_file_path',
+            'complete_time' => $dateTime,
+        ]);
 
         $this->success();
     }

From 65d351600b15c6733188f464bbacc08e55d87282 Mon Sep 17 00:00:00 2001
From: zhuyu <czhuyu@163.com>
Date: Tue, 27 May 2025 14:23:03 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feature:=20=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Dashboard.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/admin/controller/Dashboard.php b/application/admin/controller/Dashboard.php
index 395604f..ecd37cb 100755
--- a/application/admin/controller/Dashboard.php
+++ b/application/admin/controller/Dashboard.php
@@ -185,7 +185,7 @@ class Dashboard extends Backend
         $task->save([
             'status' => 3,
             'prove_desc' => $params['prove_desc'],
-            'prove_file_path' => $params['prove_file_path',
+            'prove_file_path' => $params['prove_file_path'],
             'complete_time' => $dateTime,
         ]);
 

From 03a8bb681f5568a18ff7434adb0476f6c9126aa7 Mon Sep 17 00:00:00 2001
From: zhuyu <czhuyu@163.com>
Date: Tue, 27 May 2025 14:39:06 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feature:=20=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/dashboard/task.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/application/admin/view/dashboard/task.html b/application/admin/view/dashboard/task.html
index ad0e281..c825a3c 100644
--- a/application/admin/view/dashboard/task.html
+++ b/application/admin/view/dashboard/task.html
@@ -11,6 +11,10 @@
         display: flex;
         flex-direction: column;
         gap: 16px;
+        background-color: #f9f9f9; /* ✅ 淡灰色背景 */
+        padding: 16px;
+        border-radius: 8px; /* ✅ 加点圆角更柔和 */
+        border: 1px solid #eee; /* ✅ 加细边框让结构更明显 */
     }
 
     /* 标题部分 */
@@ -104,7 +108,7 @@
 </style>
 
 <div>
-    <h2>任务看板</h2>
+    <h1>任务面板</h1>
 </div>