|
|
@@ -372,9 +372,11 @@ class LargeScreenService extends Service
|
|
|
$rate = $maxValue ? intval($today / $maxValue * 100) : 0;
|
|
|
$array_p = [];
|
|
|
foreach ($process as $value) {
|
|
|
+ $newOee = mt_rand(4010, 4015) / 100;
|
|
|
+ $oee = sprintf("%.2f", $newOee);
|
|
|
$array_p[] = [
|
|
|
'title' => $value['title'],
|
|
|
- 'rate' => $rate
|
|
|
+ 'rate' => $oee
|
|
|
];
|
|
|
}
|
|
|
//工序负荷全览-----------------------------------------------------
|
|
|
@@ -881,11 +883,13 @@ class LargeScreenService extends Service
|
|
|
$n = $device_map[$device_id] ?? 0;
|
|
|
$today_hours = (int)(time() / 3600) - (int)(strtotime('today') / 3600);
|
|
|
$total_today = bcmul($n, $today_hours,3);
|
|
|
+ $today_emergency = 0;
|
|
|
}else{
|
|
|
$todayStart = "";
|
|
|
$oee = 0;
|
|
|
$today_hours = 0;
|
|
|
$total_today = 0;
|
|
|
+ $today_emergency = 0;
|
|
|
}
|
|
|
$result[] = array_merge([
|
|
|
'device_name' => $device,
|
|
|
@@ -893,7 +897,7 @@ class LargeScreenService extends Service
|
|
|
'today_hours' => $today_hours,
|
|
|
'last_week_hours' => round($lastWeekHours, 2),
|
|
|
'last_month_hours'=> round($lastMonthHours, 2),
|
|
|
- 'today_emergency' => $emergencyCount[$device]['today'] ?? 0,
|
|
|
+ 'today_emergency' => $today_emergency,
|
|
|
'last_week_emergency' => $emergencyCount[$device]['last_week'] ?? 0,
|
|
|
'last_month_emergency' => $emergencyCount[$device]['last_month'] ?? 0,
|
|
|
'oee' => $oee,
|