|
|
@ -175,11 +175,11 @@ class Passcc extends Controller |
|
|
|
|
|
|
|
|
$libData = Pass::getBaoAnLibData(true); |
|
|
$libData = Pass::getBaoAnLibData(true); |
|
|
foreach ($libData as $libRow) { |
|
|
foreach ($libData as $libRow) { |
|
|
$returnData['day']['noRepeatInNum'] += $libRow['today']['incount']; |
|
|
$returnData['day']['noRepeatInNum'] += $libRow['data']['today']['incount']; |
|
|
$returnData['week']['noRepeatInNum'] += $libRow['today']['incount']; |
|
|
$returnData['week']['noRepeatInNum'] += $libRow['data']['today']['incount']; |
|
|
$returnData['month']['noRepeatInNum'] += $libRow['month']['incount']; |
|
|
$returnData['month']['noRepeatInNum'] += $libRow['data']['month']['incount']; |
|
|
$returnData['year']['noRepeatInNum'] += $libRow['year']['incount']; |
|
|
$returnData['year']['noRepeatInNum'] += $libRow['data']['year']['incount']; |
|
|
$returnData['sumYear']['noRepeatInNum'] += $libRow['year']['incount']; |
|
|
$returnData['sumYear']['noRepeatInNum'] += $libRow['data']['year']['incount']; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
foreach ($returnData as &$val) { |
|
|
foreach ($returnData as &$val) { |
|
|
@ -227,9 +227,9 @@ class Passcc extends Controller |
|
|
|
|
|
|
|
|
foreach ($libData as $libRow) { |
|
|
foreach ($libData as $libRow) { |
|
|
|
|
|
|
|
|
$libProportion = $libRow['today']['incount'] > 0 ? round($libRow['today']['incount']/$threshold,2) : 0; |
|
|
$libProportion = $libRow['data']['today']['incount'] > 0 ? round($libRow['data']['today']['incount']/$threshold,2) : 0; |
|
|
$returnData[] = [ |
|
|
$returnData[] = [ |
|
|
'allEnter' => $libRow['today']['incount'], |
|
|
'allEnter' => $libRow['data']['today']['incount'], |
|
|
'proportion' => ($libProportion * 100) . "%", |
|
|
'proportion' => ($libProportion * 100) . "%", |
|
|
'congestion' => Pass::getPassType($libProportion), |
|
|
'congestion' => Pass::getPassType($libProportion), |
|
|
'groupId' => $libRow['groupId'], |
|
|
'groupId' => $libRow['groupId'], |
|
|
|