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

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

@@ -3041,7 +3041,7 @@ class CameraApiController extends BaseController
 
         $classes = ['早班','中班','夜班'];
         $risk_desc = ['高风险','中风险','低风险'];
-        $risk_describe_dict = [0=>"设备日常护理", 1=>"停产检修", 2=>"大中修", 3=>"计划性检修", 4=>"委外施工"];
+        $risk_describe_dict = [0=>"设备日常维护", 1=>"停产检修", 2=>"大中修", 3=>"计划性检修", 4=>"委外施工"];
         // 风险类型
         $risk_type = DB::connection('mysql_fwe10')
             ->table('field_option as t')
@@ -3352,12 +3352,12 @@ class CameraApiController extends BaseController
         }
 
         $risk_list = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment as risk')
-            ->select('risk.risk_type','risk.risk_level','risk.risk_name','risk.work_num','risk.risk_location','risk.work_people','coal.title as coal_title','area.title as area_title','area.id as area_id')
+            ->select('risk.risk_type','risk.risk_level','risk.risk_name','risk.work_num','risk.risk_location','risk.work_people','risk.move_camera','coal.title as coal_title','area.title as area_title','area.id as area_id')
             ->leftJoin('uf_xx_coal_washery as coal','coal.id','=','risk.coal_washery_id')
             ->leftJoin('uf_xx_area as area','area.id','=','coal.area_id')
             ->where('risk.is_delete',0)
             ->where('risk.delete_type',0)
-            ->whereDate('risk.create_time', $date)
+            ->whereDate('risk.fill_time', $date)
             // ->whereIn('risk.risk_level',[0,1])
             ->where('risk.current_step','结束节点')
             ->whereNotNull('risk.flow_id')
@@ -3382,17 +3382,31 @@ class CameraApiController extends BaseController
                         }
                         if($risk_list[$j]->risk_level != 2){
                             $index++;
-                            array_push($data,[
-                                'area'=>$risk_list[$j]->area_title,
-                                'index'=>$index,
-                                'risk_type'=>$risk_type[$i],
-                                'risk_level'=>$risk_list[$j]->risk_level,
-                                'unit'=>$risk_list[$j]->coal_title,
-                                'content'=>$risk_list[$j]->risk_name,
-                                'people_count'=>$risk_list[$j]->work_num,
-                                'work_location'=>$risk_list[$j]->risk_location,
-                                'leader'=>$risk_list[$j]->work_people
-                            ]);
+                            if ($risk_list[$j]->move_camera != null){
+                                array_push($data,[
+                                    'area'=>$risk_list[$j]->area_title,
+                                    'index'=>$index,
+                                    'risk_type'=>$risk_type[$i],
+                                    'risk_level'=>$risk_list[$j]->risk_level,
+                                    'unit'=>$risk_list[$j]->coal_title,
+                                    'content'=>$risk_list[$j]->risk_name ." [". $risk_list[$j]->move_camera."]",
+                                    'people_count'=>$risk_list[$j]->work_num,
+                                    'work_location'=>$risk_list[$j]->risk_location,
+                                    'leader'=>$risk_list[$j]->work_people
+                                ]);
+                            }else{
+                                array_push($data,[
+                                    'area'=>$risk_list[$j]->area_title,
+                                    'index'=>$index,
+                                    'risk_type'=>$risk_type[$i],
+                                    'risk_level'=>$risk_list[$j]->risk_level,
+                                    'unit'=>$risk_list[$j]->coal_title,
+                                    'content'=>$risk_list[$j]->risk_name,
+                                    'people_count'=>$risk_list[$j]->work_num,
+                                    'work_location'=>$risk_list[$j]->risk_location,
+                                    'leader'=>$risk_list[$j]->work_people
+                                ]);
+                            }
                         }
                         if($risk_list[$j]->risk_level == 2){
                             $nd_di++;
@@ -3433,17 +3447,31 @@ class CameraApiController extends BaseController
                         }
                         if($risk_list[$j]->risk_level != 2){
                             $index++;
-                            array_push($data,[
-                                'area'=>$risk_list[$j]->area_title,
-                                'index'=>$index,
-                                'risk_type'=>$risk_type[$i],
-                                'risk_level'=>$risk_list[$j]->risk_level,
-                                'unit'=>$risk_list[$j]->coal_title,
-                                'content'=>$risk_list[$j]->risk_name,
-                                'people_count'=>$risk_list[$j]->work_num,
-                                'work_location'=>$risk_list[$j]->risk_location,
-                                'leader'=>$risk_list[$j]->work_people
-                            ]);
+                            if ($risk_list[$j]->move_camera != null){
+                                array_push($data,[
+                                    'area'=>$risk_list[$j]->area_title,
+                                    'index'=>$index,
+                                    'risk_type'=>$risk_type[$i],
+                                    'risk_level'=>$risk_list[$j]->risk_level,
+                                    'unit'=>$risk_list[$j]->coal_title,
+                                    'content'=>$risk_list[$j]->risk_name ." [". $risk_list[$j]->move_camera."]",
+                                    'people_count'=>$risk_list[$j]->work_num,
+                                    'work_location'=>$risk_list[$j]->risk_location,
+                                    'leader'=>$risk_list[$j]->work_people
+                                ]);
+                            }else{
+                                array_push($data,[
+                                    'area'=>$risk_list[$j]->area_title,
+                                    'index'=>$index,
+                                    'risk_type'=>$risk_type[$i],
+                                    'risk_level'=>$risk_list[$j]->risk_level,
+                                    'unit'=>$risk_list[$j]->coal_title,
+                                    'content'=>$risk_list[$j]->risk_name,
+                                    'people_count'=>$risk_list[$j]->work_num,
+                                    'work_location'=>$risk_list[$j]->risk_location,
+                                    'leader'=>$risk_list[$j]->work_people
+                                ]);
+                            }
                         }
                         if($risk_list[$j]->risk_level == 2){
                             $tx_di++;
@@ -3466,7 +3494,32 @@ class CameraApiController extends BaseController
             }
         }
 
-        $result['type_list'] = $type_list;
+        $result_list = [];
+
+        if(isset($params['mark'])){
+            $mark = $params['mark'];
+            if ($mark == 0){
+                foreach ($type_list as $item) {
+                    if ($item["area"] == "宁东片区") {
+                        $result_list[] = $item;
+                    }
+                }
+                $result['type_list'] = $result_list;
+            }elseif ($mark == 1){
+                foreach ($type_list as $item) {
+                    if ($item["area"] == "太西片区") {
+                        $result_list[] = $item;
+                    }
+                }
+                $result['type_list'] = $result_list;
+            }else{
+                $result['type_list'] = $type_list;
+            }
+
+        }else{
+            $result['type_list'] = $type_list;
+        }
+
 
         if($nd_gao != 0){
             $nd_gao = '高风险作业'.$nd_gao.'项,';