|
@@ -2494,7 +2494,7 @@ class CameraApiController extends BaseController
|
|
if(isset($params['id'])){
|
|
if(isset($params['id'])){
|
|
$risk = $risk->where('uf_xx_coal_washery.id',$params['id']);
|
|
$risk = $risk->where('uf_xx_coal_washery.id',$params['id']);
|
|
}
|
|
}
|
|
- $risk = $risk->whereIn('risk_level',$type)->get();
|
|
|
|
|
|
+ $risk = $risk->whereIn('risk_level',$type)->orderBy('uf_xx_risk_assignment.risk_level')->get();
|
|
|
|
|
|
$risk_level = ['高风险','中风险','低风险'];
|
|
$risk_level = ['高风险','中风险','低风险'];
|
|
$risk_type = ['高空坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息'];
|
|
$risk_type = ['高空坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息'];
|