diff --git a/app/Admin/Controllers/CropController.php b/app/Admin/Controllers/CropPlantController.php similarity index 95% rename from app/Admin/Controllers/CropController.php rename to app/Admin/Controllers/CropPlantController.php index bc7d615..8c529a2 100644 --- a/app/Admin/Controllers/CropController.php +++ b/app/Admin/Controllers/CropPlantController.php @@ -4,13 +4,13 @@ namespace App\Admin\Controllers; use Illuminate\Http\Request; use Slowlyo\OwlAdmin\Controllers\AdminController; -use App\Services\Admin\CropPlanService; +use App\Services\Admin\CropPlantService; -class CropController extends AdminController +class CropPlantController extends AdminController { - protected string $serviceName = CropPlanService::class; + protected string $serviceName = CropPlantService::class; - public function planDetail(Request $request) + public function plantDetail(Request $request) { $randArr = function () { $_arr = []; diff --git a/app/Admin/Controllers/CustomRegionController.php b/app/Admin/Controllers/CustomRegionController.php index c696abb..050699b 100644 --- a/app/Admin/Controllers/CustomRegionController.php +++ b/app/Admin/Controllers/CustomRegionController.php @@ -159,7 +159,7 @@ class CustomRegionController extends AdminController ), \amisMake()->CRUDTable() ->title('') - ->api(admin_url('crop-plans').'?_action=getData®ion_id='.$region->id) + ->api(admin_url('crop-plants').'?_action=getData®ion_id='.$region->id) ->columns([ amisMake()->TableColumn()->name('plant_name')->label('名称'), amisMake()->TableColumn()->name('director')->label('负责人'), @@ -175,7 +175,7 @@ class CustomRegionController extends AdminController [ 'title' => '种植详情', 'value' => 'detail', - 'tab'=>\amisMake()->Service()->schemaApi(admin_url('crop-plan-detail?id=')),//传id + 'tab'=>\amisMake()->Service()->schemaApi(admin_url('crop-plant-detail?id=${id}')),//传id 'unmountOnExit' => true//每次切换tab都要销毁 ], [ @@ -202,7 +202,7 @@ class CustomRegionController extends AdminController ->confirmText(__('admin.confirm_delete')) ->api([ 'method' => 'delete', - 'url' => admin_url('crop-plans/${id}') + 'url' => admin_url('crop-plants/${id}') ]) ]) ]) @@ -217,7 +217,7 @@ class CustomRegionController extends AdminController return amisMake()->Form() ->api([ 'method'=>'post', - 'url'=>admin_url('crop-plans'), + 'url'=>admin_url('crop-plants'), "data" => [ 'region_id'=>'${region_id}', 'plant_name'=>'${plant_name}', @@ -239,8 +239,8 @@ class CustomRegionController extends AdminController return amisMake()->Form() ->api([ 'method'=>'put', - 'url'=>admin_url('crop-plans/${id}'), - ])->initApi(admin_url('crop-plans/${id}/edit').'?_action=getData') + 'url'=>admin_url('crop-plants/${id}'), + ])->initApi(admin_url('crop-plants/${id}/edit').'?_action=getData') ->body([ \amisMake()->TextControl()->name('id')->hidden(true), \amisMake()->TextControl()->name('region_id')->label('区域ID')->hidden(true), diff --git a/app/Admin/routes.php b/app/Admin/routes.php index e47c647..67028b1 100644 --- a/app/Admin/routes.php +++ b/app/Admin/routes.php @@ -78,8 +78,8 @@ Route::group([ $router->post('custom-region-wasserstrahl', '\App\Admin\Controllers\DeviceController@wasserstrahlDetail'); //种植记录 - $router->resource('crop-plans', \App\Admin\Controllers\CropController::class)->only(['index','store', 'edit', 'update', 'destroy']); - $router->post('crop-plan-detail', '\App\Admin\Controllers\CropController@planDetail'); + $router->resource('crop-plants', \App\Admin\Controllers\CropPlantController::class)->only(['index','store', 'edit', 'update', 'destroy']); + $router->post('crop-plant-detail', '\App\Admin\Controllers\CropPlantController@plantDetail'); $router->resource('system/settings', \App\Admin\Controllers\SettingController::class); }); diff --git a/app/Services/Admin/CropPlanService.php b/app/Services/Admin/CropPlantService.php similarity index 85% rename from app/Services/Admin/CropPlanService.php rename to app/Services/Admin/CropPlantService.php index 9e236d6..565b49c 100644 --- a/app/Services/Admin/CropPlanService.php +++ b/app/Services/Admin/CropPlantService.php @@ -8,7 +8,7 @@ use App\Models\RegionPlantLog; * @method RegionPlantLog getModel() * @method RegionPlantLog|\Illuminate\Database\Query\Builder query() */ -class CropPlanService extends BaseService +class CropPlantService extends BaseService { protected string $modelName = RegionPlantLog::class; }