diff --git a/app/Http/Controllers/Admin/ParkingSpaceController.php b/app/Http/Controllers/Admin/ParkingSpaceController.php index ad4d057..d94ccfd 100644 --- a/app/Http/Controllers/Admin/ParkingSpaceController.php +++ b/app/Http/Controllers/Admin/ParkingSpaceController.php @@ -330,7 +330,7 @@ class ParkingSpaceController extends BaseController $data['parking_space_number'] = $item['number']; $data['license_plate'] = ParkingLicensePlate::getNumber($item['license_plate_id']); $data['space_status'] = $item['status']; - $data['status'] = $this->service->getParkingSpaceStatus($item['status'], $item['license_plate_id'], $parking_space_id); + $data['status'] = $item['status'] == 1 ? __service('parking_space.yes_occupy') : ''; $data['parking_space_type'] = ParkingSpaceType::getName($item['space_type_id']); $data['parking_space_attr'] = ParkingSpaceAttributes::getAttr($item['space_attr_id']); $data['berthing_time_str'] = ''; diff --git a/resources/lang/en/service.php b/resources/lang/en/service.php index f486f2b..7adbcd9 100644 --- a/resources/lang/en/service.php +++ b/resources/lang/en/service.php @@ -76,7 +76,8 @@ return [ 'abnormal' => 'Abnormal resource usage', 'vacant_repair' => 'Vacant Maintenance', 'occupied_repair' => 'Occupied Maintenance', - 'warning' => 'Alarm' + 'warning' => 'Alarm', + 'yes_occupy' => 'Occupied' ], 'parking_information' => [ 'not_default' => 'Default parking space type not set' diff --git a/resources/lang/zh-CN/service.php b/resources/lang/zh-CN/service.php index 6248e5e..8d1d2d1 100644 --- a/resources/lang/zh-CN/service.php +++ b/resources/lang/zh-CN/service.php @@ -76,7 +76,8 @@ return [ 'abnormal' => '异常占用', 'vacant_repair' => '空置维修', 'occupied_repair' => '已占用维修', - 'warning' => '警报' + 'warning' => '警报', + 'yes_occupy' => '已占用' ], 'parking_information' => [ 'not_default' => '未设置默认车位类型' diff --git a/resources/lang/zh-TW/service.php b/resources/lang/zh-TW/service.php index 72f5810..c496e4f 100644 --- a/resources/lang/zh-TW/service.php +++ b/resources/lang/zh-TW/service.php @@ -76,7 +76,8 @@ return [ 'abnormal' => '異常佔用', 'vacant_repair' => '空置維修', 'occupied_repair' => '已佔用維修', - 'warning' => '警報' + 'warning' => '警報', + 'yes_occupy' => '已佔用' ], 'parking_information' => [ 'not_default' => '未設定默認車位類型'