From 08012378699d50958b5bde44e858e5d96c0d9193 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Tue, 13 May 2025 17:15:29 +0800 Subject: [PATCH 1/5] feature: kpi --- application/admin/controller/kpi/Item.php | 38 +++++++++++ application/admin/controller/kpi/Template.php | 37 +++++++++++ application/admin/lang/zh-cn/kpi/item.php | 18 ++++++ application/admin/lang/zh-cn/kpi/template.php | 10 +++ application/admin/model/kpi/Item.php | 63 +++++++++++++++++++ application/admin/model/kpi/Template.php | 40 ++++++++++++ application/admin/validate/kpi/Item.php | 27 ++++++++ application/admin/validate/kpi/Template.php | 27 ++++++++ application/admin/view/kpi/item/add.html | 63 +++++++++++++++++++ application/admin/view/kpi/item/edit.html | 63 +++++++++++++++++++ application/admin/view/kpi/item/index.html | 29 +++++++++ application/admin/view/kpi/template/add.html | 33 ++++++++++ application/admin/view/kpi/template/edit.html | 33 ++++++++++ .../admin/view/kpi/template/index.html | 29 +++++++++ public/assets/js/backend/kpi/item.js | 58 +++++++++++++++++ public/assets/js/backend/kpi/template.js | 55 ++++++++++++++++ 16 files changed, 623 insertions(+) create mode 100644 application/admin/controller/kpi/Item.php create mode 100644 application/admin/controller/kpi/Template.php create mode 100644 application/admin/lang/zh-cn/kpi/item.php create mode 100644 application/admin/lang/zh-cn/kpi/template.php create mode 100644 application/admin/model/kpi/Item.php create mode 100644 application/admin/model/kpi/Template.php create mode 100644 application/admin/validate/kpi/Item.php create mode 100644 application/admin/validate/kpi/Template.php create mode 100644 application/admin/view/kpi/item/add.html create mode 100644 application/admin/view/kpi/item/edit.html create mode 100644 application/admin/view/kpi/item/index.html create mode 100644 application/admin/view/kpi/template/add.html create mode 100644 application/admin/view/kpi/template/edit.html create mode 100644 application/admin/view/kpi/template/index.html create mode 100644 public/assets/js/backend/kpi/item.js create mode 100644 public/assets/js/backend/kpi/template.js diff --git a/application/admin/controller/kpi/Item.php b/application/admin/controller/kpi/Item.php new file mode 100644 index 0000000..0897caf --- /dev/null +++ b/application/admin/controller/kpi/Item.php @@ -0,0 +1,38 @@ +model = new \app\admin\model\kpi\Item; + $this->view->assign("typeList", $this->model->getTypeList()); + $this->view->assign("unitList", $this->model->getUnitList()); + } + + + + /** + * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法 + * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑 + * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 + */ + + +} diff --git a/application/admin/controller/kpi/Template.php b/application/admin/controller/kpi/Template.php new file mode 100644 index 0000000..3af4630 --- /dev/null +++ b/application/admin/controller/kpi/Template.php @@ -0,0 +1,37 @@ +model = new \app\admin\model\kpi\Template; + + } + + + + /** + * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法 + * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑 + * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 + */ + + +} diff --git a/application/admin/lang/zh-cn/kpi/item.php b/application/admin/lang/zh-cn/kpi/item.php new file mode 100644 index 0000000..02ac00d --- /dev/null +++ b/application/admin/lang/zh-cn/kpi/item.php @@ -0,0 +1,18 @@ + 'ID', + 'Admin_id' => '创建人id', + 'Type' => '指标类型', + 'Type 1' => '派单员', + 'Type 2' => '运营', + 'Type 3' => '售前', + 'Name' => '名称', + 'Desc' => '描述', + 'Target_value' => '目标值', + 'Unit' => '目标值单位', + 'Unit 1' => '固定值', + 'Unit 2' => '百分比', + 'Create_time' => '创建时间', + 'Update_time' => '编辑时间' +]; diff --git a/application/admin/lang/zh-cn/kpi/template.php b/application/admin/lang/zh-cn/kpi/template.php new file mode 100644 index 0000000..86306f6 --- /dev/null +++ b/application/admin/lang/zh-cn/kpi/template.php @@ -0,0 +1,10 @@ + 'ID', + 'Admin_id' => '创建人id', + 'Name' => '名称', + 'Desc' => '描述', + 'Create_time' => '创建时间', + 'Update_time' => '编辑时间' +]; diff --git a/application/admin/model/kpi/Item.php b/application/admin/model/kpi/Item.php new file mode 100644 index 0000000..03fb6ed --- /dev/null +++ b/application/admin/model/kpi/Item.php @@ -0,0 +1,63 @@ + __('Type 1'), '2' => __('Type 2'), '3' => __('Type 3')]; + } + + public function getUnitList() + { + return ['1' => __('Unit 1'), '2' => __('Unit 2')]; + } + + + public function getTypeTextAttr($value, $data) + { + $value = $value ?: ($data['type'] ?? ''); + $list = $this->getTypeList(); + return $list[$value] ?? ''; + } + + + public function getUnitTextAttr($value, $data) + { + $value = $value ?: ($data['unit'] ?? ''); + $list = $this->getUnitList(); + return $list[$value] ?? ''; + } + + + + +} diff --git a/application/admin/model/kpi/Template.php b/application/admin/model/kpi/Template.php new file mode 100644 index 0000000..acb2ca2 --- /dev/null +++ b/application/admin/model/kpi/Template.php @@ -0,0 +1,40 @@ + [], + 'edit' => [], + ]; + +} diff --git a/application/admin/validate/kpi/Template.php b/application/admin/validate/kpi/Template.php new file mode 100644 index 0000000..4cc1923 --- /dev/null +++ b/application/admin/validate/kpi/Template.php @@ -0,0 +1,27 @@ + [], + 'edit' => [], + ]; + +} diff --git a/application/admin/view/kpi/item/add.html b/application/admin/view/kpi/item/add.html new file mode 100644 index 0000000..f8f7c1f --- /dev/null +++ b/application/admin/view/kpi/item/add.html @@ -0,0 +1,63 @@ +
+ +
+ +
+ + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/application/admin/view/kpi/item/edit.html b/application/admin/view/kpi/item/edit.html new file mode 100644 index 0000000..34b8497 --- /dev/null +++ b/application/admin/view/kpi/item/edit.html @@ -0,0 +1,63 @@ +
+ +
+ +
+ + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/application/admin/view/kpi/item/index.html b/application/admin/view/kpi/item/index.html new file mode 100644 index 0000000..3c822bf --- /dev/null +++ b/application/admin/view/kpi/item/index.html @@ -0,0 +1,29 @@ +
+ {:build_heading()} + +
+
+
+
+ + +
+
+
+ +
+
+
diff --git a/application/admin/view/kpi/template/add.html b/application/admin/view/kpi/template/add.html new file mode 100644 index 0000000..71ab032 --- /dev/null +++ b/application/admin/view/kpi/template/add.html @@ -0,0 +1,33 @@ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/application/admin/view/kpi/template/edit.html b/application/admin/view/kpi/template/edit.html new file mode 100644 index 0000000..68c1957 --- /dev/null +++ b/application/admin/view/kpi/template/edit.html @@ -0,0 +1,33 @@ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/application/admin/view/kpi/template/index.html b/application/admin/view/kpi/template/index.html new file mode 100644 index 0000000..3c87096 --- /dev/null +++ b/application/admin/view/kpi/template/index.html @@ -0,0 +1,29 @@ +
+ {:build_heading()} + +
+
+
+
+ + +
+
+
+ +
+
+
diff --git a/public/assets/js/backend/kpi/item.js b/public/assets/js/backend/kpi/item.js new file mode 100644 index 0000000..5912864 --- /dev/null +++ b/public/assets/js/backend/kpi/item.js @@ -0,0 +1,58 @@ +define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) { + + var Controller = { + index: function () { + // 初始化表格参数配置 + Table.api.init({ + extend: { + index_url: 'kpi/item/index' + location.search, + add_url: 'kpi/item/add', + edit_url: 'kpi/item/edit', + del_url: 'kpi/item/del', + multi_url: 'kpi/item/multi', + import_url: 'kpi/item/import', + table: 'kpi_item', + } + }); + + var table = $("#table"); + + // 初始化表格 + table.bootstrapTable({ + url: $.fn.bootstrapTable.defaults.extend.index_url, + pk: 'id', + sortName: 'id', + columns: [ + [ + {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: '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: '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} + ] + ] + }); + + // 为表格绑定事件 + Table.api.bindevent(table); + }, + add: function () { + Controller.api.bindevent(); + }, + edit: function () { + Controller.api.bindevent(); + }, + api: { + bindevent: function () { + Form.api.bindevent($("form[role=form]")); + } + } + }; + return Controller; +}); diff --git a/public/assets/js/backend/kpi/template.js b/public/assets/js/backend/kpi/template.js new file mode 100644 index 0000000..e08fdc2 --- /dev/null +++ b/public/assets/js/backend/kpi/template.js @@ -0,0 +1,55 @@ +define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) { + + var Controller = { + index: function () { + // 初始化表格参数配置 + Table.api.init({ + extend: { + index_url: 'kpi/template/index' + location.search, + add_url: 'kpi/template/add', + edit_url: 'kpi/template/edit', + del_url: 'kpi/template/del', + multi_url: 'kpi/template/multi', + import_url: 'kpi/template/import', + table: 'kpi_template', + } + }); + + var table = $("#table"); + + // 初始化表格 + table.bootstrapTable({ + url: $.fn.bootstrapTable.defaults.extend.index_url, + pk: 'id', + sortName: 'id', + columns: [ + [ + {checkbox: true}, + {field: 'id', title: __('Id')}, + {field: 'admin_id', title: __('Admin_id')}, + {field: 'name', title: __('Name'), operate: 'LIKE'}, + {field: 'desc', title: __('Desc'), 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} + ] + ] + }); + + // 为表格绑定事件 + Table.api.bindevent(table); + }, + add: function () { + Controller.api.bindevent(); + }, + edit: function () { + Controller.api.bindevent(); + }, + api: { + bindevent: function () { + Form.api.bindevent($("form[role=form]")); + } + } + }; + return Controller; +}); From 3dfbbe52e0f31209af698ba77a991ff0f2fada9e Mon Sep 17 00:00:00 2001 From: zhuyu Date: Tue, 13 May 2025 18:00:03 +0800 Subject: [PATCH 2/5] feature: kpi --- application/admin/controller/kpi/Item.php | 8 +++ application/admin/controller/kpi/Template.php | 68 +++++++++++++++++++ application/admin/view/kpi/template/add.html | 28 ++++++++ public/assets/js/backend/kpi/template.js | 4 ++ 4 files changed, 108 insertions(+) diff --git a/application/admin/controller/kpi/Item.php b/application/admin/controller/kpi/Item.php index 0897caf..4cddfc2 100644 --- a/application/admin/controller/kpi/Item.php +++ b/application/admin/controller/kpi/Item.php @@ -26,6 +26,14 @@ class Item extends Backend $this->view->assign("unitList", $this->model->getUnitList()); } + /** + * 下拉搜索 + */ + public function selectpage() + { + return parent::selectpage(); + } + /** diff --git a/application/admin/controller/kpi/Template.php b/application/admin/controller/kpi/Template.php index 3af4630..8aeaa40 100644 --- a/application/admin/controller/kpi/Template.php +++ b/application/admin/controller/kpi/Template.php @@ -3,6 +3,10 @@ namespace app\admin\controller\kpi; use app\common\controller\Backend; +use Exception; +use PDOException; +use think\Db; +use think\exception\ValidateException; /** * kpi模板 @@ -33,5 +37,69 @@ class Template extends Backend * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 */ + /** + * 添加 + * + * @return string + * @throws \think\Exception + */ + public function add() + { + if (false === $this->request->isPost()) { + return $this->view->fetch(); + } + $params = $this->request->post('row/a'); + if (empty($params)) { + $this->error(__('Parameter %s can not be empty', '')); + } + $params = $this->preExcludeFields($params); + + if ($this->dataLimit && $this->dataLimitFieldAutoFill) { + $params[$this->dataLimitField] = $this->auth->id; + } + $result = false; + Db::startTrans(); + try { + //是否采用模型验证 + if ($this->modelValidate) { + $name = str_replace("\\model\\", "\\validate\\", get_class($this->model)); + $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate; + $this->model->validateFailException()->validate($validate); + } + + + $params['create_time'] = date('Y-m-d H:i:s'); + $params['update_time'] = date('Y-m-d H:i:s'); + + + $result = $this->model->allowField(true)->save($params); + + $templateId = $result; + + $templateItem = []; + $kpiItems = json_decode($params['kpiitem'], true); + + foreach ($kpiItems as $kpiItem) { + $templateItem[] = [ + 'admin_id' => $this->auth->id, + 'template_id' => $templateId, + 'item_id' => $kpiItem['id'], + 'rate' => $kpiItem['rate'], + ]; + } + + Db::name('kpi_template_item') + ->insert($templateItem); + + Db::commit(); + } catch (ValidateException|PDOException|Exception $e) { + Db::rollback(); + $this->error($e->getMessage()); + } + if ($result === false) { + $this->error(__('No rows were inserted')); + } + $this->success(); + } } diff --git a/application/admin/view/kpi/template/add.html b/application/admin/view/kpi/template/add.html index 71ab032..96afbbc 100644 --- a/application/admin/view/kpi/template/add.html +++ b/application/admin/view/kpi/template/add.html @@ -24,6 +24,34 @@ +
+
+ + + + + + + + + +
{:__('指标')}{:__('比例')}
{:__('Append')}
+ + + + +
+
diff --git a/public/assets/js/backend/kpi/template.js b/public/assets/js/backend/kpi/template.js index e08fdc2..14e64ba 100644 --- a/public/assets/js/backend/kpi/template.js +++ b/public/assets/js/backend/kpi/template.js @@ -40,6 +40,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin Table.api.bindevent(table); }, add: function () { + $(document).on("fa.event.appendfieldlist", "#second-table .btn-append", function (e, obj) { + //绑定动态下拉组件 + Form.events.selectpage(obj); + }); Controller.api.bindevent(); }, edit: function () { From 009c71b287fba0d0454ad28ae24824cd328d6bb8 Mon Sep 17 00:00:00 2001 From: zhuyu Date: Wed, 14 May 2025 09:50:18 +0800 Subject: [PATCH 3/5] feature: kpi template --- application/admin/controller/kpi/Template.php | 124 +++++++++++++++++- application/admin/view/kpi/template/add.html | 16 +-- application/admin/view/kpi/template/edit.html | 36 +++-- public/assets/js/backend/kpi/template.js | 6 +- 4 files changed, 154 insertions(+), 28 deletions(-) diff --git a/application/admin/controller/kpi/Template.php b/application/admin/controller/kpi/Template.php index 8aeaa40..5dd3c29 100644 --- a/application/admin/controller/kpi/Template.php +++ b/application/admin/controller/kpi/Template.php @@ -73,8 +73,9 @@ class Template extends Backend $result = $this->model->allowField(true)->save($params); - - $templateId = $result; + if($result!==false) { + $templateId = $this->model->id; //新插入数据的ID + } $templateItem = []; $kpiItems = json_decode($params['kpiitem'], true); @@ -89,7 +90,7 @@ class Template extends Backend } Db::name('kpi_template_item') - ->insert($templateItem); + ->insertAll($templateItem); Db::commit(); } catch (ValidateException|PDOException|Exception $e) { @@ -102,4 +103,121 @@ class Template extends Backend $this->success(); } + + public function edit($ids = null) + { + $row = $this->model->get($ids); + if (!$row) { + $this->error(__('No Results were found')); + } + $adminIds = $this->getDataLimitAdminIds(); + if (is_array($adminIds) && !in_array($row[$this->dataLimitField], $adminIds)) { + $this->error(__('You have no permission')); + } + if (false === $this->request->isPost()) { + + $kpiitem = Db::name('kpi_template_item') + ->join('kpi_item', 'item_id = kpi_item.id') + ->where('template_id', $row->id) + ->select(); + + $assignKpiitem = array_map(function ($item) { + return [ + 'id' => (string)$item['id'], + 'rate' => (string)$item['rate'], + ]; + }, $kpiitem); + $assignKpiitem = json_encode($assignKpiitem); + + $this->view->assign('assignkpiitem', $assignKpiitem); + $this->view->assign('row', $row); + return $this->view->fetch(); + } + $params = $this->request->post('row/a'); + if (empty($params)) { + $this->error(__('Parameter %s can not be empty', '')); + } + $params = $this->preExcludeFields($params); + $result = false; + Db::startTrans(); + try { + //是否采用模型验证 + if ($this->modelValidate) { + $name = str_replace("\\model\\", "\\validate\\", get_class($this->model)); + $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate; + $row->validateFailException()->validate($validate); + } + + $params['update_time'] = date('Y-m-d H:i:s'); + $result = $row->allowField(true)->save($params); + + $templateId = $row->id; + + $templateItem = []; + $kpiItems = json_decode($params['kpiitem'], true); + + foreach ($kpiItems as $kpiItem) { + $templateItem[] = [ + 'admin_id' => $this->auth->id, + 'template_id' => $templateId, + 'item_id' => $kpiItem['id'], + 'rate' => $kpiItem['rate'], + ]; + } + + Db::name('kpi_template_item') + ->where('template_id', $templateId) + ->delete(); + + Db::name('kpi_template_item') + ->insertAll($templateItem); + + Db::commit(); + } catch (ValidateException| \think\exception\PDOException |Exception $e) { + Db::rollback(); + $this->error($e->getMessage()); + } + if (false === $result) { + $this->error(__('No rows were updated')); + } + $this->success(); + } + + + public function del($ids = null) + { + if (false === $this->request->isPost()) { + $this->error(__("Invalid parameters")); + } + $ids = $ids ?: $this->request->post("ids"); + if (empty($ids)) { + $this->error(__('Parameter %s can not be empty', 'ids')); + } + $pk = $this->model->getPk(); + $adminIds = $this->getDataLimitAdminIds(); + if (is_array($adminIds)) { + $this->model->where($this->dataLimitField, 'in', $adminIds); + } + $list = $this->model->where($pk, 'in', $ids)->select(); + + $count = 0; + Db::startTrans(); + try { + foreach ($list as $item) { + Db::name('kpi_template_item') + ->where('template_id', $item->id) + ->delete(); + $count += $item->delete(); + } + Db::commit(); + } catch (\think\exception\PDOException |Exception $e) { + Db::rollback(); + $this->error($e->getMessage()); + } + if ($count) { + $this->success(); + } + $this->error(__('No rows were deleted')); + } + } diff --git a/application/admin/view/kpi/template/add.html b/application/admin/view/kpi/template/add.html index 96afbbc..fe4c5bf 100644 --- a/application/admin/view/kpi/template/add.html +++ b/application/admin/view/kpi/template/add.html @@ -12,21 +12,9 @@
-
- -
- -
-
-
- -
- -
-
- +
@@ -38,7 +26,7 @@
{:__('指标')} {:__('比例')}
- +
diff --git a/public/assets/js/backend/kpi/template.js b/public/assets/js/backend/kpi/template.js index 14e64ba..cf5a269 100644 --- a/public/assets/js/backend/kpi/template.js +++ b/public/assets/js/backend/kpi/template.js @@ -40,13 +40,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin Table.api.bindevent(table); }, add: function () { - $(document).on("fa.event.appendfieldlist", "#second-table .btn-append", function (e, obj) { + $(document).on("fa.event.appendfieldlist", "#fieldlist-table .btn-append", function (e, obj) { //绑定动态下拉组件 Form.events.selectpage(obj); }); Controller.api.bindevent(); }, edit: function () { + $(document).on("fa.event.appendfieldlist", "#fieldlist-table .btn-append", function (e, obj) { + //绑定动态下拉组件 + Form.events.selectpage(obj); + }); Controller.api.bindevent(); }, api: { From 627d7cd7881695a73ae9bb2e8e882573bdf2c97e Mon Sep 17 00:00:00 2001 From: zhuyu Date: Wed, 14 May 2025 09:53:02 +0800 Subject: [PATCH 4/5] feature: kpi template --- application/admin/view/kpi/template/add.html | 2 +- application/admin/view/kpi/template/edit.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/admin/view/kpi/template/add.html b/application/admin/view/kpi/template/add.html index fe4c5bf..8cfc8d9 100644 --- a/application/admin/view/kpi/template/add.html +++ b/application/admin/view/kpi/template/add.html @@ -17,7 +17,7 @@ - + diff --git a/application/admin/view/kpi/template/edit.html b/application/admin/view/kpi/template/edit.html index 85ea55f..dd0a4bb 100644 --- a/application/admin/view/kpi/template/edit.html +++ b/application/admin/view/kpi/template/edit.html @@ -17,7 +17,7 @@
{:__('指标')}{:__('比例')}{:__('权重')}
- + From a087a9d4c8f62e72b8c9fb6d641017155f11f65a Mon Sep 17 00:00:00 2001 From: zhuyu Date: Wed, 14 May 2025 10:41:39 +0800 Subject: [PATCH 5/5] feature: kpi template --- application/admin/controller/kpi/Template.php | 23 +++++++++++++++++++ application/admin/model/kpi/Template.php | 5 ++++ public/assets/js/backend/kpi/template.js | 11 +++++++++ 3 files changed, 39 insertions(+) diff --git a/application/admin/controller/kpi/Template.php b/application/admin/controller/kpi/Template.php index 5dd3c29..e5f52f4 100644 --- a/application/admin/controller/kpi/Template.php +++ b/application/admin/controller/kpi/Template.php @@ -37,6 +37,29 @@ class Template extends Backend * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 */ + public function index() + { + //设置过滤方法 + $this->request->filter(['strip_tags', 'trim']); + if (false === $this->request->isAjax()) { + return $this->view->fetch(); + } + //如果发送的来源是 Selectpage，则转发到 Selectpage + if ($this->request->request('keyField')) { + return $this->selectpage(); + } + [$where, $sort, $order, $offset, $limit] = $this->buildparams(); + $list = $this->model + ->where($where) + ->with('kpiitem') + ->order($sort, $order) + ->paginate($limit); + + $result = ['total' => $list->total(), 'rows' => $list->items()]; + return json($result); + } + + /** * 添加 * diff --git a/application/admin/model/kpi/Template.php b/application/admin/model/kpi/Template.php index acb2ca2..8b5554d 100644 --- a/application/admin/model/kpi/Template.php +++ b/application/admin/model/kpi/Template.php @@ -32,6 +32,11 @@ class Template extends Model + public function kpiitem() + { + return $this->belongsToMany('app\admin\model\kpi\item', 'kpi_template_item', 'item_id', 'template_id'); + } + diff --git a/public/assets/js/backend/kpi/template.js b/public/assets/js/backend/kpi/template.js index cf5a269..1ae6f67 100644 --- a/public/assets/js/backend/kpi/template.js +++ b/public/assets/js/backend/kpi/template.js @@ -29,6 +29,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'admin_id', title: __('Admin_id')}, {field: 'name', title: __('Name'), operate: 'LIKE'}, {field: 'desc', title: __('Desc'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + { + field: 'kpiitem', + title: '指标', + operate: false, + formatter: function (value) { + // value 是一个标签数组 + return value.map(function ($item) { + return '
' + $item.name + '---' + $item.pivot.rate + '%' + '

'; + }).join(''); + } + }, {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}
{:__('指标')}{:__('比例')}{:__('权重')}