|
|
@@ -172,12 +172,15 @@ class ControlPanelController extends Controller
|
|
|
|
|
|
//data数据处理
|
|
|
$real_data = [];
|
|
|
- foreach ($machines as $v){
|
|
|
- $temp = [$v['name']];
|
|
|
- foreach ($data as $val){
|
|
|
- array_push($temp, array_column($val, $v['id'])? array_sum( array_column($val, $v['id'])) : 0);
|
|
|
+ foreach ($machines as $v) {
|
|
|
+ $temp = [];
|
|
|
+ foreach ($data as $val) {
|
|
|
+ array_push($temp, array_column($val, $v['id']) ? array_sum(array_column($val, $v['id'])) : 0);
|
|
|
+ }
|
|
|
+ if (array_sum($temp) > 0) {
|
|
|
+ array_unshift($temp, $v['name']);
|
|
|
+ array_push($real_data, $temp);
|
|
|
}
|
|
|
- array_push($real_data,$temp);
|
|
|
}
|
|
|
array_unshift($title, 'product');
|
|
|
array_unshift($real_data, $title);
|