weiz
/
suyuan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: weiz:4767ae58c6ead37b99d77e8f814891afa113f874
Branches Tags
weiz:master
weiz:dev
weiz:preview
weiz:zhangwei
weiz:yaooo
..
compare: weiz:19363319cff52504a0037577ac4a2a94411b574a
Branches Tags
weiz:dev
weiz:master
weiz:preview
weiz:zhangwei
weiz:yaooo

No commits in common. "4767ae58c6ead37b99d77e8f814891afa113f874" and "19363319cff52504a0037577ac4a2a94411b574a" have entirely different histories.
4767ae58c6 ... 19363319cf

1 changed files with 2 additions and 0 deletions
Show Stats Expand all files Collapse all files

2
app/api/controller/ActionController.php
View File

@ -121,6 +121,8 @@
} }
$data = Action::where('plant_id',$params['plant_id'])->where('type',$params['type'])->order('create_time desc')->select()->each(function($item){ $data = Action::where('plant_id',$params['plant_id'])->where('type',$params['type'])->order('create_time desc')->select()->each(function($item){
$item['detail'] = json_decode($item['detail'],true); $item['detail'] = json_decode($item['detail'],true);
$item['create_time'] = date('Y-m-d H:i:s',$item['create_time']);
$item['update_time'] = date('Y-m-d H:i:s',$item['update_time']);
return $item; return $item;
})->toArray(); })->toArray();
return $this->success('请求成功',$data); return $this->success('请求成功',$data);