洗選首頁接口

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

@@ -1321,7 +1321,7 @@ class CameraApiController extends BaseController
                     $result = $result . '<optgroup label="' . $mine_list[$i]->title . '">';
 
                     for($j=0;$j<count($camera_list);$j++){
-                        $result = $result . '<option value="'.$camera_list[$j]->id.'">'.$camera_list[$j]->camera_name.'</option>';
+                        $result = $result . '<option value="'.$camera_list[$j]->id.'|'.$mine_list[$i]->id.'|'.$camera_list[$j]->camera_name.'|'.$camera_list[$j]->camera_type.'">'.$camera_list[$j]->camera_name.'</option>';
                     }
 
                     $result = $result . '</optgroup>';
@@ -1351,8 +1351,16 @@ class CameraApiController extends BaseController
 
     //首頁信息
     public function taskHome(Request $request){
-        $result = DB::connection('task_xixuan')->table('xx_area')->get();
+//        $result = DB::connection('task_xixuan')->table('xx_area')->get();
+        //高风险作业
+        $gaofengxian = DB::connection('task_xixuan')->table('xx_risk_assignment')
+            ->select('xx_risk_assignment.*','xx_coal_washery.name as coal_washery')
+            ->leftJoin('xx_coal_washery','xx_coal_washery.id','=','xx_risk_assignment.coal_washery_id')
+            ->where('risk_level',0)->get();
+        $result['gao_count'] = count($gaofengxian);
+        dd($gaofengxian);
 
-        return $result;
+
+        return self::successResponse($result);
     }
 }