Browse Source

fix:公管公司风险作业报表workList

Xu·LinPeng 1 day ago
parent
commit
0a5a165950
1 changed files with 2 additions and 4 deletions
  1. 2 4
      Modules/Admin/Http/Controllers/Api/ReportController.php

+ 2 - 4
Modules/Admin/Http/Controllers/Api/ReportController.php

@@ -17,7 +17,7 @@ class ReportController extends BaseController
         return self::successResponse($result);
     }
 
-    public function workList(Request $request): string
+    public function workList(Request $request): array
     {
 
         $date = $request->query('date', date('Y-m-d'));
@@ -73,9 +73,7 @@ class ReportController extends BaseController
             }
         }
 
-        $result = "简况:检修作业".$total."项。其中:高度".$total_gao."项、中度".$total_zhong."项、低度".$total_di."项;
-        委外作业共".$total_ww."项(其中:高度".$ww_gao."项、中度".$ww_zhong."项、低度".$ww_di."项);\n
-        特级动火作业".$type_num[0]."处,一级动火作业".$type_num[1]."处,有限空间作业".$type_num[2]."处,高处作业".$type_num[3]."处。";
+        $result["risk_info"] = "简况:检修作业".$total."项。其中:高度".$total_gao."项、中度".$total_zhong."项、低度".$total_di."项;委外作业共".$total_ww."项(其中:高度".$ww_gao."项、中度".$ww_zhong."项、低度".$ww_di."项);\n特级动火作业".$type_num[0]."处,一级动火作业".$type_num[1]."处,有限空间作业".$type_num[2]."处,高处作业".$type_num[3]."处。";
 
         return $result;