|
@@ -2944,6 +2944,7 @@ class CameraApiController extends BaseController
|
|
|
"table_list" => [],
|
|
|
];
|
|
|
$risk_zhong_con = [];
|
|
|
+ $risk_gao_con = [];
|
|
|
$coal_washery_risk_list = [];
|
|
|
|
|
|
foreach ($risk_list as $key=>$value) {
|
|
@@ -2952,6 +2953,11 @@ class CameraApiController extends BaseController
|
|
|
$risk_type = $risk_type_dict[$value->risk_type] ?? 2;
|
|
|
if($risk_level == 0) {
|
|
|
$res['gao']++;
|
|
|
+ if (!isset($risk_gao_con[$risk_type])) {
|
|
|
+ $risk_gao_con[$risk_type] = 1;
|
|
|
+ } else {
|
|
|
+ $risk_gao_con[$risk_type] ++;
|
|
|
+ };
|
|
|
} else if($risk_level == 1) {
|
|
|
$res['zhong']++;
|
|
|
if (!isset($risk_zhong_con[$risk_type])) {
|
|
@@ -3036,6 +3042,17 @@ class CameraApiController extends BaseController
|
|
|
}
|
|
|
$res['table_list'] = $coal_list;
|
|
|
|
|
|
+ if ($res['gao'] > 0) {
|
|
|
+ $risk_gao_info = '(其中:';
|
|
|
+ foreach ($risk_gao_con as $key => $value) {
|
|
|
+ $risk_gao_info .= $key.$value.'项,';
|
|
|
+ }
|
|
|
+ $risk_gao_info = substr($risk_gao_info, 0, -3);
|
|
|
+ $risk_gao_info .= ');';
|
|
|
+ } else {
|
|
|
+ $risk_gao_info = ";";
|
|
|
+ }
|
|
|
+
|
|
|
if ($res['zhong'] > 0) {
|
|
|
$risk_zhong_info = '(其中:';
|
|
|
foreach ($risk_zhong_con as $key => $value) {
|
|
@@ -3047,7 +3064,7 @@ class CameraApiController extends BaseController
|
|
|
$risk_zhong_info = ";";
|
|
|
}
|
|
|
|
|
|
- $res['risk_info'] = "总作业项:".$res['num']."项;高风险:".$res['gao']."项;中风险:".$res['zhong']."项".$risk_zhong_info."低风险:".$res['di']."项。";
|
|
|
+ $res['risk_info'] = "总作业项:".$res['num']."项;高风险:".$res['gao']."项".$risk_gao_info."中风险:".$res['zhong']."项".$risk_zhong_info."低风险:".$res['di']."项。";
|
|
|
|
|
|
return $res;
|
|
|
}
|