From 921cecaf3161f24a888ae04e12982efff2f08a20 Mon Sep 17 00:00:00 2001 From: liapples Date: Tue, 28 Sep 2021 18:34:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E9=AB=98=E5=BA=A6=E8=87=AA=E9=80=82=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/AgentStatisticsController.php | 7 ++-- .../Controllers/OrderStatisticsController.php | 5 ++- .../ProductStatisticsController.php | 7 ++-- .../SupplierStatisticsController.php | 7 ++-- .../Controllers/UserStatisticsController.php | 5 ++- .../Metrics/Examples/AgentStatistics.php | 40 ++++++++++++++++--- .../Metrics/Examples/OrderStatistics.php | 34 ++++++++++++++++ .../Metrics/Examples/ProductStatistics.php | 34 ++++++++++++++++ app/Admin/Metrics/Examples/UserStatistics.php | 34 ++++++++++++++++ .../FinanceStatisticsController.php | 7 ++-- .../Controllers/OrderStatisticsController.php | 9 ++--- .../ProductStatisticsController.php | 14 ++----- .../Controllers/UserStatisticsController.php | 16 +++----- .../Metrics/Examples/FinanceStatistics.php | 34 ++++++++++++++++ .../Metrics/Examples/OrderStatistics.php | 34 ++++++++++++++++ .../Metrics/Examples/ProductStatistics.php | 34 ++++++++++++++++ .../Metrics/Examples/UserStatistics.php | 35 ++++++++++++++++ .../FinanceStatisticsController.php | 5 ++- .../Controllers/OrderStatisticsController.php | 5 ++- .../ProductStatisticsController.php | 7 ++-- .../Metrics/Examples/FinanceStatistics.php | 34 ++++++++++++++++ .../Metrics/Examples/OrderStatistics.php | 34 ++++++++++++++++ .../Metrics/Examples/ProductStatistics.php | 34 ++++++++++++++++ 23 files changed, 420 insertions(+), 55 deletions(-) diff --git a/app/Admin/Controllers/AgentStatisticsController.php b/app/Admin/Controllers/AgentStatisticsController.php index da464ad..afcb5cd 100755 --- a/app/Admin/Controllers/AgentStatisticsController.php +++ b/app/Admin/Controllers/AgentStatisticsController.php @@ -26,6 +26,7 @@ class AgentStatisticsController extends AdminController { Admin::style( << .content-wrapper > .content-header{display: none} .col-sm-12.d-flex{ display: inline-block !important; } @@ -43,7 +44,7 @@ class AgentStatisticsController extends AdminController

- 用户统计 + 代理商统计

@@ -54,7 +55,7 @@ class AgentStatisticsController extends AdminController ) ->body(function (Row $row) { - $row->column(6, function (Column $column) { + $row->column(12, function (Column $column) { $column->row(new \App\Admin\Tools\DataReportDate('data_report')); }); @@ -92,7 +93,7 @@ class AgentStatisticsController extends AdminController ->fetched('$("#my-box").loading(false)') // 移除loading效果 ->click('.switch-bar'); // 设置图表点击菜单则重新发起请求，且被点击的目标元素上的 data-xxx 属性会被作为post数据发送到后端API - $box = Box::make('成本总额图表', $bar) + $box = Box::make('代理商统计图表', $bar) ->id('my-box') // 设置盒子的ID ->tool($dropdown); // 设置下拉菜单按钮 diff --git a/app/Admin/Controllers/OrderStatisticsController.php b/app/Admin/Controllers/OrderStatisticsController.php index cee4a71..bc4f09d 100755 --- a/app/Admin/Controllers/OrderStatisticsController.php +++ b/app/Admin/Controllers/OrderStatisticsController.php @@ -23,6 +23,7 @@ class OrderStatisticsController extends AdminController { Admin::style( << .content-wrapper > .content-header{display: none} .col-sm-12.d-flex{ display: inline-block !important; } @@ -51,7 +52,7 @@ class OrderStatisticsController extends AdminController ) ->body(function (Row $row){ - $row->column(6,function (Column $column){ + $row->column(12,function (Column $column){ $column->row(new \App\Admin\Tools\DataReportDate('data_report')); }); @@ -129,7 +130,7 @@ HTML; ->fetched('$("#my-box").loading(false)') // 移除loading效果 ->click('.switch-bar'); // 设置图表点击菜单则重新发起请求，且被点击的目标元素上的 data-xxx 属性会被作为post数据发送到后端API - $box = Box::make('成本总额图表', $bar) + $box = Box::make('订单统计图表', $bar) ->id('my-box') // 设置盒子的ID ->tool($dropdown); // 设置下拉菜单按钮 diff --git a/app/Admin/Controllers/ProductStatisticsController.php b/app/Admin/Controllers/ProductStatisticsController.php index 7cac80b..c0cf885 100755 --- a/app/Admin/Controllers/ProductStatisticsController.php +++ b/app/Admin/Controllers/ProductStatisticsController.php @@ -32,6 +32,7 @@ class ProductStatisticsController extends AdminController { Admin::style( << .content-wrapper > .content-header{display: none} .col-sm-12.d-flex{ display: inline-block !important; } @@ -49,7 +50,7 @@ class ProductStatisticsController extends AdminController

- 商品统计 + 产品统计

@@ -61,7 +62,7 @@ class ProductStatisticsController extends AdminController ) ->body(function (Row $row){ - $row->column(6,function (Column $column){ + $row->column(12,function (Column $column){ $column->row(new \App\Admin\Tools\DataReportDate('data_report')); }); @@ -153,7 +154,7 @@ HTML; ->fetched('$("#my-box").loading(false)') // 移除loading效果 ->click('.switch-bar'); // 设置图表点击菜单则重新发起请求，且被点击的目标元素上的 data-xxx 属性会被作为post数据发送到后端API - $box = Box::make('成本总额图表', $bar) + $box = Box::make('产品统计图表', $bar) ->id('my-box') // 设置盒子的ID ->tool($dropdown); // 设置下拉菜单按钮 diff --git a/app/Admin/Controllers/SupplierStatisticsController.php b/app/Admin/Controllers/SupplierStatisticsController.php index 2238ba7..d2434f4 100755 --- a/app/Admin/Controllers/SupplierStatisticsController.php +++ b/app/Admin/Controllers/SupplierStatisticsController.php @@ -26,6 +26,7 @@ class SupplierStatisticsController extends AdminController { Admin::style( << .content-wrapper > .content-header{display: none} .col-sm-12.d-flex{ display: inline-block !important; } @@ -43,7 +44,7 @@ class SupplierStatisticsController extends AdminController

- 用户统计 + 供应商统计

@@ -54,7 +55,7 @@ class SupplierStatisticsController extends AdminController ) ->body(function (Row $row) { - $row->column(6, function (Column $column) { + $row->column(12, function (Column $column) { $column->row(new \App\Admin\Tools\DataReportDate('data_report')); }); @@ -92,7 +93,7 @@ class SupplierStatisticsController extends AdminController ->fetched('$("#my-box").loading(false)') // 移除loading效果 ->click('.switch-bar'); // 设置图表点击菜单则重新发起请求，且被点击的目标元素上的 data-xxx 属性会被作为post数据发送到后端API - $box = Box::make('成本总额图表', $bar) + $box = Box::make('供应商统计图表', $bar) ->id('my-box') // 设置盒子的ID ->tool($dropdown); // 设置下拉菜单按钮 diff --git a/app/Admin/Controllers/UserStatisticsController.php b/app/Admin/Controllers/UserStatisticsController.php index 7222dd6..dc87092 100755 --- a/app/Admin/Controllers/UserStatisticsController.php +++ b/app/Admin/Controllers/UserStatisticsController.php @@ -25,6 +25,7 @@ class UserStatisticsController extends AdminController { Admin::style( << .content-wrapper > .content-header{display: none} .col-sm-12.d-flex{ display: inline-block !important; } @@ -53,7 +54,7 @@ class UserStatisticsController extends AdminController ) ->body(function (Row $row) { - $row->column(6, function (Column $column) { + $row->column(12, function (Column $column) { $column->row(new \App\Admin\Tools\DataReportDate('data_report')); }); @@ -91,7 +92,7 @@ class UserStatisticsController extends AdminController ->fetched('$("#my-box").loading(false)') // 移除loading效果 ->click('.switch-bar'); // 设置图表点击菜单则重新发起请求，且被点击的目标元素上的 data-xxx 属性会被作为post数据发送到后端API - $box = Box::make('成本总额图表', $bar) + $box = Box::make('用户统计图表', $bar) ->id('my-box') // 设置盒子的ID ->tool($dropdown); // 设置下拉菜单按钮 diff --git a/app/Admin/Metrics/Examples/AgentStatistics.php b/app/Admin/Metrics/Examples/AgentStatistics.php index 86c3df8..4a4ab76 100644 --- a/app/Admin/Metrics/Examples/AgentStatistics.php +++ b/app/Admin/Metrics/Examples/AgentStatistics.php @@ -2,14 +2,9 @@ namespace App\Admin\Metrics\Examples; -use App\Common\OrderStatus; use App\Models\Agent; -use App\Models\Order; -use App\Models\User; -use Dcat\Admin\Admin; +use Dcat\Admin\Support\JavaScript; use Dcat\Admin\Widgets\ApexCharts\Chart; -use Dcat\Admin\Widgets\Metrics\Bar; -use Illuminate\Http\Request; use Illuminate\Support\Arr; use Illuminate\Support\Facades\DB; @@ -147,4 +142,37 @@ class AgentStatistics extends Chart return parent::render(); } + + /** + * 重写初始化JS + * @return string + */ + protected function buildDefaultScript() + { + $options = JavaScript::format($this->options); + + return <<containerSelector}")[0], + options + ); + chart.render(); + + $(window).resize(function () { + var height = $(window).height() - $('.Dcat_Admin_Widgets_Box').offset().top - 130; + if (height < 320) { + height = 320 + } + chart.updateOptions({ + 'chart': { + 'height': height + } + }); + }).resize(); +})(); +JS; + } } diff --git a/app/Admin/Metrics/Examples/OrderStatistics.php b/app/Admin/Metrics/Examples/OrderStatistics.php index 655cae1..77d47f4 100644 --- a/app/Admin/Metrics/Examples/OrderStatistics.php +++ b/app/Admin/Metrics/Examples/OrderStatistics.php @@ -5,6 +5,7 @@ namespace App\Admin\Metrics\Examples; use App\Common\OrderStatus; use App\Models\Order; use Dcat\Admin\Admin; +use Dcat\Admin\Support\JavaScript; use Dcat\Admin\Widgets\ApexCharts\Chart; use Dcat\Admin\Widgets\Metrics\Bar; use Illuminate\Http\Request; @@ -137,4 +138,37 @@ class OrderStatistics extends Chart return parent::render(); } + + /** + * 重写初始化JS + * @return string + */ + protected function buildDefaultScript() + { + $options = JavaScript::format($this->options); + + return <<containerSelector}")[0], + options + ); + chart.render(); + + $(window).resize(function () { + var height = $(window).height() - $('.Dcat_Admin_Widgets_Box').offset().top - 130; + if (height < 320) { + height = 320 + } + chart.updateOptions({ + 'chart': { + 'height': height + } + }); + }).resize(); +})(); +JS; + } } diff --git a/app/Admin/Metrics/Examples/ProductStatistics.php b/app/Admin/Metrics/Examples/ProductStatistics.php index 8091799..768d406 100644 --- a/app/Admin/Metrics/Examples/ProductStatistics.php +++ b/app/Admin/Metrics/Examples/ProductStatistics.php @@ -4,6 +4,7 @@ namespace App\Admin\Metrics\Examples; use App\Models\Order; use Dcat\Admin\Admin; +use Dcat\Admin\Support\JavaScript; use Dcat\Admin\Widgets\ApexCharts\Chart; use Illuminate\Support\Arr; use Illuminate\Support\Facades\DB; @@ -138,4 +139,37 @@ class ProductStatistics extends Chart return parent::render(); } + + /** + * 重写初始化JS + * @return string + */ + protected function buildDefaultScript() + { + $options = JavaScript::format($this->options); + + return <<containerSelector}")[0], + options + ); + chart.render(); + + $(window).resize(function () { + var height = $(window).height() - $('.Dcat_Admin_Widgets_Box').offset().top - 130; + if (height < 320) { + height = 320 + } + chart.updateOptions({ + 'chart': { + 'height': height + } + }); + }).resize(); +})(); +JS; + } } diff --git a/app/Admin/Metrics/Examples/UserStatistics.php b/app/Admin/Metrics/Examples/UserStatistics.php index 1d94781..3ae86b1 100644 --- a/app/Admin/Metrics/Examples/UserStatistics.php +++ b/app/Admin/Metrics/Examples/UserStatistics.php @@ -6,6 +6,7 @@ use App\Common\OrderStatus; use App\Models\Order; use App\Models\User; use Dcat\Admin\Admin; +use Dcat\Admin\Support\JavaScript; use Dcat\Admin\Widgets\ApexCharts\Chart; use Dcat\Admin\Widgets\Metrics\Bar; use Illuminate\Database\Eloquent\Model; @@ -152,4 +153,37 @@ class UserStatistics extends Chart return parent::render(); } + + /** + * 重写初始化JS + * @return string + */ + protected function buildDefaultScript() + { + $options = JavaScript::format($this->options); + + return <<containerSelector}")[0], + options + ); + chart.render(); + + $(window).resize(function () { + var height = $(window).height() - $('.Dcat_Admin_Widgets_Box').offset().top - 130; + if (height < 320) { + height = 320 + } + chart.updateOptions({ + 'chart': { + 'height': height + } + }); + }).resize(); +})(); +JS; + } } diff --git a/app/AdminAgent/Controllers/FinanceStatisticsController.php b/app/AdminAgent/Controllers/FinanceStatisticsController.php index b135640..09050d8 100755 --- a/app/AdminAgent/Controllers/FinanceStatisticsController.php +++ b/app/AdminAgent/Controllers/FinanceStatisticsController.php @@ -3,8 +3,6 @@ namespace App\AdminAgent\Controllers; use App\AdminAgent\Metrics\Examples\FinanceStatistics; -use App\AdminAgent\Metrics\Examples\ProductStatistics; -use App\Common\OrderStatus; use App\Common\PayType; use App\Models\Order; use App\Models\OrderProductItem; @@ -25,6 +23,7 @@ class FinanceStatisticsController extends AdminController { Admin::style( << .content-wrapper > .content-header{display: none} .col-sm-12.d-flex{ display: inline-block !important; } @@ -76,7 +75,7 @@ class FinanceStatisticsController extends AdminController ) ->body(function (Row $row){ - $row->column(6,function (Column $column){ + $row->column(12,function (Column $column){ $column->row(new \App\AdminAgent\Tools\DataReportDate('data_report')); }); @@ -159,7 +158,7 @@ HTML; ->fetched('$("#my-box").loading(false)') // 移除loading效果 ->click('.switch-bar'); // 设置图表点击菜单则重新发起请求，且被点击的目标元素上的 data-xxx 属性会被作为post数据发送到后端API - $box = Box::make('成本总额图表', $bar) + $box = Box::make('财务统计图表', $bar) ->id('my-box') // 设置盒子的ID ->tool($dropdown); // 设置下拉菜单按钮 diff --git a/app/AdminAgent/Controllers/OrderStatisticsController.php b/app/AdminAgent/Controllers/OrderStatisticsController.php index 2d4d0c2..f5b5c61 100755 --- a/app/AdminAgent/Controllers/OrderStatisticsController.php +++ b/app/AdminAgent/Controllers/OrderStatisticsController.php @@ -2,11 +2,9 @@ namespace App\AdminAgent\Controllers; -use App\AdminAgent\Metrics\Examples\FinanceStatistics; use App\AdminAgent\Metrics\Examples\OrderStatistics; use App\Common\OrderStatus; use App\Models\Order; -use App\Models\OrderProductItem; use Dcat\Admin\Admin; use Dcat\Admin\Layout\Column; use Dcat\Admin\Layout\Content; @@ -24,10 +22,11 @@ class OrderStatisticsController extends AdminController { Admin::style( << .content-wrapper > .content-header{display: none} .col-sm-12.d-flex{ display: inline-block !important; } - CSS +CSS ); //数据 @@ -52,7 +51,7 @@ class OrderStatisticsController extends AdminController ) ->body(function (Row $row){ - $row->column(6,function (Column $column){ + $row->column(12,function (Column $column){ $column->row(new \App\AdminAgent\Tools\DataReportDate('data_report')); }); @@ -130,7 +129,7 @@ HTML; ->fetched('$("#my-box").loading(false)') // 移除loading效果 ->click('.switch-bar'); // 设置图表点击菜单则重新发起请求，且被点击的目标元素上的 data-xxx 属性会被作为post数据发送到后端API - $box = Box::make('成本总额图表', $bar) + $box = Box::make('订单统计图表', $bar) ->id('my-box') // 设置盒子的ID ->tool($dropdown); // 设置下拉菜单按钮 diff --git a/app/AdminAgent/Controllers/ProductStatisticsController.php b/app/AdminAgent/Controllers/ProductStatisticsController.php index aff8fdc..2605eb8 100755 --- a/app/AdminAgent/Controllers/ProductStatisticsController.php +++ b/app/AdminAgent/Controllers/ProductStatisticsController.php @@ -4,17 +4,10 @@ namespace App\AdminAgent\Controllers; use App\Admin\Actions\Tools\DataReportOption; use App\Admin\Metrics\Examples\Index\CanteenStatisticsExamples; -use App\AdminAgent\Tools\DataReportDate; -use App\AdminAgent\Metrics\Examples\FinanceStatistics; -use App\AdminAgent\Metrics\Examples\OrderStatistics; use App\AdminAgent\Metrics\Examples\ProductStatistics; -use App\AdminAgent\Metrics\Examples\UserStatistics; -use App\Common\OrderStatus; use App\Common\ProductStatus; use App\Models\AgentProduct; use App\Models\ImsCjdcMarket; -use App\Models\Order; -use App\Models\OrderProductItem; use Dcat\Admin\Admin; use Dcat\Admin\Layout\Column; use Dcat\Admin\Layout\Content; @@ -32,6 +25,7 @@ class ProductStatisticsController extends AdminController { Admin::style( << .content-wrapper > .content-header{display: none} .col-sm-12.d-flex{ display: inline-block !important; } @@ -49,7 +43,7 @@ class ProductStatisticsController extends AdminController

- 商品统计 + 产品统计

@@ -61,7 +55,7 @@ class ProductStatisticsController extends AdminController ) ->body(function (Row $row){ - $row->column(6,function (Column $column){ + $row->column(12,function (Column $column){ $column->row(new \App\AdminAgent\Tools\DataReportDate('data_report')); }); @@ -154,7 +148,7 @@ HTML; ->fetched('$("#my-box").loading(false)') // 移除loading效果 ->click('.switch-bar'); // 设置图表点击菜单则重新发起请求，且被点击的目标元素上的 data-xxx 属性会被作为post数据发送到后端API - $box = Box::make('成本总额图表', $bar) + $box = Box::make('产品统计图表', $bar) ->id('my-box') // 设置盒子的ID ->tool($dropdown); // 设置下拉菜单按钮 diff --git a/app/AdminAgent/Controllers/UserStatisticsController.php b/app/AdminAgent/Controllers/UserStatisticsController.php index 4abc033..08bade7 100755 --- a/app/AdminAgent/Controllers/UserStatisticsController.php +++ b/app/AdminAgent/Controllers/UserStatisticsController.php @@ -2,19 +2,13 @@ namespace App\AdminAgent\Controllers; -use App\AdminAgent\Metrics\Examples\FinanceStatistics; -use App\AdminAgent\Metrics\Examples\OrderStatistics; use App\AdminAgent\Metrics\Examples\UserStatistics; -use App\Common\OrderStatus; -use App\Models\Order; -use App\Models\OrderProductItem; use Dcat\Admin\Admin; use Dcat\Admin\Layout\Column; use Dcat\Admin\Layout\Content; use Dcat\Admin\Layout\Row; use Dcat\Admin\Http\Controllers\AdminController; use Dcat\Admin\Widgets\Box; -use Dcat\Admin\Widgets\Card; use Dcat\Admin\Widgets\Dropdown; use Illuminate\Support\Arr; use Illuminate\Support\Str; @@ -25,12 +19,14 @@ class UserStatisticsController extends AdminController { Admin::style( << .content-wrapper > .content-header{display: none} .col-sm-12.d-flex{ - display: inline-block !important; + display: inline-block !important; } - CSS +CSS ); + //数据 //订单 @@ -53,7 +49,7 @@ class UserStatisticsController extends AdminController ) ->body(function (Row $row) { - $row->column(6, function (Column $column) { + $row->column(12, function (Column $column) { $column->row(new \App\AdminAgent\Tools\DataReportDate('data_report')); }); @@ -91,7 +87,7 @@ class UserStatisticsController extends AdminController ->fetched('$("#my-box").loading(false)') // 移除loading效果 ->click('.switch-bar'); // 设置图表点击菜单则重新发起请求，且被点击的目标元素上的 data-xxx 属性会被作为post数据发送到后端API - $box = Box::make('成本总额图表', $bar) + $box = Box::make('用户统计图表', $bar) ->id('my-box') // 设置盒子的ID ->tool($dropdown); // 设置下拉菜单按钮 diff --git a/app/AdminAgent/Metrics/Examples/FinanceStatistics.php b/app/AdminAgent/Metrics/Examples/FinanceStatistics.php index 07f5791..a39ffe3 100644 --- a/app/AdminAgent/Metrics/Examples/FinanceStatistics.php +++ b/app/AdminAgent/Metrics/Examples/FinanceStatistics.php @@ -5,6 +5,7 @@ namespace App\AdminAgent\Metrics\Examples; use App\Common\OrderStatus; use App\Models\Order; use Dcat\Admin\Admin; +use Dcat\Admin\Support\JavaScript; use Dcat\Admin\Widgets\ApexCharts\Chart; use Dcat\Admin\Widgets\Metrics\Bar; use Illuminate\Http\Request; @@ -139,4 +140,37 @@ class FinanceStatistics extends Chart return parent::render(); } + + /** + * 重写初始化JS + * @return string + */ + protected function buildDefaultScript() + { + $options = JavaScript::format($this->options); + + return <<containerSelector}")[0], + options + ); + chart.render(); + + $(window).resize(function () { + var height = $(window).height() - $('.Dcat_Admin_Widgets_Box').offset().top - 130; + if (height < 320) { + height = 320 + } + chart.updateOptions({ + 'chart': { + 'height': height + } + }); + }).resize(); +})(); +JS; + } } diff --git a/app/AdminAgent/Metrics/Examples/OrderStatistics.php b/app/AdminAgent/Metrics/Examples/OrderStatistics.php index ecde124..4d1c4a0 100644 --- a/app/AdminAgent/Metrics/Examples/OrderStatistics.php +++ b/app/AdminAgent/Metrics/Examples/OrderStatistics.php @@ -5,6 +5,7 @@ namespace App\AdminAgent\Metrics\Examples; use App\Common\OrderStatus; use App\Models\Order; use Dcat\Admin\Admin; +use Dcat\Admin\Support\JavaScript; use Dcat\Admin\Widgets\ApexCharts\Chart; use Dcat\Admin\Widgets\Metrics\Bar; use Illuminate\Http\Request; @@ -138,4 +139,37 @@ class OrderStatistics extends Chart return parent::render(); } + + /** + * 重写初始化JS + * @return string + */ + protected function buildDefaultScript() + { + $options = JavaScript::format($this->options); + + return <<containerSelector}")[0], + options + ); + chart.render(); + + $(window).resize(function () { + var height = $(window).height() - $('.Dcat_Admin_Widgets_Box').offset().top - 130; + if (height < 320) { + height = 320 + } + chart.updateOptions({ + 'chart': { + 'height': height + } + }); + }).resize(); +})(); +JS; + } } diff --git a/app/AdminAgent/Metrics/Examples/ProductStatistics.php b/app/AdminAgent/Metrics/Examples/ProductStatistics.php index 7ef75dc..0e15ceb 100644 --- a/app/AdminAgent/Metrics/Examples/ProductStatistics.php +++ b/app/AdminAgent/Metrics/Examples/ProductStatistics.php @@ -4,6 +4,7 @@ namespace App\AdminAgent\Metrics\Examples; use App\Models\Order; use Dcat\Admin\Admin; +use Dcat\Admin\Support\JavaScript; use Dcat\Admin\Widgets\ApexCharts\Chart; use Illuminate\Support\Arr; use Illuminate\Support\Facades\DB; @@ -139,4 +140,37 @@ class ProductStatistics extends Chart return parent::render(); } + + /** + * 重写初始化JS + * @return string + */ + protected function buildDefaultScript() + { + $options = JavaScript::format($this->options); + + return <<containerSelector}")[0], + options + ); + chart.render(); + + $(window).resize(function () { + var height = $(window).height() - $('.Dcat_Admin_Widgets_Box').offset().top - 130; + if (height < 320) { + height = 320 + } + chart.updateOptions({ + 'chart': { + 'height': height + } + }); + }).resize(); +})(); +JS; + } } diff --git a/app/AdminAgent/Metrics/Examples/UserStatistics.php b/app/AdminAgent/Metrics/Examples/UserStatistics.php index 5d851ca..77afa72 100644 --- a/app/AdminAgent/Metrics/Examples/UserStatistics.php +++ b/app/AdminAgent/Metrics/Examples/UserStatistics.php @@ -6,6 +6,7 @@ use App\Common\OrderStatus; use App\Models\Order; use App\Models\User; use Dcat\Admin\Admin; +use Dcat\Admin\Support\JavaScript; use Dcat\Admin\Widgets\ApexCharts\Chart; use Dcat\Admin\Widgets\Metrics\Bar; use Illuminate\Database\Eloquent\Model; @@ -29,6 +30,7 @@ class UserStatistics extends Chart $this->options([ 'chart' => [ //'width' => '180%', + 'height' => 1000, 'type' => 'bar', 'events' => [ ], @@ -155,4 +157,37 @@ class UserStatistics extends Chart return parent::render(); } + + /** + * 重写初始化JS + * @return string + */ + protected function buildDefaultScript() + { + $options = JavaScript::format($this->options); + + return <<containerSelector}")[0], + options + ); + chart.render(); + + $(window).resize(function () { + var height = $(window).height() - $('.Dcat_Admin_Widgets_Box').offset().top - 130; + if (height < 320) { + height = 320 + } + chart.updateOptions({ + 'chart': { + 'height': height + } + }); + }).resize(); +})(); +JS; + } } diff --git a/app/AdminSupplier/Controllers/FinanceStatisticsController.php b/app/AdminSupplier/Controllers/FinanceStatisticsController.php index 260a5a3..bf55111 100755 --- a/app/AdminSupplier/Controllers/FinanceStatisticsController.php +++ b/app/AdminSupplier/Controllers/FinanceStatisticsController.php @@ -24,6 +24,7 @@ class FinanceStatisticsController extends AdminController { Admin::style( << .content-wrapper > .content-header{display: none} .col-sm-12.d-flex{ display: inline-block !important; } @@ -79,7 +80,7 @@ class FinanceStatisticsController extends AdminController ) ->body(function (Row $row){ - $row->column(6,function (Column $column){ + $row->column(12,function (Column $column){ $column->row(new \App\AdminSupplier\Tools\DataReportDate('data_report')); }); @@ -164,7 +165,7 @@ HTML; ->fetched('$("#my-box").loading(false)') // 移除loading效果 ->click('.switch-bar'); // 设置图表点击菜单则重新发起请求，且被点击的目标元素上的 data-xxx 属性会被作为post数据发送到后端API - $box = Box::make('成本总额图表', $bar) + $box = Box::make('财务统计图表', $bar) ->id('my-box') // 设置盒子的ID ->tool($dropdown); // 设置下拉菜单按钮 diff --git a/app/AdminSupplier/Controllers/OrderStatisticsController.php b/app/AdminSupplier/Controllers/OrderStatisticsController.php index aa93e9f..8376c40 100755 --- a/app/AdminSupplier/Controllers/OrderStatisticsController.php +++ b/app/AdminSupplier/Controllers/OrderStatisticsController.php @@ -23,6 +23,7 @@ class OrderStatisticsController extends AdminController { Admin::style( << .content-wrapper > .content-header{display: none} .col-sm-12.d-flex{ display: inline-block !important; } @@ -51,7 +52,7 @@ class OrderStatisticsController extends AdminController ) ->body(function (Row $row){ - $row->column(6,function (Column $column){ + $row->column(12,function (Column $column){ $column->row(new \App\AdminSupplier\Tools\DataReportDate('data_report')); }); @@ -131,7 +132,7 @@ HTML; ->fetched('$("#my-box").loading(false)') // 移除loading效果 ->click('.switch-bar'); // 设置图表点击菜单则重新发起请求，且被点击的目标元素上的 data-xxx 属性会被作为post数据发送到后端API - $box = Box::make('成本总额图表', $bar) + $box = Box::make('订单统计图表', $bar) ->id('my-box') // 设置盒子的ID ->tool($dropdown); // 设置下拉菜单按钮 diff --git a/app/AdminSupplier/Controllers/ProductStatisticsController.php b/app/AdminSupplier/Controllers/ProductStatisticsController.php index 77d4c8e..712b7a4 100755 --- a/app/AdminSupplier/Controllers/ProductStatisticsController.php +++ b/app/AdminSupplier/Controllers/ProductStatisticsController.php @@ -26,6 +26,7 @@ class ProductStatisticsController extends AdminController { Admin::style( << .content-wrapper > .content-header{display: none} .col-sm-12.d-flex{ display: inline-block !important; } @@ -43,7 +44,7 @@ class ProductStatisticsController extends AdminController

- 商品统计 + 产品统计

@@ -55,7 +56,7 @@ class ProductStatisticsController extends AdminController ) ->body(function (Row $row){ - $row->column(6,function (Column $column){ + $row->column(12,function (Column $column){ $column->row(new \App\AdminSupplier\Tools\DataReportDate('data_report')); }); @@ -148,7 +149,7 @@ HTML; ->fetched('$("#my-box").loading(false)') // 移除loading效果 ->click('.switch-bar'); // 设置图表点击菜单则重新发起请求，且被点击的目标元素上的 data-xxx 属性会被作为post数据发送到后端API - $box = Box::make('成本总额图表', $bar) + $box = Box::make('产品统计图表', $bar) ->id('my-box') // 设置盒子的ID ->tool($dropdown); // 设置下拉菜单按钮 diff --git a/app/AdminSupplier/Metrics/Examples/FinanceStatistics.php b/app/AdminSupplier/Metrics/Examples/FinanceStatistics.php index d629683..c3b4f13 100644 --- a/app/AdminSupplier/Metrics/Examples/FinanceStatistics.php +++ b/app/AdminSupplier/Metrics/Examples/FinanceStatistics.php @@ -6,6 +6,7 @@ use App\Common\OrderStatus; use App\Models\Order; use App\Models\OrderProductItem; use Dcat\Admin\Admin; +use Dcat\Admin\Support\JavaScript; use Dcat\Admin\Widgets\ApexCharts\Chart; use Dcat\Admin\Widgets\Metrics\Bar; use Illuminate\Http\Request; @@ -142,4 +143,37 @@ class FinanceStatistics extends Chart return parent::render(); } + + /** + * 重写初始化JS + * @return string + */ + protected function buildDefaultScript() + { + $options = JavaScript::format($this->options); + + return <<containerSelector}")[0], + options + ); + chart.render(); + + $(window).resize(function () { + var height = $(window).height() - $('.Dcat_Admin_Widgets_Box').offset().top - 130; + if (height < 320) { + height = 320 + } + chart.updateOptions({ + 'chart': { + 'height': height + } + }); + }).resize(); +})(); +JS; + } } diff --git a/app/AdminSupplier/Metrics/Examples/OrderStatistics.php b/app/AdminSupplier/Metrics/Examples/OrderStatistics.php index efd257d..b31b02c 100644 --- a/app/AdminSupplier/Metrics/Examples/OrderStatistics.php +++ b/app/AdminSupplier/Metrics/Examples/OrderStatistics.php @@ -6,6 +6,7 @@ use App\Common\OrderStatus; use App\Models\Order; use App\Models\OrderProductItem; use Dcat\Admin\Admin; +use Dcat\Admin\Support\JavaScript; use Dcat\Admin\Widgets\ApexCharts\Chart; use Dcat\Admin\Widgets\Metrics\Bar; use Illuminate\Http\Request; @@ -139,4 +140,37 @@ class OrderStatistics extends Chart return parent::render(); } + + /** + * 重写初始化JS + * @return string + */ + protected function buildDefaultScript() + { + $options = JavaScript::format($this->options); + + return <<containerSelector}")[0], + options + ); + chart.render(); + + $(window).resize(function () { + var height = $(window).height() - $('.Dcat_Admin_Widgets_Box').offset().top - 130; + if (height < 320) { + height = 320 + } + chart.updateOptions({ + 'chart': { + 'height': height + } + }); + }).resize(); +})(); +JS; + } } diff --git a/app/AdminSupplier/Metrics/Examples/ProductStatistics.php b/app/AdminSupplier/Metrics/Examples/ProductStatistics.php index 863f732..d5e8615 100644 --- a/app/AdminSupplier/Metrics/Examples/ProductStatistics.php +++ b/app/AdminSupplier/Metrics/Examples/ProductStatistics.php @@ -5,6 +5,7 @@ namespace App\AdminSupplier\Metrics\Examples; use App\Models\Order; use App\Models\OrderProductItem; use Dcat\Admin\Admin; +use Dcat\Admin\Support\JavaScript; use Dcat\Admin\Widgets\ApexCharts\Chart; use Illuminate\Support\Arr; use Illuminate\Support\Facades\DB; @@ -140,4 +141,37 @@ class ProductStatistics extends Chart return parent::render(); } + + /** + * 重写初始化JS + * @return string + */ + protected function buildDefaultScript() + { + $options = JavaScript::format($this->options); + + return <<containerSelector}")[0], + options + ); + chart.render(); + + $(window).resize(function () { + var height = $(window).height() - $('.Dcat_Admin_Widgets_Box').offset().top - 130; + if (height < 320) { + height = 320 + } + chart.updateOptions({ + 'chart': { + 'height': height + } + }); + }).resize(); +})(); +JS; + } }