|
|
@@ -435,8 +435,7 @@ class ScreenController extends BaseController
|
|
|
|
|
|
public function systemDataList(Request $request){
|
|
|
$data = $request->all();
|
|
|
- $model = SystemL::where('del_time',0)
|
|
|
- ->select('*')
|
|
|
+ $model = SystemL::select('*')
|
|
|
->orderBy('time','desc');
|
|
|
|
|
|
if(! empty($data['device_name'])) $model->where('device_name', 'LIKE', '%'.$data['device_name'].'%');
|
|
|
@@ -447,12 +446,24 @@ class ScreenController extends BaseController
|
|
|
$model->where('time','<=',$data['time'][1]);
|
|
|
}
|
|
|
|
|
|
- $list = $this->limit($model,'',$data);
|
|
|
+ $list = $this->limitC($model,'',$data);
|
|
|
|
|
|
foreach ($list['data'] as $key => $value){
|
|
|
- $list['data'][$key]['time'] = $value['time'] ? date('Y-m-d', $value['time']) : '';
|
|
|
+ $list['data'][$key]['time'] = $value['time'] ? date('Y-m-d H:i:s', $value['time']) : '';
|
|
|
}
|
|
|
|
|
|
+ return $this->json_return(200,'',$list);
|
|
|
+ }
|
|
|
+
|
|
|
+ //分页共用
|
|
|
+ public function limitC($db, $columns, $request)
|
|
|
+ {
|
|
|
+ $per_page = $request['page_size'] ?? 20;
|
|
|
+ $page = $request['page_index'] ?? 1;
|
|
|
+ $return = $db->paginate($per_page, $columns, 'page', $page)->toArray();
|
|
|
+
|
|
|
+ $data['total'] = $return['total'];
|
|
|
+ $data['data'] = $return['data'];
|
|
|
return $data;
|
|
|
}
|
|
|
|
cqp