|
@@ -75,15 +75,28 @@ class LogController extends BaseController
|
|
|
}
|
|
|
|
|
|
$log_list = $log_list->paginate(50);
|
|
|
-
|
|
|
if(count($log_list)>0){
|
|
|
for($i=0;$i<count($log_list);$i++){
|
|
|
$degree = explode('|',$log_list[$i]->degree);
|
|
|
$mine = DB::table('mine_list')->where('id',$degree[0])->get();
|
|
|
$log_list[$i]->mine_name = $mine[0]->title;
|
|
|
+ $log_list[$i]->camera_id = $log_list[$i]->camera_id."(".$degree[0].")";
|
|
|
+
|
|
|
+ $title = '';
|
|
|
+
|
|
|
+ if(count($degree) == 1){
|
|
|
+ for($j=0;$j<count($degree);$j++){
|
|
|
+ $title = $title.DB::table('mine_list')->where('id',$degree[$j])->get()[0]->title.'/';
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(count($degree) > 1){
|
|
|
+ for($j=1;$j<count($degree);$j++){
|
|
|
+ $title = $title.DB::table('mine_list')->where('id',$degree[$j])->get()[0]->title.'/';
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $log_list[$i]->title = substr($title,0,strlen($title)-1);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
//权限内矿区列表
|
|
|
$mine_list = DB::table('mine_list')->whereIn('id',$mine_array)->get()->toArray();
|
|
|
$mine_search = [];
|