|
@@ -1749,7 +1749,11 @@ class CameraApiController extends BaseController
|
|
$result['data'][$i]['work_people'] = $risk[$i]->work_people;
|
|
$result['data'][$i]['work_people'] = $risk[$i]->work_people;
|
|
$result['data'][$i]['work_num'] = $risk[$i]->work_num;
|
|
$result['data'][$i]['work_num'] = $risk[$i]->work_num;
|
|
$result['data'][$i]['risk_level'] = $risk_level[$risk[$i]->risk_level];
|
|
$result['data'][$i]['risk_level'] = $risk_level[$risk[$i]->risk_level];
|
|
- $result['data'][$i]['risk_type'] = $risk_type[$risk[$i]->risk_type];
|
|
|
|
|
|
+ if($risk[$i]->risk_type != null){
|
|
|
|
+ $result['data'][$i]['risk_type'] = $risk_type[$risk[$i]->risk_type];
|
|
|
|
+ }else{
|
|
|
|
+ $result['data'][$i]['risk_type'] = '无';
|
|
|
|
+ }
|
|
$result['data'][$i]['coal_washery'] = $risk[$i]->coal_washery;
|
|
$result['data'][$i]['coal_washery'] = $risk[$i]->coal_washery;
|
|
}
|
|
}
|
|
}
|
|
}
|