后台功能修改

Modules/Admin/Http/Controllers/BaseController.php

@@ -182,7 +182,6 @@ class BaseController extends Controller
      */
     public function from(FromAuxiliary $fromObj)
     {
-
         $data['path']       = '/admin/' . $fromObj->path;
         $data['fromTitle']  = $fromObj->title;
         $data['columns']    = $fromObj->columns;

Modules/Camera/Http/Controllers/CameraController.php

@@ -136,6 +136,21 @@ class CameraController extends BaseController
 
         foreach ($camera_list as $key => $val) {
             $camera_list[$key]->parent_title = MineList::where('id', explode('|', $val->degree)[0])->value('title');
+
+            $degree_list = explode('|',$camera_list[$key]->degree);
+            $title = '';
+            if(count($degree_list) == 1){
+                for($i=0;$i<count($degree_list);$i++){
+                    $title = $title.DB::table('mine_list')->where('id',$degree_list[$i])->get()[0]->title.'/';
+                }
+            }
+            if(count($degree_list) > 1){
+                for($i=1;$i<count($degree_list);$i++){
+                    $title = $title.DB::table('mine_list')->where('id',$degree_list[$i])->get()[0]->title.'/';
+                }
+            }
+            $camera_list[$key]->title = substr($title,0,strlen($title)-1);
+
             //判断是否是海康视频服务器
             if($val->camera_source == CameraEnum::CAMERA_SOURCE_2){
                 $is_hak = DB::table('mine_list_ext')->where('mine_id',explode('|', $val->degree)[0])->value('is_hak');
@@ -287,6 +302,21 @@ class CameraController extends BaseController
 
         foreach ($camera_list as $key => $val) {
             $camera_list[$key]->parent_title = MineList::where('id', explode('|', $val->degree)[0])->value('title');
+
+            $degree_list = explode('|',$camera_list[$key]->degree);
+            $title = '';
+            if(count($degree_list) == 1){
+                for($i=0;$i<count($degree_list);$i++){
+                    $title = $title.DB::table('mine_list')->where('id',$degree_list[$i])->get()[0]->title.'/';
+                }
+            }
+            if(count($degree_list) > 1){
+                for($i=1;$i<count($degree_list);$i++){
+                    $title = $title.DB::table('mine_list')->where('id',$degree_list[$i])->get()[0]->title.'/';
+                }
+            }
+            $camera_list[$key]->title = substr($title,0,strlen($title)-1);
+
             //判断是否是海康视频服务器
             if($val->camera_source == CameraEnum::CAMERA_SOURCE_2){
                 $is_hak = DB::table('mine_list_ext')->where('mine_id',explode('|', $val->degree)[0])->value('is_hak');
@@ -353,6 +383,21 @@ class CameraController extends BaseController
 
         foreach ($camera_list as $key => $val) {
             $camera_list[$key]->parent_title = MineList::where('id', explode('|', $val->degree)[0])->value('title');
+
+            $degree_list = explode('|',$camera_list[$key]->degree);
+            $title = '';
+            if(count($degree_list) == 1){
+                for($i=0;$i<count($degree_list);$i++){
+                    $title = $title.DB::table('mine_list')->where('id',$degree_list[$i])->get()[0]->title.'/';
+                }
+            }
+            if(count($degree_list) > 1){
+                for($i=1;$i<count($degree_list);$i++){
+                    $title = $title.DB::table('mine_list')->where('id',$degree_list[$i])->get()[0]->title.'/';
+                }
+            }
+            $camera_list[$key]->title = substr($title,0,strlen($title)-1);
+
             //判断是否是海康视频服务器
             if($val->camera_source == CameraEnum::CAMERA_SOURCE_2){
                 $is_hak = DB::table('mine_list_ext')->where('mine_id',explode('|', $val->degree)[0])->value('is_hak');
@@ -653,6 +698,7 @@ class CameraController extends BaseController
 
         $formObj = new FromAuxiliary('camera/list/edit', $camera_list);
         $formObj->tree_select('mine_id', '所属区域', $titleList);
+        $formObj->input('parent_id', '摄像头名称',$parent_id);
         $formObj->input('camera_name', '摄像头名称');
         $formObj->select('camera_type', '摄像头类型', CameraEnum::CAMERA_TYPE_EXCHANGE);
         $formObj->select('camera_source', '摄像头来源', CameraEnum::CAMERA_SOURCE_EXCHANGE);