|
|
@ -99,7 +99,8 @@ class OccupancyRateController extends BaseController |
|
|
'name', |
|
|
'name', |
|
|
'id' |
|
|
'id' |
|
|
); |
|
|
); |
|
|
foreach ($list as &$item) { |
|
|
$colorArr = $this->service->colorArr; |
|
|
|
|
|
foreach ($list as $index => &$item) { |
|
|
$time = $item['time']; |
|
|
$time = $item['time']; |
|
|
$time_type = $item['time_type']; |
|
|
$time_type = $item['time_type']; |
|
|
if ($time_type == 1) { |
|
|
if ($time_type == 1) { |
|
|
@ -122,6 +123,7 @@ class OccupancyRateController extends BaseController |
|
|
unset($space_type_list[$key]['space_type_id']); |
|
|
unset($space_type_list[$key]['space_type_id']); |
|
|
} |
|
|
} |
|
|
$item['space_type_list'] = $space_type_list; |
|
|
$item['space_type_list'] = $space_type_list; |
|
|
|
|
|
$item['color'] = $colorArr[$index]; |
|
|
unset($item['time_type'], $item['floor_id']); |
|
|
unset($item['time_type'], $item['floor_id']); |
|
|
} |
|
|
} |
|
|
return $this->responseService->success($list); |
|
|
return $this->responseService->success($list); |
|
|
|