diff --git a/app/Http/Controllers/Admin/ParkingGateControlController.php b/app/Http/Controllers/Admin/ParkingGateControlController.php index f66674a..f1f1e28 100644 --- a/app/Http/Controllers/Admin/ParkingGateControlController.php +++ b/app/Http/Controllers/Admin/ParkingGateControlController.php @@ -132,7 +132,10 @@ class ParkingGateControlController extends BaseController { try { $data = [ - 'member_type_list' => ParkingSpaceType::getData() + 'member_type_list' => ParkingSpaceType::getData(), + 'leave_remark_list' => get_select_data( + $this->service->getLeaveRemark() + ) ]; return $this->responseService->success($data); } catch (Exception $e) { diff --git a/app/Services/ParkingGateControlService.php b/app/Services/ParkingGateControlService.php index b0ea563..9395388 100644 --- a/app/Services/ParkingGateControlService.php +++ b/app/Services/ParkingGateControlService.php @@ -19,6 +19,14 @@ class ParkingGateControlService extends BaseService 1 => 'automatic', 2 => 'manual' ]; + + public static array $leaveRemarkArr + = [ + 1 => 'leave_remark1', + 2 => 'leave_remark2', + 3 => 'leave_remark3' + ]; + protected string $menuTitle = 'gate_control'; public function getItem($item) @@ -73,6 +81,18 @@ class ParkingGateControlService extends BaseService return $typeArr; } + /** + * @return array|string[] + */ + public function getLeaveRemark(): array + { + $leaveRemarkArr = self::$leaveRemarkArr; + foreach ($leaveRemarkArr as $key => $value) { + $leaveRemarkArr[$key] = __service($this->menuTitle . '.' . $value); + } + return $leaveRemarkArr; + } + public function enterModel($data) { try { @@ -145,6 +165,7 @@ class ParkingGateControlService extends BaseService $license_plate = $data['license_plate']; $leave_time = $data['leave_time']; $leave_img = $data['leave_img'] ?? ''; + $leave_remark = $data['leave_remark'] ?? 0; $free_passage = $data['free_passage'] ?? 0; $license_plate_id = (new ParkingLicensePlateService( $this->logService @@ -166,6 +187,7 @@ class ParkingGateControlService extends BaseService 'leave_img' => $leave_img, 'leave_at' => $leave_time, 'free_passage' => $free_passage, + 'leave_remark' => $leave_remark, 'admin_user_id' => $data['admin_user_id'], 'updated_at' => get_datetime() ]); diff --git a/resources/lang/en/service.php b/resources/lang/en/service.php index c6e4dd3..dd3e1e5 100644 --- a/resources/lang/en/service.php +++ b/resources/lang/en/service.php @@ -174,7 +174,10 @@ return [ 'cat_not_exists' => 'The current vehicle has not entered the venue', 'not_reservation' => 'No appointment available', 'yes_reservation' => 'Appointment', - 'get_error' => 'Failed to obtain' + 'get_error' => 'Failed to obtain', + 'leave_remark1' => 'Large lifting vehicles', + 'leave_remark2' => 'The vehicle has been paid for', + 'leave_remark3' => 'Special homework vehicles' ], 'prohibited_passage' => [ 'remark1' => 'No appointment, no entry allowed', diff --git a/resources/lang/zh-CN/service.php b/resources/lang/zh-CN/service.php index c327164..86a695c 100644 --- a/resources/lang/zh-CN/service.php +++ b/resources/lang/zh-CN/service.php @@ -174,7 +174,10 @@ return [ 'cat_not_exists' => '当前车辆未入场', 'not_reservation' => '无预约', 'yes_reservation' => '有预约', - 'get_error' => '获取失败' + 'get_error' => '获取失败', + 'leave_remark1' => '大型起重车辆', + 'leave_remark2' => '车辆已缴费', + 'leave_remark3' => '特殊作业车辆' ], 'prohibited_passage' => [ 'remark1' => '无预约,不可进场', diff --git a/resources/lang/zh-TW/service.php b/resources/lang/zh-TW/service.php index f7f14f5..0f92301 100644 --- a/resources/lang/zh-TW/service.php +++ b/resources/lang/zh-TW/service.php @@ -170,11 +170,14 @@ return [ 'gate_control' => [ 'automatic' => '自動入場', 'manual' => '手動入場', - 'cat_exists' => '当前车辆还未离场', - 'cat_not_exists' => '当前车辆未入场', - 'not_reservation' => '无预约', - 'yes_reservation' => '有预约', - 'get_error' => '获取失败' + 'cat_exists' => '當前車輛還未離場', + 'cat_not_exists' => '當前車輛未入場', + 'not_reservation' => '無預約', + 'yes_reservation' => '有預約', + 'get_error' => '獲取失敗', + 'leave_remark1' => '大型起重車輛', + 'leave_remark2' => '車輛已繳費', + 'leave_remark3' => '特殊工作車輛' ], 'prohibited_passage' => [ 'remark1' => '無預約,不可進場',