diff --git a/application/admin/controller/statistics/Dispatcher.php b/application/admin/controller/statistics/Dispatcher.php index b09288b..792b431 100644 --- a/application/admin/controller/statistics/Dispatcher.php +++ b/application/admin/controller/statistics/Dispatcher.php @@ -2,10 +2,12 @@ namespace app\admin\controller\statistics; +use app\admin\model\Admin; use app\admin\model\Order; use app\common\controller\Backend; use think\exception\DbException; use think\response\Json; +use function Symfony\Component\Clock\now; /** * 订单列管理 @@ -46,32 +48,53 @@ class Dispatcher extends Backend */ public function index() { - - - $this->chart(); + //$this->chart(); + $today = now()->format('Y-m-d'); + $today_end = now()->format('Y-m-d'); //设置过滤方法 $this->request->filter(['strip_tags', 'trim']); if (false === $this->request->isAjax()) { + $this->assign('daterange',$today.' - '.$today_end); + return $this->view->fetch(); } - //如果发送的来源是 Selectpage，则转发到 Selectpage - if ($this->request->request('keyField')) { - return $this->selectpage(); + return json([]); + } + + + public function chartData() + { + $data = $this->chart(); + + $newData = [ + ['派单员','总业绩(￥)','转化率(%)','利润率(%)','变现值'] + ]; + foreach ($data as $datum){ + $newData[] = [ + $datum['admin_user'], + $datum['performance'], + $datum['trans_rate'], + $datum['performance_rate'], + $datum['cash_value'], + ]; } - [$where, $sort, $order, $offset, $limit] = $this->buildparams(); - $list = $this->model - ->where($where) - ->order($sort, $order) - ->paginate($limit); - $result = ['total' => $list->total(), 'rows' => $list->items()]; - return json($result); + return $newData; } //图表统计 public function chart(){ + $filter = $this->request->post(); + if(!empty($filter['daterange'])){ + $arr = explode(' - ',$filter['daterange']); + if(trim($arr[0])){ + $filter['start_time'] = trim($arr[0]); + } + if(trim($arr[1])){ + $filter['end_time'] = trim($arr[1]).' 23:59:59'; + } + } - $filter = $this->request->param('filter/a',[]); $orderValid = implode(',',$this->model->tabStatus(Order::TAB_VALID)); @@ -106,9 +129,8 @@ class Dispatcher extends Backend }else{ //按录单时间 $time_field = 'create_time'; } - $builder->whereBetween($time_field,$filter['start_time'],$filter['end_time']); + $builder->whereBetween($time_field,[$filter['start_time'],$filter['end_time']]); } - //城市 if(!empty($filter['area_id'])){ $builder->where('area_id',$filter['area_id']); @@ -121,22 +143,31 @@ class Dispatcher extends Backend $newData = []; - foreach ($data as $datum){ - //利润率 = 总业绩/总成效额 - $datum->performance_rate = $this->_calc($datum->performance,$datum->total); - //转化率 = 完单数 / 总订单数 - $datum->trans_rate = $this->_calc($datum->finish_num,$datum->count_num); - //变现值 = 总业绩 / 总订单数 - $datum->cash_value = $this->_calc($datum->performance,$datum->count_num,2); - //客单利润 = 总利润 / 完单数 - $datum->performance_avg = $this->_calc($datum->performance,$datum->finish_num,2); - //客单价 = 总成效额 / 完单数 - $datum->total_avg = $this->_calc($datum->total,$datum->finish_num,2); - $newData[] = $datum->toArray(); + if(!empty($data)){ + foreach ($data as $datum){ + //利润率 = 总业绩/总成效额 + $datum->performance_rate = $this->_calc($datum->performance,$datum->total,4,true); + //转化率 = 完单数 / 总订单数 + $datum->trans_rate = $this->_calc($datum->finish_num,$datum->count_num,4,true); + //变现值 = 总业绩 / 总订单数 + $datum->cash_value = $this->_calc($datum->performance,$datum->count_num,2); + //客单利润 = 总利润 / 完单数 + $datum->performance_avg = $this->_calc($datum->performance,$datum->finish_num,2); + //客单价 = 总成效额 / 完单数 + $datum->total_avg = $this->_calc($datum->total,$datum->finish_num,2); + + $datum->admin_user = Admin::where($datum->dispatch_admin_id)->value('nickname')??'未知'; + + $newData[] = $datum->toArray(); + } } - dump($newData);exit; + + + + return $newData; + //dump($newData);exit; } @@ -146,8 +177,14 @@ class Dispatcher extends Backend * @param $scale * @return int|string */ - private function _calc($a,$b,$scale=4){ - return $b > 0 ? bcdiv($a,$b,$scale) : 0; + private function _calc($a,$b,$scale=4,$is_percent=false){ + $val = $b > 0 ? bcdiv($a,$b,$scale) : 0; + + if($is_percent){ + + return bcmul($val,100,2); + } + return $val; } } diff --git a/application/admin/view/statistics/dispatcher/index.html b/application/admin/view/statistics/dispatcher/index.html index 25676e8..1e86817 100644 --- a/application/admin/view/statistics/dispatcher/index.html +++ b/application/admin/view/statistics/dispatcher/index.html @@ -1,46 +1,66 @@
-
- {:build_heading(null,FALSE)} -
-
-
-
- - {:__('Add')} - {:__('Edit')} - {:__('Delete')} - +
+
+ +
+ + + +
+ +
+ +
+ + +
+ + +
+ +
+ + + +
-
- {:__('More')} -
- +
+ + +
+
- -
-
-
+ +
+
+ +
+
diff --git a/public/assets/js/backend/statistics/dispatcher.js b/public/assets/js/backend/statistics/dispatcher.js index 572fb87..c83605b 100644 --- a/public/assets/js/backend/statistics/dispatcher.js +++ b/public/assets/js/backend/statistics/dispatcher.js @@ -1,87 +1,160 @@ -define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) { +define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'echarts', 'echarts-theme', 'template','addtabs','moment'], function ($, undefined, Backend, Table, Form,Echarts,undefined,Template,Datatable,Moment) { var Controller = { + index: function () { // 初始化表格参数配置 - Table.api.init({ - extend: { - index_url: 'statistics/dispatcher/index' + location.search, - add_url: 'statistics/dispatcher/add', - edit_url: 'statistics/dispatcher/edit', - del_url: 'statistics/dispatcher/del', - multi_url: 'statistics/dispatcher/multi', - import_url: 'statistics/dispatcher/import', - table: 'order', + Table.api.init(); + + //绑定事件 + /* $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { + var panel = $($(this).attr("href")); + if (panel.length > 0) { + /!*Controller.table[panel.attr("id")].call(this); + $(this).on('click', function (e) { + // $($(this).attr("href")).find(".btn-refresh").trigger("click"); + });*!/ } - }); + //移除绑定的事件 + $(this).unbind('shown.bs.tab'); + });*/ - var table = $("#table"); + //必须默认触发shown.bs.tab事件 + /*$('ul.nav-tabs li.active a[data-toggle="tab"]').trigger("shown.bs.tab"); - // 初始化表格 - table.bootstrapTable({ - url: $.fn.bootstrapTable.defaults.extend.index_url, - pk: 'id', - sortName: 'id', - fixedColumns: true, - fixedRightNumber: 1, - columns: [ - [ - {checkbox: true}, - {field: 'id', title: __('Id')}, - {field: 'order_no', title: __('Order_no'), operate: 'LIKE'}, - {field: 'customer', title: __('Customer'), operate: 'LIKE'}, - {field: 'tel', title: __('Tel'), operate: 'LIKE'}, - {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"10":__('Status 10'),"20":__('Status 20'),"30":__('Status 30'),"40":__('Status 40'),"50":__('Status 50'),"60":__('Status 60'),"-10":__('Status -10')}, formatter: Table.api.formatter.status}, - {field: 'area_id', title: __('Area_id'), operate: 'LIKE'}, - {field: 'address', title: __('Address'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, - {field: 'lng', title: __('Lng'), operate:'BETWEEN'}, - {field: 'lat', title: __('Lat'), operate:'BETWEEN'}, - {field: 'work_tel_id', title: __('Work_tel_id')}, - {field: 'source_shop', title: __('Source_shop'), operate: 'LIKE'}, - {field: 'source', title: __('Source')}, - {field: 'source_uid', title: __('Source_uid'), operate: 'LIKE'}, - {field: 'item_id', title: __('Item_id')}, - {field: 'item_title', title: __('Item_title'), operate: 'LIKE'}, - {field: 'detail', title: __('Detail'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, - {field: 'remark', title: __('Remark'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, - {field: 'images', title: __('Images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images}, - {field: 'plan_time', title: __('Plan_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, - {field: 'admin_id', title: __('Admin_id')}, - {field: 'coupon_id', title: __('Coupon_id')}, - {field: 'total', title: __('Total'), operate:'BETWEEN'}, - {field: 'online_amount', title: __('Online_amount'), operate:'BETWEEN'}, - {field: 'offline_amount', title: __('Offline_amount'), operate:'BETWEEN'}, - {field: 'online_amount_last', title: __('Online_amount_last'), operate:'BETWEEN'}, - {field: 'offline_amount_type', title: __('Offline_amount_type'), searchList: {"1":__('Offline_amount_type 1'),"2":__('Offline_amount_type 2')}, formatter: Table.api.formatter.normal}, - {field: 'discount_amount', title: __('Discount_amount'), operate:'BETWEEN'}, - {field: 'refund_amount', title: __('Refund_amount'), operate:'BETWEEN'}, - {field: 'worker_refund_amount', title: __('Worker_refund_amount'), operate:'BETWEEN'}, - {field: 'real_amount', title: __('Real_amount'), operate:'BETWEEN'}, - {field: 'cost', title: __('Cost'), operate:'BETWEEN'}, - {field: 'material_cost', title: __('Material_cost'), operate:'BETWEEN'}, - {field: 'performance', title: __('Performance'), operate:'BETWEEN'}, - {field: 'cancel_reason_id', title: __('Cancel_reason_id')}, - {field: 'cancel_detail', title: __('Cancel_detail'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, - {field: 'audit_remark', title: __('Audit_remark'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, - {field: 'audit_admin_id', title: __('Audit_admin_id')}, - {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: 'delete_time', title: __('Delete_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, - {field: 'dispatch_type', title: __('Dispatch_type')}, - {field: 'receive_type', title: __('Receive_type')}, - {field: 'revisit_id', title: __('Revisit_id')}, - {field: 'dispatch_admin_id', title: __('Dispatch_admin_id')}, - {field: 'dispatch_admin_user', title: __('Dispatch_admin_user'), operate: 'LIKE'}, - {field: 'dispatch_time', title: __('Dispatch_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, - {field: 'aftersale_id', title: __('Aftersale_id')}, - {field: 'amount_images', title: __('Amount_images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images}, - {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} + var barChart = Echarts.init(document.getElementById('bar-chart'), 'walden'); + var option = { + legend: {}, + tooltip: {}, + dataset: { + source: [ + ['产品销售', '2015', '2016', '2017'], + ['风扇', 43.3, 85.8, 93.7], + ['电视机', 83.1, 73.4, 55.1], + ['空调', 86.4, 65.2, 82.5], + ['冰箱', 72.4, 53.9, 39.1] ] + }, + xAxis: {type: 'category'}, + yAxis: {}, + // Declare several bar series, each will be mapped + // to a column of dataset.source by default. + series: [ + {type: 'bar'}, + {type: 'bar'}, + {type: 'bar'} ] + }; + // 使用刚指定的配置项和数据显示图表。 + barChart.setOption(option);*/ + + // 触发 tab 后发起 ajax 获取图表数据 + $('ul.nav-tabs li.active a[data-toggle="tab"]').on("shown.bs.tab", function () { + getChartData(); }); - // 为表格绑定事件 - Table.api.bindevent(table); + + function getChartData(){ + // 获取单选框选中的值 + var timeBy = $('input[name="filter[time_by]"]:checked').val(); + + // 获取日期范围值 + var daterange = $('#daterange').val(); + + // 构建查询参数 + var params = { + 'time_by': timeBy, + 'daterange': daterange + }; + + $.ajax({ + url: "statistics/dispatcher/chartData", // 替换为你的接口地址 + type: "POST", + dataType: "json", + data:params, + success: function (response) { + // 假设返回的数据结构是 + // response = { + // source: [ + // ['产品销售', '2015', '2016', '2017'], + // ['风扇', 43.3, 85.8, 93.7], + // ... + // ] + // } + + var barChart = Echarts.init(document.getElementById('bar-chart'), 'walden'); + var option = { + legend: {}, + tooltip: {}, + dataset: { + source: response + }, + xAxis: { type: 'category' }, + yAxis: {}, + series: [ + { type: 'bar' }, + { type: 'bar' }, + { type: 'bar' }, + { type: 'bar' } + ] + }; + barChart.setOption(option); + }, + error: function () { + console.error("图表数据加载失败"); + } + }); + } + + + + + var form = $("#chart-filter"); + var ranges = {}; + ranges[__('Today')] = [Moment().startOf('day'), Moment().endOf('day')]; + ranges[__('Yesterday')] = [Moment().subtract(1, 'days').startOf('day'), Moment().subtract(1, 'days').endOf('day')]; + ranges[__('Last 7 Days')] = [Moment().subtract(6, 'days').startOf('day'), Moment().endOf('day')]; + ranges[__('Last 30 Days')] = [Moment().subtract(29, 'days').startOf('day'), Moment().endOf('day')]; + ranges[__('This Month')] = [Moment().startOf('month'), Moment().endOf('month')]; + ranges[__('Last Month')] = [Moment().subtract(1, 'month').startOf('month'), Moment().subtract(1, 'month').endOf('month')]; + ranges[__('今年')] = [Moment().startOf('year'), Moment().endOf('year')]; + var options = { + timePicker: false, + autoUpdateInput: false, + timePickerSeconds: true, + timePicker24Hour: true, + autoApply: true, + locale: { + format: 'YYYY-MM-DD', + customRangeLabel: __("Custom Range"), + applyLabel: __("Apply"), + cancelLabel: __("Clear"), + }, + ranges: ranges, + }; + var callback = function (start, end) { + $(this.element).val(start.format(options.locale.format) + " - " + end.format(options.locale.format)); + }; + require(['bootstrap-daterangepicker'], function () { + $(".datetimerange", form).each(function () { + $(this).on('apply.daterangepicker', function (ev, picker) { + callback.call(picker, picker.startDate, picker.endDate); + var label = picker.chosenLabel; + $(picker.element).data('label', label).trigger("change"); + }); + $(this).on('cancel.daterangepicker', function (ev, picker) { + $(this).val(''); + }); + $(this).daterangepicker($.extend({}, options), callback); + }); + }); + + // 手动触发一次激活 tab 的 shown.bs.tab + getChartData(); + // 绑定查询按钮的点击事件 + $('#filter-btn').on('click', function() { + getChartData(); + }); }, add: function () { Controller.api.bindevent();