From adf7bd959eff3bd33c4da5f3db93e08e448ab1b5 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Fri, 23 May 2025 14:16:04 +0800 Subject: [PATCH 1/5] =?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_complete.html | 1 - public/assets/js/backend/oa/doc.js | 10 +--------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/application/admin/view/dashboard/task_complete.html b/application/admin/view/dashboard/task_complete.html index 7030a3b..839f07d 100644 --- a/application/admin/view/dashboard/task_complete.html +++ b/application/admin/view/dashboard/task_complete.html @@ -21,7 +21,6 @@
-
diff --git a/public/assets/js/backend/oa/doc.js b/public/assets/js/backend/oa/doc.js index acc063b..aa5cfa2 100644 --- a/public/assets/js/backend/oa/doc.js +++ b/public/assets/js/backend/oa/doc.js @@ -26,11 +26,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin [ {checkbox: true}, {field: 'id', title: __('Id')}, - {field: 'admin_id', title: __('Admin_id')}, {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2'),"3":__('Type 3')}, formatter: Table.api.formatter.normal}, {field: 'title', title: __('Title'), operate: 'LIKE'}, {field: 'desc', title: __('Desc'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, - {field: 'path', title: __('Path'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate, @@ -40,13 +38,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin title: __('查看详情'), classname: 'btn btn-xs btn-primary btn-dialog', icon: 'fa fa-list', - url: 'oa/doc/detail', - visible:function(row){ - if (!Config.detail) { - return false; - } - return true; - } + url: 'oa/doc/detail' } ] } From ba346a4520d962daec477292aa1a53a28c0115c3 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Fri, 23 May 2025 15:02:36 +0800 Subject: [PATCH 2/5] =?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 --- public/assets/js/backend/oa/schedule.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/public/assets/js/backend/oa/schedule.js b/public/assets/js/backend/oa/schedule.js index 081a85d..777dd23 100644 --- a/public/assets/js/backend/oa/schedule.js +++ b/public/assets/js/backend/oa/schedule.js @@ -27,7 +27,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'editable'], function {checkbox: true}, {field: 'id', title: __('Id')}, {field: 'admin.nickname', title: __('Admin.nickname'), operate: 'LIKE'}, - {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2'),"3":__('Type 3')}, formatter: Table.api.formatter.normal}, + {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2'),"3":__('Type 3'),"4":__('Type 4')}, formatter: Table.api.formatter.normal}, {field: 'date', title: __('Date'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, @@ -65,14 +65,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'editable'], function "visible":false }); - const startDate = new Date(new Date().setDate(1)); - const endDate = new Date(new Date().getFullYear(), new Date().getMonth() + 1, 0); + const startDate = new Date(); + startDate.setDate(1); + startDate.setHours(0, 0, 0, 0); - console.log('Start Date:', startDate); - console.log('End Date:', endDate); + const endDate = new Date(startDate.getFullYear(), startDate.getMonth() + 1, 0); + endDate.setHours(0, 0, 0, 0); + + for (let d = new Date(startDate); d <= endDate; ) { + const current = new Date(d); // 深拷贝 + const tmpDate = current.toLocaleDateString('sv-SE'); - for (let d = new Date(startDate); d <= endDate; d.setDate(d.getDate() + 1)) { - let tmpDate = d.toISOString().split('T')[0]; console.log('Current Date:', tmpDate); defaultColumnArr.push({ "title": tmpDate, @@ -96,6 +99,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'editable'], function }, } }); + + d.setDate(d.getDate() + 1); // 最后再改 d 的值 } // 初始化表格 From 01ff921514d1f498bb57ed2a2347a5145a20780d Mon Sep 17 00:00:00 2001 From: zhuyu Date: Fri, 23 May 2025 15:09:32 +0800 Subject: [PATCH 3/5] =?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/oa/Task.php | 2 +- application/admin/lang/zh-cn/oa/task.php | 1 + application/admin/model/oa/Task.php | 2 +- public/assets/js/backend/oa/task.js | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/application/admin/controller/oa/Task.php b/application/admin/controller/oa/Task.php index 4d3e464..a5a8110 100644 --- a/application/admin/controller/oa/Task.php +++ b/application/admin/controller/oa/Task.php @@ -88,7 +88,7 @@ class Task extends Backend $list = $this->model - ->with(['admin']) + ->with(['exec']) ->where($where) ->order($sort, $order) ->paginate($limit); diff --git a/application/admin/lang/zh-cn/oa/task.php b/application/admin/lang/zh-cn/oa/task.php index ccab904..2d44a1e 100644 --- a/application/admin/lang/zh-cn/oa/task.php +++ b/application/admin/lang/zh-cn/oa/task.php @@ -32,6 +32,7 @@ return [ 'Admin.id' => 'ID', 'Admin.username' => '用户名', 'Admin.nickname' => '昵称', + 'ExecAdmin.nickname' => '执行人', 'Admin.password' => '密码', 'Admin.salt' => '密码盐', 'Admin.area_ids' => '地区ID,英文逗号分隔', diff --git a/application/admin/model/oa/Task.php b/application/admin/model/oa/Task.php index 459744a..af898f0 100644 --- a/application/admin/model/oa/Task.php +++ b/application/admin/model/oa/Task.php @@ -60,7 +60,7 @@ class Task extends Model - public function admin() + public function exec() { return $this->belongsTo('app\admin\model\Admin', 'exec_admin_id', 'id', [], 'LEFT')->setEagerlyType(1); } diff --git a/public/assets/js/backend/oa/task.js b/public/assets/js/backend/oa/task.js index 0854cf9..e69883f 100644 --- a/public/assets/js/backend/oa/task.js +++ b/public/assets/js/backend/oa/task.js @@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin [ {checkbox: true}, {field: 'id', title: __('Id')}, + {field: 'exec.nickname', title: __('ExecAdmin.nickname'), operate: 'LIKE'}, {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2'),"3":__('Type 3')}, formatter: Table.api.formatter.normal}, {field: 'title', title: __('Title'), operate: 'LIKE'}, {field: 'desc', title: __('Desc'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, @@ -36,7 +37,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'expire_start_time', title: __('Expire_start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'expire_end_time', title: __('Expire_end_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'complete_time', title: __('Complete_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, - {field: 'admin.nickname', title: __('Admin.nickname'), operate: 'LIKE'}, {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate, buttons:[ { From d21f64d4a7a8a29a946751cbd3de984b43a32347 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Fri, 23 May 2025 15:31:09 +0800 Subject: [PATCH 4/5] =?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 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/application/admin/view/dashboard/task.html b/application/admin/view/dashboard/task.html index 41816a9..6a910e7 100644 --- a/application/admin/view/dashboard/task.html +++ b/application/admin/view/dashboard/task.html @@ -57,6 +57,15 @@ color: #666; line-height: 1.4; } + .card.completed .title { + text-decoration: line-through; + color: #999; + } + + .card.completed .note { + text-decoration: line-through; + color: #999; + } /* 响应式：小屏变成1列 */ @media (max-width: 1024px) { @@ -82,7 +91,11 @@

每日任务

{foreach $day as $item} + {if $item->status != 1} +
+ {else}
+ {/if}
{$item->title}
{$item->desc}
@@ -93,7 +106,11 @@

每周任务

{foreach $week as $item} + {if $item->status != 1} +
+ {else}
+ {/if}
{$item->title}
{$item->desc}
@@ -104,7 +121,11 @@

每月任务

{foreach $month as $item} + {if $item->status != 1} +
+ {else}
+ {/if}
{$item->title}
{$item->desc}
From 5de62ecdb6b1343b1945720973989ab3504d5ec7 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Fri, 23 May 2025 15:33:19 +0800 Subject: [PATCH 5/5] =?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/kpi.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/application/admin/view/dashboard/kpi.html b/application/admin/view/dashboard/kpi.html index a4943dc..6362b82 100644 --- a/application/admin/view/dashboard/kpi.html +++ b/application/admin/view/dashboard/kpi.html @@ -11,8 +11,9 @@ 指标名称 目标值 - 目标值(单位) + 完成值 指标描述 + 指标数据 权重 @@ -21,8 +22,9 @@ {$item->name|htmlentities} {$item->target_value|htmlentities} - {$item->unit_text|htmlentities} + 0 {$item->desc|htmlentities} + 0 {$item->pivot->rate|htmlentities} {/foreach}