|
@@ -559,7 +559,7 @@ class ScreenController extends BaseController
|
|
|
public function work_order(Request $request){
|
|
public function work_order(Request $request){
|
|
|
// 获取当前时间戳
|
|
// 获取当前时间戳
|
|
|
$currentTimestamp = time();
|
|
$currentTimestamp = time();
|
|
|
- $startOfDay = strtotime(date('Y-m-d 00:00:00', $currentTimestamp));
|
|
|
|
|
|
|
+ $startOfDay = strtotime(date('Y-m-1 00:00:00', $currentTimestamp));
|
|
|
$endOfDay = strtotime(date('Y-m-d 23:59:59', $currentTimestamp));
|
|
$endOfDay = strtotime(date('Y-m-d 23:59:59', $currentTimestamp));
|
|
|
|
|
|
|
|
$result = DispatchSub::where('del_time',0)
|
|
$result = DispatchSub::where('del_time',0)
|
|
@@ -592,7 +592,7 @@ class ScreenController extends BaseController
|
|
|
* @return array
|
|
* @return array
|
|
|
*/
|
|
*/
|
|
|
public function nu_work_order(Request $request){
|
|
public function nu_work_order(Request $request){
|
|
|
- $startOfDay = strtotime(date('Y-m-1 00:00:00', strtotime("-20days")));
|
|
|
|
|
|
|
+ $startOfDay = strtotime(date('Y-m-1 00:00:00'));
|
|
|
|
|
|
|
|
$result = DispatchSub::where('del_time',0)
|
|
$result = DispatchSub::where('del_time',0)
|
|
|
->where('crt_time',">=", $startOfDay)
|
|
->where('crt_time',">=", $startOfDay)
|
|
@@ -681,7 +681,7 @@ class ScreenController extends BaseController
|
|
|
$fault[$value['device_name']] = 1;
|
|
$fault[$value['device_name']] = 1;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- }dd($finished_num);
|
|
|
|
|
|
|
+ }
|
|
|
foreach ($device as $key => $value){
|
|
foreach ($device as $key => $value){
|
|
|
$finished = $finished_num[$key] ?? 0;
|
|
$finished = $finished_num[$key] ?? 0;
|
|
|
//运行次数
|
|
//运行次数
|
cqp