Selaa lähdekoodia

风险作业接口修改

任敬轩 10 kuukautta sitten
vanhempi
commit
8f6ede3b11
1 muutettua tiedostoa jossa 22 lisäystä ja 10 poistoa
  1. 22 10
      Modules/Camera/Http/Controllers/Api/CameraApiController.php

+ 22 - 10
Modules/Camera/Http/Controllers/Api/CameraApiController.php

@@ -1829,27 +1829,35 @@ class CameraApiController extends BaseController
 
             $result['detail'] = [
                 [
-                    'label' => '风险类型:',
-                    'value' => $risk_type_value
+                    'label' => '所属单位:',
+                    'value' => $risk[0]->unit
+                ],
+                [
+                    'label' => '区队名称:',
+                    'value' => $risk[0]->coal_washery
+                ],
+                [
+                    'label' => '班次:',
+                    'value' => $risk[0]->classes
+                ],
+                [
+                    'label' => '作业人数:',
+                    'value' => $risk[0]->work_num
                 ],
                 [
                     'label' => '风险等级:',
                     'value' => $risk_level[$risk[0]->risk_level]
                 ],
                 [
-                    'label' => '单位:',
-                    'value' => $risk[0]->coal_washery
+                    'label' => '风险类型:',
+                    'value' => $risk_type_value
                 ],
                 [
-                    'label' => '风险作业内容:',
+                    'label' => '作业内容:',
                     'value' => $risk[0]->risk_name
                 ],
                 [
-                    'label' => '人数:',
-                    'value' => $risk[0]->work_num
-                ],
-                [
-                    'label' => '地点:',
+                    'label' => '作业地点:',
                     'value' => $risk[0]->work_location
                 ],
                 [
@@ -1857,6 +1865,10 @@ class CameraApiController extends BaseController
                     'value' => $risk[0]->work_people
                 ],
                 [
+                    'label' => '进展情况:',
+                    'value' => $risk[0]->describe
+                ],
+                [
                     'label' => '固定摄像头:',
                     'value' => $camera_name
                 ],