数据统计图表高度自适应

app/Admin/Controllers/AgentStatisticsController.php

@@ -26,6 +26,7 @@ class AgentStatisticsController extends AdminController
 	{
 		Admin::style(
 			<<<CSS
+            .app-content > .content-wrapper > .content-header{display: none}
             .col-sm-12.d-flex{
                     display: inline-block !important;
             }
@@ -43,7 +44,7 @@ class AgentStatisticsController extends AdminController
                     <div class="content-header">
                                 <section class="content-header breadcrumbs-top">
                                         <h1 class=" float-left">
-                                    <span class="text-capitalize">用户统计</span>
+                                    <span class="text-capitalize">代理商统计</span>
 
                                 </h1>
                     <div class="clearfix"></div>
@@ -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); // 设置下拉菜单按钮
 

app/Admin/Controllers/OrderStatisticsController.php

@@ -23,6 +23,7 @@ class OrderStatisticsController extends AdminController
 	{
 		Admin::style(
 			<<<CSS
+            .app-content > .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); // 设置下拉菜单按钮
 

app/Admin/Controllers/ProductStatisticsController.php

@@ -32,6 +32,7 @@ class ProductStatisticsController extends AdminController
 	{
 		Admin::style(
 			<<<CSS
+            .app-content > .content-wrapper > .content-header{display: none}
             .col-sm-12.d-flex{
                     display: inline-block !important;
             }
@@ -49,7 +50,7 @@ class ProductStatisticsController extends AdminController
                     <div class="content-header">
                                 <section class="content-header breadcrumbs-top">
                                         <h1 class=" float-left">
-                                    <span class="text-capitalize">商品统计</span>
+                                    <span class="text-capitalize">产品统计</span>
 
                                 </h1>
                     <div class="clearfix"></div>
@@ -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); // 设置下拉菜单按钮
 

app/Admin/Controllers/SupplierStatisticsController.php

@@ -26,6 +26,7 @@ class SupplierStatisticsController extends AdminController
 	{
 		Admin::style(
 			<<<CSS
+            .app-content > .content-wrapper > .content-header{display: none}
             .col-sm-12.d-flex{
                     display: inline-block !important;
             }
@@ -43,7 +44,7 @@ class SupplierStatisticsController extends AdminController
                     <div class="content-header">
                                 <section class="content-header breadcrumbs-top">
                                         <h1 class=" float-left">
-                                    <span class="text-capitalize">用户统计</span>
+                                    <span class="text-capitalize">供应商统计</span>
 
                                 </h1>
                     <div class="clearfix"></div>
@@ -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); // 设置下拉菜单按钮
 

app/Admin/Controllers/UserStatisticsController.php

@@ -25,6 +25,7 @@ class UserStatisticsController extends AdminController
 	{
 		Admin::style(
 			<<<CSS
+            .app-content > .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); // 设置下拉菜单按钮
 

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 <<<JS
+(function () {
+    var options = {$options};
+
+    var chart = new ApexCharts(
+        $("{$this->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;
+	}
 }

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 <<<JS
+(function () {
+    var options = {$options};
+
+    var chart = new ApexCharts(
+        $("{$this->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;
+	}
 }

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 <<<JS
+(function () {
+    var options = {$options};
+
+    var chart = new ApexCharts(
+        $("{$this->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;
+	}
 }

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 <<<JS
+(function () {
+    var options = {$options};
+
+    var chart = new ApexCharts(
+        $("{$this->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;
+	}
 }

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(
 			<<<CSS
+            .app-content > .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); // 设置下拉菜单按钮
 

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(
 			<<<CSS
+			.app-content > .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); // 设置下拉菜单按钮
 

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(
 			<<<CSS
+            .app-content > .content-wrapper > .content-header{display: none}
             .col-sm-12.d-flex{
                     display: inline-block !important;
             }
@@ -49,7 +43,7 @@ class ProductStatisticsController extends AdminController
                     <div class="content-header">
                                 <section class="content-header breadcrumbs-top">
                                         <h1 class=" float-left">
-                                    <span class="text-capitalize">商品统计</span>
+                                    <span class="text-capitalize">产品统计</span>
 
                                 </h1>
                     <div class="clearfix"></div>
@@ -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); // 设置下拉菜单按钮
 

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(
 			<<<CSS
+			.app-content > .content-wrapper > .content-header{display: none}
             .col-sm-12.d-flex{
             	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); // 设置下拉菜单按钮
 

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 <<<JS
+(function () {
+    var options = {$options};
+
+    var chart = new ApexCharts(
+        $("{$this->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;
+	}
 }

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 <<<JS
+(function () {
+    var options = {$options};
+
+    var chart = new ApexCharts(
+        $("{$this->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;
+	}
 }

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 <<<JS
+(function () {
+    var options = {$options};
+
+    var chart = new ApexCharts(
+        $("{$this->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;
+	}
 }

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 <<<JS
+(function () {
+    var options = {$options};
+
+    var chart = new ApexCharts(
+        $("{$this->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;
+	}
 }

app/AdminSupplier/Controllers/FinanceStatisticsController.php

@@ -24,6 +24,7 @@ class FinanceStatisticsController extends AdminController
 	{
 		Admin::style(
 			<<<CSS
+            .app-content > .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); // 设置下拉菜单按钮
 

app/AdminSupplier/Controllers/OrderStatisticsController.php

@@ -23,6 +23,7 @@ class OrderStatisticsController extends AdminController
 	{
 		Admin::style(
 			<<<CSS
+            .app-content > .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); // 设置下拉菜单按钮
 

app/AdminSupplier/Controllers/ProductStatisticsController.php

@@ -26,6 +26,7 @@ class ProductStatisticsController extends AdminController
 	{
 		Admin::style(
 			<<<CSS
+            .app-content > .content-wrapper > .content-header{display: none}
             .col-sm-12.d-flex{
                     display: inline-block !important;
             }
@@ -43,7 +44,7 @@ class ProductStatisticsController extends AdminController
                     <div class="content-header">
                                 <section class="content-header breadcrumbs-top">
                                         <h1 class=" float-left">
-                                    <span class="text-capitalize">商品统计</span>
+                                    <span class="text-capitalize">产品统计</span>
 
                                 </h1>
                     <div class="clearfix"></div>
@@ -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); // 设置下拉菜单按钮
 

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 <<<JS
+(function () {
+    var options = {$options};
+
+    var chart = new ApexCharts(
+        $("{$this->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;
+	}
 }

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 <<<JS
+(function () {
+    var options = {$options};
+
+    var chart = new ApexCharts(
+        $("{$this->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;
+	}
 }

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 <<<JS
+(function () {
+    var options = {$options};
+
+    var chart = new ApexCharts(
+        $("{$this->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;
+	}
 }