Prechádzať zdrojové kódy

全流程巡检接口

root 6 dní pred
rodič
commit
db0142b227

+ 7 - 1
Modules/Admin/Http/Controllers/Api/ApiController.php

@@ -122,11 +122,17 @@ class ApiController extends BaseController
                         }else{
                             $color = 'red';
                         }
+                        
+                        if (!$people) {
+                            $zw = '';
+                        } else {
+                            $zw = $people->zw;
+                        }
 
                         array_push($list,[
                             'depart' => $depart[$i],
                             'name'   => $people_name[0],
-                            'zw'     => $people->zw,
+                            'zw'     => $zw,
                             'ys'  => $color
                         ]);
                     }

+ 2 - 2
app/Http/Controllers/TestsController.php

@@ -40,7 +40,7 @@ class TestsController {
         // $this->camera_list();
 
         //根据区域编号获取下一级区域列表
-//        $this->child_mine_list();
+        $this->child_mine_list();
 
         //区域列表接口测试
 //        $this->mine_list();
@@ -60,7 +60,7 @@ class TestsController {
 
     //根据区域编号获取下一级区域列表
     public function child_mine_list(){
-        $result = MineServices::getChildArea(968, 4275 ,CameraEnum::REQUEST_TYPE_LOCAL);
+        $result = MineServices::getChildArea(968, 5842 ,CameraEnum::REQUEST_TYPE_LOCAL);
         dd($result);
     }