From 08202b451f6d14f4957fb2d8790345beea7a00a6 Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Mon, 8 May 2023 18:32:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=87=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=90=8E=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/CustomRegionController.php | 24 +++++++++---------- app/Services/Admin/CropHarvestService.php | 3 +++ app/Services/Admin/CropPlantService.php | 4 ++-- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/app/Admin/Controllers/CustomRegionController.php b/app/Admin/Controllers/CustomRegionController.php index 1d24587..ee61bcf 100644 --- a/app/Admin/Controllers/CustomRegionController.php +++ b/app/Admin/Controllers/CustomRegionController.php @@ -178,18 +178,18 @@ class CustomRegionController extends AdminController 'tab'=>\amisMake()->Service()->schemaApi(admin_url('crop-plant-detail?id=${id}')),//传id 'unmountOnExit' => true//每次切换tab都要销毁 ], - [ - 'title' => '报警记录', - 'value' => 'warning', - // 'tab'=>\amisMake()->Service()->schemaApi(admin_url('custom-region-detail?id='.$region['id'])), - 'unmountOnExit' => true//每次切换tab都要销毁 - ], - [ - 'title' => '虫情记录', - 'value' => 'warning', - // 'tab'=>\amisMake()->Service()->schemaApi(admin_url('custom-region-detail?id='.$region['id'])), - 'unmountOnExit' => true//每次切换tab都要销毁 - ], + // [ + // 'title' => '报警记录', + // 'value' => 'warning', + // // 'tab'=>\amisMake()->Service()->schemaApi(admin_url('custom-region-detail?id='.$region['id'])), + // 'unmountOnExit' => true//每次切换tab都要销毁 + // ], + // [ + // 'title' => '虫情记录', + // 'value' => 'warning', + // // 'tab'=>\amisMake()->Service()->schemaApi(admin_url('custom-region-detail?id='.$region['id'])), + // 'unmountOnExit' => true//每次切换tab都要销毁 + // ], ]) ]) ]) diff --git a/app/Services/Admin/CropHarvestService.php b/app/Services/Admin/CropHarvestService.php index 187ff18..c64ced3 100644 --- a/app/Services/Admin/CropHarvestService.php +++ b/app/Services/Admin/CropHarvestService.php @@ -3,6 +3,7 @@ namespace App\Services\Admin; use App\Models\PlantHarvestLog; +use App\Filters\Admin\PlantHarvestLogFilter; /** * @method PlantHarvestLog getModel() @@ -11,4 +12,6 @@ use App\Models\PlantHarvestLog; class CropHarvestService extends BaseService { protected string $modelName = PlantHarvestLog::class; + + protected string $modelFilterName = PlantHarvestLogFilter::class; } diff --git a/app/Services/Admin/CropPlantService.php b/app/Services/Admin/CropPlantService.php index 59c6c03..7f010ed 100644 --- a/app/Services/Admin/CropPlantService.php +++ b/app/Services/Admin/CropPlantService.php @@ -3,7 +3,7 @@ namespace App\Services\Admin; use App\Models\RegionPlantLog; -use App\Filters\Admin\RegionPlantFilter; +use App\Filters\Admin\RegionPlantLogFilter; /** * @method RegionPlantLog getModel() @@ -13,6 +13,6 @@ class CropPlantService extends BaseService { protected string $modelName = RegionPlantLog::class; - protected string $modelFilterName = RegionPlantFilter::class; + protected string $modelFilterName = RegionPlantLogFilter::class; }