|
@@ -1702,9 +1702,9 @@ class CameraApiController extends BaseController
|
|
$params = $request->all();
|
|
$params = $request->all();
|
|
|
|
|
|
if(isset($params['type'])){
|
|
if(isset($params['type'])){
|
|
- $type = $params['type'];
|
|
|
|
|
|
+ $type = [$params['type']];
|
|
}else{
|
|
}else{
|
|
- $type = 0;
|
|
|
|
|
|
+ $type = [0,1,2];
|
|
}
|
|
}
|
|
|
|
|
|
$list = [];
|
|
$list = [];
|
|
@@ -1733,7 +1733,7 @@ class CameraApiController extends BaseController
|
|
if(isset($params['id'])){
|
|
if(isset($params['id'])){
|
|
$risk = $risk->where('xx_coal_washery.id',$params['id']);
|
|
$risk = $risk->where('xx_coal_washery.id',$params['id']);
|
|
}
|
|
}
|
|
- $risk = $risk->where('risk_level',$type)->get();
|
|
|
|
|
|
+ $risk = $risk->whereIn('risk_level',$type)->get();
|
|
|
|
|
|
$risk_level = ['高风险','中风险','低风险'];
|
|
$risk_level = ['高风险','中风险','低风险'];
|
|
$risk_type = ['高空坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息'];
|
|
$risk_type = ['高空坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息'];
|