Merge branch 'master' of http://git.jieweizhineng.com/ushio/video_system into master

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

@@ -3668,7 +3668,7 @@ class CameraApiController extends BaseController
 
         $risk_list = DB::connection('mysql_fwe10')
             ->table('uf_xx_risk_assignment as t')
-            ->where('risk_level',2)
+//            ->where('risk_level',2)
             ->whereDate('create_time', $date)
             ->where('t.is_delete', 0)
             ->where('t.current_step','结束节点')
@@ -3688,15 +3688,34 @@ class CameraApiController extends BaseController
                     $risk = $risk_dict[$value->ID];
                     foreach ($risk as $k => $v) {
                         $index++;
-                        array_push($camera_list,[
-                            'area'=>$value->area_title,
-                            'unit'=>$value->title,
-                            'index'=>$index,
-                            'people_num'=>$v->work_num,
-                            'content'=>$v->risk_name,
-                            'work_location'=>$v->risk_location,
-                            'leader'=>$v->work_people,
-                        ]);
+                        $temp = [];
+                        $temp['area'] = $value->area_title;
+                        $temp['unit'] = $value->title;
+                        $temp['index'] = $index;
+                        $temp['people_num'] = $v->work_num;
+                        if ($v->risk_level == 0) {
+                            $temp['content'] = $v->risk_name."（高风险）";
+                        } else if ($v->risk_level == 1) {
+                            $temp['content'] = $v->risk_name."（中风险）";
+                        } else if ($v->risk_level == 2) {
+                            $temp['content'] = $v->risk_name."（低风险）";
+                        } else {
+                            $temp['content'] = $v->risk_name."（风险等级未知）";
+                        }
+                        $temp['work_location'] = $v->risk_location;
+                        $temp['leader'] = $v->work_people;
+
+                        array_push($camera_list,$temp);
+
+//                        array_push($camera_list,[
+//                            'area'=>$value->area_title,
+//                            'unit'=>$value->title,
+//                            'index'=>$index,
+//                            'people_num'=>$v->work_num,
+//                            'content'=>$v->risk_name,
+//                            'work_location'=>$v->risk_location,
+//                            'leader'=>$v->work_people,
+//                        ]);
 //                        $result['camera_list'][] = [
 //                            'area'=>$value->area_title,
 //                            'unit'=>$value->title,