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

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

@@ -1938,7 +1938,7 @@ class CameraApiController extends BaseController
         $risk = $risk->whereIn('risk_level',$type)->get();
 
         $risk_level = ['高风险','中风险','低风险'];
-        $risk_type = ['高空坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息'];
+        $risk_type = ['高处坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息','物体打击','淹溺','灼烫','受限空间','坍塌','锅炉爆炸','其他爆炸','其他伤害'];
 
         $result['data'] = [];
         if(count($risk) > 0){
@@ -1971,7 +1971,7 @@ class CameraApiController extends BaseController
             return self::errorResponse(ApiEnum::STATUS_CODE_EMPTY);
         }
 
-        $risk_type = ['高空坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息'];
+        $risk_type = ['高处坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息','物体打击','淹溺','灼烫','受限空间','坍塌','锅炉爆炸','其他爆炸','其他伤害'];
         $risk_level = ['高风险','中风险','低风险'];
 
         $type = '';
@@ -2125,7 +2125,7 @@ class CameraApiController extends BaseController
 
     //首頁信息
     public function taskHome(Request $request){
-        $risk_type = ['高空坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息'];
+        $risk_type = ['高处坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息','物体打击','淹溺','灼烫','受限空间','坍塌','锅炉爆炸','其他爆炸','其他伤害'];
         $risk_level = ['高风险','中风险','低风险'];
 
         //高风险作业
@@ -2670,7 +2670,7 @@ class CameraApiController extends BaseController
         $risk = $risk->whereIn('risk_level',$type)->orderBy('uf_xx_risk_assignment.risk_level')->get();
 
         $risk_level = ['高风险','中风险','低风险'];
-        $risk_type = ['高处坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息'];
+        $risk_type = ['高处坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息','物体打击','淹溺','灼烫','受限空间','坍塌','锅炉爆炸','其他爆炸','其他伤害'];
 
         $result['data'] = [];
         if(count($risk) > 0){
@@ -2706,7 +2706,7 @@ class CameraApiController extends BaseController
         $result['move_camera'] = [];
         $result['zhifa_camera'] = [];
 
-        $risk_type = ['高处坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息'];
+        $risk_type = ['高处坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息','物体打击','淹溺','灼烫','受限空间','坍塌','锅炉爆炸','其他爆炸','其他伤害'];
         $risk_level = ['高风险','中风险','低风险'];
         $classes = ['早班','中班','夜班'];
 
@@ -2839,7 +2839,7 @@ class CameraApiController extends BaseController
 
     //首頁信息
     public function taskHomeV2(Request $request){
-        $risk_type = ['高处坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息'];
+        $risk_type = ['高处坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息','物体打击','淹溺','灼烫','受限空间','坍塌','锅炉爆炸','其他爆炸','其他伤害'];
         $risk_level = ['高风险','中风险','低风险'];
 
         //高风险作业