|
...
|
...
|
@@ -300,7 +300,7 @@ class Equipment extends Backend |
|
|
|
*/
|
|
|
|
public function detail($ids = null)
|
|
|
|
{
|
|
|
|
$row = $this->model->get($ids);
|
|
|
|
$row = $this->model->get($ids,['admin']);
|
|
|
|
if (!$row) {
|
|
|
|
$this->error(__('No Results were found'));
|
|
|
|
}
|
|
...
|
...
|
@@ -346,9 +346,9 @@ class Equipment extends Backend |
|
|
|
// 时间处理
|
|
|
|
$list[$k]['time'] = substr($v['time'],0,4).'-'.substr($v['time'],4,2).'-'.substr($v['time'],6,2).' '.
|
|
|
|
substr($v['time'],8,2).':'.substr($v['time'],10,2).':'.substr($v['time'],12,2);
|
|
|
|
$list[$k]['nickname'] = $row->admin->nickname;
|
|
|
|
$list[$k]['nickname'] = $row['admin']['kehu_name'];
|
|
|
|
}
|
|
|
|
$result = array("total" => $total, "rows" => $list,'sql'=>$this->equipment_log_model->getLastSql());
|
|
|
|
$result = array("total" => $total, "rows" => $list);
|
|
|
|
|
|
|
|
return json($result);
|
|
|
|
}
|
...
|
...
|
|
