diff --git a/app/Http/Controllers/Admin/parkingAttendantController.php b/app/Http/Controllers/Admin/ParkingAttendantController.php similarity index 99% rename from app/Http/Controllers/Admin/parkingAttendantController.php rename to app/Http/Controllers/Admin/ParkingAttendantController.php index dd9e9e7..e5ea6a0 100644 --- a/app/Http/Controllers/Admin/parkingAttendantController.php +++ b/app/Http/Controllers/Admin/ParkingAttendantController.php @@ -12,7 +12,7 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Validator; use Illuminate\Validation\ValidationException; -class parkingAttendantController extends BaseController +class ParkingAttendantController extends BaseController { protected string $menuUri = 'parkingAttendant'; diff --git a/app/Http/Controllers/Admin/RegionalManagementController.php b/app/Http/Controllers/Admin/RegionalManagementController.php index cca86d7..dc136e2 100644 --- a/app/Http/Controllers/Admin/RegionalManagementController.php +++ b/app/Http/Controllers/Admin/RegionalManagementController.php @@ -139,6 +139,26 @@ class RegionalManagementController extends BaseController } } + /** + * @return JsonResponse + */ + public function create(): JsonResponse + { + try { + $data = [ + 'building_floor_list' => get_select_data( + AdminFloorService::getBuildingFloor() + ), + 'floor_list' => AdminFloor::getData() + ]; + return $this->responseService->success($data); + } catch (Exception $e) { + return $this->responseService->systemError( + __('exception.get_data_failed') . ':' . $e->getMessage() + ); + } + } + /** * @param Request $request @@ -179,8 +199,8 @@ class RegionalManagementController extends BaseController 'close_time' => 'required|size:5', ]; $messages = [ - 'name.required' => __('validation.admin_floor.n_empty'), - 'name.max' => __('validation.admin_floor.n_max'), + 'name.required' => __('validation.admin_floor_region.n_empty'), + 'name.max' => __('validation.admin_floor_region.n_max'), 'open_time.required' => __( 'validation.parking_management.o_empty' ), diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index d343f69..c11404b 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -132,5 +132,16 @@ return [ 'p_empty' => 'The phone number cannot be empty', 'm_empty' => 'Member type cannot be empty', 'name_exists' => 'The name of the management personnel already exists', + ], + 'admin_floor_region' => [ + 'n_empty' => 'The region name cannot be empty', + 'n_max' => 'The maximum length of the region name is 50 characters' + ], + 'channel_management' => [ + 'n_empty' => 'Channel name cannot be empty', + 't_empty' => 'Channel type cannot be empty', + 'po_empty' => 'The channel position cannot be empty', + 'pa_empty' => 'The affiliated parking lot cannot be empty', + 'g_empty' => 'The affiliated booth cannot be empty' ] ]; diff --git a/resources/lang/zh-CN/validation.php b/resources/lang/zh-CN/validation.php index 8c352b4..d585014 100644 --- a/resources/lang/zh-CN/validation.php +++ b/resources/lang/zh-CN/validation.php @@ -132,5 +132,16 @@ return [ 'p_empty' => '手机号不能为空', 'm_empty' => '会员类型不能为空', 'name_exists' => '管理人员名称已存在', + ], + 'admin_floor_region' => [ + 'n_empty' => '区域名称不能为空', + 'n_max' => '区域名称最多50个字符' + ], + 'channel_management' => [ + 'n_empty' => '通道名称不能为空', + 't_empty' => '通道类型不能为空', + 'po_empty' => '通道位置不能为空', + 'pa_empty' => '所属车场不能为空', + 'g_empty' => '所属岗亭不能为空' ] ]; diff --git a/resources/lang/zh-TW/validation.php b/resources/lang/zh-TW/validation.php index 07109c8..a57ce7c 100644 --- a/resources/lang/zh-TW/validation.php +++ b/resources/lang/zh-TW/validation.php @@ -132,5 +132,16 @@ return [ 'p_empty' => '手機號不能為空', 'm_empty' => '會員類型不能為空', 'name_exists' => '管理人員名稱已存在', + ], + 'admin_floor_region' => [ + 'n_empty' => '區域名稱不能為空', + 'n_max' => '區域名稱最多50個字元' + ], + 'channel_management' => [ + 'n_empty' => '通道名稱不能為空', + 't_empty' => '通道類型不能為空', + 'po_empty' => '通道位置不能為空', + 'pa_empty' => '所屬車場不能為空', + 'g_empty' => '所屬崗亭不能為空' ] ]; diff --git a/routes/admin/api.php b/routes/admin/api.php index 9d7b570..5c08b6d 100644 --- a/routes/admin/api.php +++ b/routes/admin/api.php @@ -29,7 +29,7 @@ use App\Http\Controllers\Admin\LicensePlateRecognitionController; use App\Http\Controllers\Admin\ParkingBehaviorController; use App\Http\Controllers\Admin\ParkingManagementController; use App\Http\Controllers\Admin\ParkingManagementListController; -use App\Http\Controllers\Admin\parkingAttendantController; +use App\Http\Controllers\Admin\ParkingAttendantController; use App\Http\Controllers\Admin\RegionalManagementController; @@ -222,15 +222,16 @@ Route::group(['prefix' => 'admin'], function () { Route::get('/parkingList', [ParkingManagementListController::class, 'index']); Route::get('/parkingList/rule', [ParkingManagementListController::class, 'rule']); // 停车场管理人员 - Route::get('/parkingAttendant', [parkingAttendantController::class, 'index']); - Route::get('/parkingAttendant/search', [parkingAttendantController::class, 'search']); - Route::post('/parkingAttendant', [parkingAttendantController::class, 'store']); - Route::get('/parkingAttendant/edit/{id}', [parkingAttendantController::class, 'edit']); - Route::put('/parkingAttendant/{id}', [parkingAttendantController::class, 'update']); - Route::delete('/parkingAttendant/{id}', [parkingAttendantController::class, 'destroy']); - Route::get('/parkingAttendant/rule', [parkingAttendantController::class, 'rule']); - // 楼层配置 + Route::get('/parkingAttendant', [ParkingAttendantController::class, 'index']); + Route::get('/parkingAttendant/search', [ParkingAttendantController::class, 'search']); + Route::post('/parkingAttendant', [ParkingAttendantController::class, 'store']); + Route::get('/parkingAttendant/edit/{id}', [ParkingAttendantController::class, 'edit']); + Route::put('/parkingAttendant/{id}', [ParkingAttendantController::class, 'update']); + Route::delete('/parkingAttendant/{id}', [ParkingAttendantController::class, 'destroy']); + Route::get('/parkingAttendant/rule', [ParkingAttendantController::class, 'rule']); + // 楼层区域 Route::get('/regionalManagement', [RegionalManagementController::class, 'index']); + Route::get('/regionalManagement/create', [RegionalManagementController::class, 'create']); Route::post('/regionalManagement', [RegionalManagementController::class, 'store']); Route::get('/regionalManagement/edit/{id}', [RegionalManagementController::class, 'edit']); Route::put('/regionalManagement/{id}', [RegionalManagementController::class, 'update']);