|
@@ -1215,7 +1215,7 @@ class StatisticsController extends Controller
|
1215
|
1215
|
$columns = array();
|
1216
|
1216
|
$i_max = floor($day_count/$_day) > 20 ? 20 : floor($day_count/$_day);
|
1217
|
1217
|
for($i=0; $i<$i_max; $i++){
|
1218
|
|
- $columns[] = $i*$_day + 1;
|
|
1218
|
+ $columns[] = $i*$_day;
|
1219
|
1219
|
}
|
1220
|
1220
|
|
1221
|
1221
|
#数据整合
|
|
@@ -1233,7 +1233,7 @@ class StatisticsController extends Controller
|
1233
|
1233
|
$fan_add = DB::table('cust_day_detail')->where('dtime', $k)->where('is_del',0)->sum('fan_add');
|
1234
|
1234
|
$new_data[$k]['fan_add'] = $fan_add;
|
1235
|
1235
|
foreach($columns as $val){
|
1236
|
|
- $n = $val - 1;
|
|
1236
|
+ $n = $val;
|
1237
|
1237
|
$new_data[$k]['rate'][] = isset($v[$n]['rate']) ? $v[$n]['rate'].'%' : '';
|
1238
|
1238
|
}
|
1239
|
1239
|
}
|