From ced105d6fd8c9e7c999b464103eabf73dd816808 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Fri, 16 May 2025 14:54:49 +0800 Subject: [PATCH 1/3] feature: kpi item template --- application/admin/lang/zh-cn/kpi/item.php | 1 + application/admin/lang/zh-cn/kpi/template.php | 1 + application/admin/view/kpi/item/add.html | 10 ++++++++-- application/admin/view/kpi/item/edit.html | 10 ++++++++-- application/admin/view/kpi/template/add.html | 10 ++++++++-- application/admin/view/kpi/template/edit.html | 10 ++++++++-- public/assets/js/backend/kpi/item.js | 1 + public/assets/js/backend/kpi/template.js | 1 + 8 files changed, 36 insertions(+), 8 deletions(-) diff --git a/application/admin/lang/zh-cn/kpi/item.php b/application/admin/lang/zh-cn/kpi/item.php index 76e8706..791a575 100644 --- a/application/admin/lang/zh-cn/kpi/item.php +++ b/application/admin/lang/zh-cn/kpi/item.php @@ -5,6 +5,7 @@ return [ 'Admin_id' => '创建人id', 'Admin.nickname' => '创建人', 'AuthGroup.name' => '角色', + 'Score' => '指标分', 'Name' => '名称', 'Desc' => '描述', 'Target_value' => '目标值', diff --git a/application/admin/lang/zh-cn/kpi/template.php b/application/admin/lang/zh-cn/kpi/template.php index ad6aeea..5328a56 100644 --- a/application/admin/lang/zh-cn/kpi/template.php +++ b/application/admin/lang/zh-cn/kpi/template.php @@ -7,6 +7,7 @@ return [ 'AuthGroup.name' => '角色', 'Name' => '名称', 'Desc' => '描述', + 'Score' => '单个绩点分', 'Create_time' => '创建时间', 'Update_time' => '编辑时间' ]; diff --git a/application/admin/view/kpi/item/add.html b/application/admin/view/kpi/item/add.html index 2ef10fa..13e6d46 100644 --- a/application/admin/view/kpi/item/add.html +++ b/application/admin/view/kpi/item/add.html @@ -9,13 +9,13 @@
- +
- +
@@ -36,6 +36,12 @@
+
+ +
+ +
+
diff --git a/application/admin/view/kpi/item/edit.html b/application/admin/view/kpi/item/edit.html index 4c5a6e8..491dbc8 100644 --- a/application/admin/view/kpi/item/edit.html +++ b/application/admin/view/kpi/item/edit.html @@ -9,13 +9,13 @@
- +
- +
@@ -36,6 +36,12 @@
+
+ +
+ +
+
diff --git a/application/admin/view/kpi/template/add.html b/application/admin/view/kpi/template/add.html index 98cdc5f..b280ca6 100644 --- a/application/admin/view/kpi/template/add.html +++ b/application/admin/view/kpi/template/add.html @@ -9,13 +9,19 @@
- +
- + +
+
+
+ +
+
diff --git a/application/admin/view/kpi/template/edit.html b/application/admin/view/kpi/template/edit.html index f81ff7e..60f6585 100644 --- a/application/admin/view/kpi/template/edit.html +++ b/application/admin/view/kpi/template/edit.html @@ -9,13 +9,19 @@
- +
- + +
+
+
+ +
+
diff --git a/public/assets/js/backend/kpi/item.js b/public/assets/js/backend/kpi/item.js index 3feb750..b5223ed 100644 --- a/public/assets/js/backend/kpi/item.js +++ b/public/assets/js/backend/kpi/item.js @@ -32,6 +32,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'desc', title: __('Desc'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'target_value', title: __('Target_value')}, {field: 'unit', title: __('Unit'), searchList: {"1":__('Unit 1'),"2":__('Unit 2')}, formatter: Table.api.formatter.normal}, + {field: 'score', title: __('Score')}, {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} diff --git a/public/assets/js/backend/kpi/template.js b/public/assets/js/backend/kpi/template.js index 86721b7..0077dc3 100644 --- a/public/assets/js/backend/kpi/template.js +++ b/public/assets/js/backend/kpi/template.js @@ -41,6 +41,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin }).join(''); } }, + {field: 'score', title: __('Score')}, {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} From fe2fc2efa836525bad3f353bf745ab79d7a25bb7 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Fri, 16 May 2025 16:12:02 +0800 Subject: [PATCH 2/3] feature: kpi item template --- application/admin/lang/zh-cn/kpi/item.php | 5 +++-- application/admin/model/kpi/Item.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/application/admin/lang/zh-cn/kpi/item.php b/application/admin/lang/zh-cn/kpi/item.php index 791a575..5a064e6 100644 --- a/application/admin/lang/zh-cn/kpi/item.php +++ b/application/admin/lang/zh-cn/kpi/item.php @@ -10,8 +10,9 @@ return [ 'Desc' => '描述', 'Target_value' => '目标值', 'Unit' => '目标值单位', - 'Unit 1' => '固定值', - 'Unit 2' => '%', + 'Unit 1' => '%', + 'Unit 2' => '元', + 'Unit 3' => '单', 'Create_time' => '创建时间', 'Update_time' => '编辑时间' ]; diff --git a/application/admin/model/kpi/Item.php b/application/admin/model/kpi/Item.php index c272fdd..0738070 100644 --- a/application/admin/model/kpi/Item.php +++ b/application/admin/model/kpi/Item.php @@ -33,7 +33,7 @@ class Item extends Model public function getUnitList() { - return ['1' => __('Unit 1'), '2' => __('Unit 2')]; + return ['1' => __('Unit 1'), '2' => __('Unit 2'), '3' => __('Unit 3')]; } From c37a768faabdc59186182ae53c41da79123d036f Mon Sep 17 00:00:00 2001 From: zhuyu Date: Fri, 16 May 2025 16:15:12 +0800 Subject: [PATCH 3/3] feature: kpi item template --- public/assets/js/backend/kpi/item.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/assets/js/backend/kpi/item.js b/public/assets/js/backend/kpi/item.js index b5223ed..5093591 100644 --- a/public/assets/js/backend/kpi/item.js +++ b/public/assets/js/backend/kpi/item.js @@ -31,7 +31,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'name', title: __('Name'), operate: 'LIKE'}, {field: 'desc', title: __('Desc'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'target_value', title: __('Target_value')}, - {field: 'unit', title: __('Unit'), searchList: {"1":__('Unit 1'),"2":__('Unit 2')}, formatter: Table.api.formatter.normal}, + {field: 'unit', title: __('Unit'), searchList: {"1":__('Unit 1'),"2":__('Unit 2'),"3":__('Unit 3')}, formatter: Table.api.formatter.normal}, {field: 'score', title: __('Score')}, {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},