diff --git a/app/Http/Controllers/Admin/ParkingSpaceRepairController.php b/app/Http/Controllers/Admin/ParkingSpaceRepairController.php index 5b702c6..6755aaa 100644 --- a/app/Http/Controllers/Admin/ParkingSpaceRepairController.php +++ b/app/Http/Controllers/Admin/ParkingSpaceRepairController.php @@ -608,11 +608,19 @@ class ParkingSpaceRepairController extends BaseController $color_temp[] = $val; } else { $type_arr = []; - foreach ($type_list as $t_item) { - if (count($type_arr) >= 2) { - break; + foreach ($type_list as &$t_item) { + if (count($type_arr) <= 2) { + $type_arr[] = $t_item['space_type_name']; } - $type_arr[] = $t_item['space_type_name']; + $space_attr_list = $t_item['space_attr_list']; + $new_list = []; + foreach ($space_attr_list as $key => $t_value) { + $new_list[] = [ + 'light' => __service('parking_space.'.$key), + 'attr_str' => implode('、', $t_value) + ]; + } + $t_item['space_attr_list'] = $new_list; } if ($type_arr) { $type_str = implode('、', $type_arr); diff --git a/resources/lang/en/service.php b/resources/lang/en/service.php index bc4854d..a8fb4f6 100644 --- a/resources/lang/en/service.php +++ b/resources/lang/en/service.php @@ -75,7 +75,8 @@ return [ 'space_not' => 'Parking space does not exist', 'abnormal' => 'Abnormal resource usage', 'vacant_repair' => 'Vacant Maintenance', - 'occupied_repair' => 'Occupied Maintenance' + 'occupied_repair' => 'Occupied Maintenance', + 'warning' => 'Alarm' ], '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 23331a3..d6b8e00 100644 --- a/resources/lang/zh-CN/service.php +++ b/resources/lang/zh-CN/service.php @@ -75,7 +75,8 @@ return [ 'space_not' => '车位不存在', 'abnormal' => '异常占用', 'vacant_repair' => '空置维修', - 'occupied_repair' => '已占用维修' + 'occupied_repair' => '已占用维修', + 'warning' => '警报' ], 'parking_information' => [ 'not_default' => '未设置默认车位类型' diff --git a/resources/lang/zh-TW/service.php b/resources/lang/zh-TW/service.php index 6e147e4..7eb8f4a 100644 --- a/resources/lang/zh-TW/service.php +++ b/resources/lang/zh-TW/service.php @@ -75,7 +75,8 @@ return [ 'space_not' => '車位不存在', 'abnormal' => '異常佔用', 'vacant_repair' => '空置維修', - 'occupied_repair' => '已佔用維修' + 'occupied_repair' => '已佔用維修', + 'warning' => '警報' ], 'parking_information' => [ 'not_default' => '未設定默認車位類型'