Merge branch 'master' into version_0302

app/Http/Controllers/Manager/Statistics/BasicPanel.php

@@ -12,7 +12,7 @@ use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Carbon;
 
 /**
- * 报表统计-基础概览面板
+ * 数据分析-基础概览面板
  * @author 唐远望
  * @version   1.0
  * @date      2026-02-10
@@ -338,6 +338,7 @@ class BasicPanel extends Controller
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         //终端类型B端、C端、OTO
+        $province_id = request('province_id', ''); //省份ID
         $terminal_type = request('terminal_type', '');
         $product_name = request('product_name', ''); //商品名称
         $yesterdayStart = Carbon::yesterday()->startOfDay()->getTimestamp(); // 昨天开始时间 00:00:00
@@ -359,6 +360,7 @@ class BasicPanel extends Controller
             $map[] = ['company_id', '=', $admin_company_id];
         }
         if ($product_name) $map[] = ['product_name', 'like', '%' . $product_name . '%'];
+        if ($province_id) $map[] = ['province_id', '=', $province_id];
         // 禁止挂网城市统计
         $violationProductModel = $violationProductModel->query();
         if ($terminal_type) {
@@ -681,6 +683,7 @@ class BasicPanel extends Controller
         $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
 
         //终端类型B端、C端、OTO
+        $province_id = request('province_id', ''); //省份id
         $terminal_type = request('terminal_type', '');
         $product_name = request('product_name', ''); //商品名称
         $yesterdayStart = Carbon::yesterday()->startOfDay()->getTimestamp(); // 昨天开始时间 00:00:00
@@ -702,6 +705,7 @@ class BasicPanel extends Controller
             $map[] = ['company_id', '=', $admin_company_id];
         }
         if ($product_name) $map[] = ['product_name', 'like', '%' . $product_name . '%'];
+        if ($province_id) $map[] = ['province_id', '=', $province_id];
         // 禁止挂网城市统计
         $LowPriceGoodsModel = $LowPriceGoodsModel->query();
         if ($terminal_type) {

app/Http/Controllers/Manager/Statistics/OverviewPanel.php

@@ -16,7 +16,7 @@ use App\Models\Manager\Process\ViolationProductMember as ViolationProductMemberM
 use App\Servers\Aliyun\Oss;
 
 /**
- * 报表统计-概览面板
+ * 数据分析-概览面板
  * @author 唐远望
  * @version   1.0
  * @date      2025-12-26

app/Http/Requests/Manager/Statistics/BasicPanel.php

@@ -5,7 +5,7 @@ namespace App\Http\Requests\Manager\Statistics;
 use App\Http\Requests\BaseRequest;
 
 /**
- * 报表统计-概览面板
+ * 数据分析-概览面板
  * @author 唐远望
  * @version 1.0
  * @date 2026-02-10

app/Http/Requests/Manager/Statistics/OverviewPanel.php

@@ -5,7 +5,7 @@ namespace App\Http\Requests\Manager\Statistics;
 use App\Http\Requests\BaseRequest;
 
 /**
- * 报表统计-概览面板
+ * 数据分析-概览面板
  * @author 唐远望
  * @version 1.0
  * @date 2025-12-26

routes/manager.php

@@ -280,29 +280,29 @@ Route::any('upload/uploadimg',[App\Http\Controllers\Manager\Upload::class,'uploa
 // 操作日志-列表
 Route::any('operation_log/list', [App\Http\Controllers\Manager\AdminHistory::class, 'list']);
 
-//报表统计-禁止挂网链接数统计
+//数据分析-禁止挂网链接数统计
 Route::any('statistics/overview_panel/get_violation_link_count', [App\Http\Controllers\Manager\Statistics\OverviewPanel::class, 'getViolationLinkCount']);
-//报表统计-禁止挂网链接数统计-导出
+//数据分析-禁止挂网链接数统计-导出
 Route::any('statistics/overview_panel/violation_export', [App\Http\Controllers\Manager\Statistics\OverviewPanel::class, 'Violation_export']);
-//报表统计-禁止挂网公司月度统计
+//数据分析-禁止挂网公司月度统计
 Route::any('statistics/overview_panel/get_violation_company_count', [App\Http\Controllers\Manager\Statistics\OverviewPanel::class, 'get_violation_company_count']);
-//报表统计-禁止挂网公司月度统计-导出
+//数据分析-禁止挂网公司月度统计-导出
 Route::any('statistics/overview_panel/violation_company_export', [App\Http\Controllers\Manager\Statistics\OverviewPanel::class, 'violation_company_export']);
-//报表统计-低价违规挂网链接数统计
+//数据分析-低价违规挂网链接数统计
 Route::any('statistics/overview_panel/get_low_price_link_count', [App\Http\Controllers\Manager\Statistics\OverviewPanel::class, 'getLowPriceLinkCount']);
-//报表统计-低价违规挂网链接数统计-导出
+//数据分析-低价违规挂网链接数统计-导出
 Route::any('statistics/overview_panel/low_price_export', [App\Http\Controllers\Manager\Statistics\OverviewPanel::class, 'low_price_export']);
-//报表统计-低价违规挂网公司月度统计
+//数据分析-低价违规挂网公司月度统计
 Route::any('statistics/overview_panel/get_low_price_company_count', [App\Http\Controllers\Manager\Statistics\OverviewPanel::class, 'getLowPriceCompanyCount']);
-//报表统计-低价违规挂网公司月度统计-导出
+//数据分析-低价违规挂网公司月度统计-导出
 Route::any('statistics/overview_panel/low_price_company_export', [App\Http\Controllers\Manager\Statistics\OverviewPanel::class, 'low_price_company_export']);
-//报表统计-商品数量趋势
+//数据分析-商品数量趋势
 Route::any('statistics/overview_panel/get_product_trend', [App\Http\Controllers\Manager\Statistics\OverviewPanel::class, 'get_product_trend']);
-//报表统计-商品数量趋势-导出
+//数据分析-商品数量趋势-导出
 Route::any('statistics/overview_panel/product_trend_export', [App\Http\Controllers\Manager\Statistics\OverviewPanel::class, 'product_trend_export']);
-//报表统计-商家数量趋势
+//数据分析-商家数量趋势
 Route::any('statistics/overview_panel/get_store_trend', [App\Http\Controllers\Manager\Statistics\OverviewPanel::class, 'get_store_trend']);
-//报表统计-商家数量趋势-导出
+//数据分析-商家数量趋势-导出
 Route::any('statistics/overview_panel/store_trend_export', [App\Http\Controllers\Manager\Statistics\OverviewPanel::class, 'store_trend_export']);
 
 //采集配置-商品管理-列表
@@ -340,29 +340,29 @@ Route::any('collect_sync/product/data_yycheng_sync', [App\Http\Controllers\Manag
 //采集数据同步-京东天猫
 Route::any('collect_sync/product/data_jd_tmall_sync', [App\Http\Controllers\Manager\CollectSync\Product::class, 'data_jd_tmall_sync']);
 
-//新报表统计-挂网数据统计
+//数据概况-挂网数据统计
 Route::any('statistics/basic_panel/get_online_goods_count', [App\Http\Controllers\Manager\Statistics\BasicPanel::class, 'get_online_goods_count']);
-//新报表统计-禁止挂网商品数统计排行
+//数据概况-禁止挂网商品数统计排行
 Route::any('statistics/basic_panel/get_violation_product_count', [App\Http\Controllers\Manager\Statistics\BasicPanel::class, 'get_violation_product_count']);
-//新报表统计-禁止挂网公司数统计排行
+//数据概况-禁止挂网公司数统计排行
 Route::any('statistics/basic_panel/get_violation_company_count', [App\Http\Controllers\Manager\Statistics\BasicPanel::class, 'get_violation_company_count']);
-//新报表统计-禁止挂网省份统计排行
+//数据概况-禁止挂网省份统计排行
 Route::any('statistics/basic_panel/get_violation_province_count', [App\Http\Controllers\Manager\Statistics\BasicPanel::class, 'get_violation_province_count']);
-//新报表统计-禁止挂网城市统计排行
+//数据概况-禁止挂网城市统计排行
 Route::any('statistics/basic_panel/get_violation_city_count', [App\Http\Controllers\Manager\Statistics\BasicPanel::class, 'get_violation_city_count']);
-//新报表统计-低价违规商品数统计排行
+//数据概况-低价违规商品数统计排行
 Route::any('statistics/basic_panel/get_low_price_product_count', [App\Http\Controllers\Manager\Statistics\BasicPanel::class, 'get_low_price_product_count']);
-//新报表统计-低价违规公司数统计排行
+//数据概况-低价违规公司数统计排行
 Route::any('statistics/basic_panel/get_low_price_company_count', [App\Http\Controllers\Manager\Statistics\BasicPanel::class, 'get_low_price_company_count']);
-//新报表统计-低价违规省份统计排行
+//数据概况-低价违规省份统计排行
 Route::any('statistics/basic_panel/get_low_price_province_count', [App\Http\Controllers\Manager\Statistics\BasicPanel::class, 'get_low_price_province_count']);
-//新报表统计-低价违规城市统计排行
+//数据概况-低价违规城市统计排行
 Route::any('statistics/basic_panel/get_low_price_city_count', [App\Http\Controllers\Manager\Statistics\BasicPanel::class, 'get_low_price_city_count']);
-//新报表统计-低价挂网平台分布
+//数据概况-低价挂网平台分布
 Route::any('statistics/basic_panel/get_low_price_platform_count', [App\Http\Controllers\Manager\Statistics\BasicPanel::class, 'get_low_price_platform_count']);
-//新报表统计-低价挂网平台省份分布
+//数据概况-低价挂网平台省份分布
 Route::any('statistics/basic_panel/get_low_price_platform_province_count', [App\Http\Controllers\Manager\Statistics\BasicPanel::class, 'get_low_price_platform_province_count']);
-//新报表统计-禁止挂网平台分布
+//数据概况-禁止挂网平台分布
 Route::any('statistics/basic_panel/get_violation_platform_count', [App\Http\Controllers\Manager\Statistics\BasicPanel::class, 'get_violation_platform_count']);
-//新报表统计-禁止挂网平台省份分布
+//数据概况-禁止挂网平台省份分布
 Route::any('statistics/basic_panel/get_violation_platform_province_count', [App\Http\Controllers\Manager\Statistics\BasicPanel::class, 'get_violation_platform_province_count']);