风险类型显示

Modules/Camera/Http/Controllers/Api/CameraApiController.php

@@ -2978,7 +2978,7 @@ class CameraApiController extends BaseController
                 $res['di']++;
             }
 
-            // 洗煤厂类型统计
+            // 洗煤厂类型统计（委外、自营）
             $col_washery_id = $value->coal_washery_id;
             $col_washery_type = $coal_washery_dict[$col_washery_id]->obj_type;
             if($col_washery_type == 0) {
@@ -3013,15 +3013,19 @@ class CameraApiController extends BaseController
                 $risk_index = 0;
                 foreach ($coal_washery_risk_info_arr as $k => $v) {
                     $people += $v->work_num;
+                    $risk_info = '';
                     if ($v->risk_level == 0) {
                         $gao++;
+                        $risk_info = '('.$risk_desc[$v->risk_level].':'.$risk_type_dict[$v->risk_type].');';
                     } else if ($v->risk_level == 1) {
                         $zhong++;
+                        $risk_info = '('.$risk_desc[$v->risk_level].':'.$risk_type_dict[$v->risk_type].');';
                     } else {
                         $di++;
                     }
 
-                    $content .= ++$risk_index.".".$v->risk_name.'('.$risk_desc[$v->risk_level].');';
+                    $content .= ++$risk_index.".".$v->risk_name.$risk_info;
+
                     $place .= $risk_index.".".$v->risk_location;
                     $leader .= $risk_index.".".$v->work_people;