|
@@ -14,7 +14,7 @@ class CarIllegalDownController extends BaseController
|
|
public function getList(Request $request) {
|
|
public function getList(Request $request) {
|
|
|
|
|
|
$mineCode = isset($request->mine_code) ? $request->mine_code : null; // 矿分类
|
|
$mineCode = isset($request->mine_code) ? $request->mine_code : null; // 矿分类
|
|
- $stateTime = isset($request->date) ? $request->date : date("Y-m-d"); // 统计日期
|
|
|
|
|
|
+ $stateDate = isset($request->date) ? $request->date : date("Y-m-d"); // 统计日期
|
|
|
|
|
|
$listStartTime = isset($request->date) ? $request->date.' 00:00:00' : date("Y-m-d 00:00:00"); // 开始时间
|
|
$listStartTime = isset($request->date) ? $request->date.' 00:00:00' : date("Y-m-d 00:00:00"); // 开始时间
|
|
$listEndTime = isset($request->date) ? $request->date.' 23:59:59' : date("Y-m-d 23:59:59"); // 结束时间
|
|
$listEndTime = isset($request->date) ? $request->date.' 23:59:59' : date("Y-m-d 23:59:59"); // 结束时间
|
|
@@ -62,7 +62,7 @@ class CarIllegalDownController extends BaseController
|
|
];
|
|
];
|
|
|
|
|
|
// 一周内超速趋势
|
|
// 一周内超速趋势
|
|
- for($i = 1; $i < 7; $i++) {
|
|
|
|
|
|
+ for($i = 0; $i < 7; $i++) {
|
|
|
|
|
|
$stime = date("Y-m-d 00:00:00", strtotime("-".$i." day"));
|
|
$stime = date("Y-m-d 00:00:00", strtotime("-".$i." day"));
|
|
// $etime = date("Y-m-d 23:59:59", strtotime("-".$i." day"));
|
|
// $etime = date("Y-m-d 23:59:59", strtotime("-".$i." day"));
|
|
@@ -79,8 +79,8 @@ class CarIllegalDownController extends BaseController
|
|
];
|
|
];
|
|
|
|
|
|
// 违章数据列表
|
|
// 违章数据列表
|
|
- $dataList = $this->getCarIllegalList($listStartTime, $listEndTime, $mineCode, $page, $perPage);
|
|
|
|
- $dataTotal = $this->getCarIllegalCount($stateTime, $mineCode);
|
|
|
|
|
|
+ $dataList = $this->getCarIllegalList($stateDate, $listEndTime, $mineCode, $page, $perPage);
|
|
|
|
+ $dataTotal = $this->getCarIllegalCount($stateDate, $mineCode);
|
|
$data = [
|
|
$data = [
|
|
"total"=>$dataTotal,
|
|
"total"=>$dataTotal,
|
|
"speeding_con"=>$res1,
|
|
"speeding_con"=>$res1,
|