作者 王智

xiugao

@@ -367,9 +367,9 @@ class Question extends Api @@ -367,9 +367,9 @@ class Question extends Api
367 $List = Db::name('sleep')->where('user_id', $UserId)->where('type', 1)->where($map)->select(); 367 $List = Db::name('sleep')->where('user_id', $UserId)->where('type', 1)->where($map)->select();
368 foreach ($List as $key => $value) { 368 foreach ($List as $key => $value) {
369 $DayArray[$k][$key]['date'] = date('Y-m-d', $value['createtime']); 369 $DayArray[$k][$key]['date'] = date('Y-m-d', $value['createtime']);
370 - $DayArray[$k][$key]['V'] = $value['v'];  
371 - $DayArray[$k][$key]['P'] = $value['p'];  
372 - $DayArray[$k][$key]['K'] = $value['k']; 370 + $DayArray[$k][$key]['V'] = $value['current_wind'];
  371 + $DayArray[$k][$key]['P'] = $value['current_fire'];
  372 + $DayArray[$k][$key]['K'] = $value['current_water'];
373 } 373 }
374 } 374 }
375 foreach ($DayArray as $k => $v) { 375 foreach ($DayArray as $k => $v) {
@@ -387,9 +387,9 @@ class Question extends Api @@ -387,9 +387,9 @@ class Question extends Api
387 $List = Db::name('sleep')->where('user_id', $UserId)->where('type', 1)->where($map)->select(); 387 $List = Db::name('sleep')->where('user_id', $UserId)->where('type', 1)->where($map)->select();
388 foreach ($List as $key => $value) { 388 foreach ($List as $key => $value) {
389 $MonthArray[$k][$key]['date'] = date('Y-m', $value['createtime']); 389 $MonthArray[$k][$key]['date'] = date('Y-m', $value['createtime']);
390 - $MonthArray[$k][$key]['V'] = $value['v'];  
391 - $MonthArray[$k][$key]['P'] = $value['p'];  
392 - $MonthArray[$k][$key]['K'] = $value['k']; 390 + $MonthArray[$k][$key]['V'] = $value['current_wind'];
  391 + $MonthArray[$k][$key]['P'] = $value['current_fire'];
  392 + $MonthArray[$k][$key]['K'] = $value['current_water'];
393 } 393 }
394 } 394 }
395 foreach ($MonthArray as $k => $v) { 395 foreach ($MonthArray as $k => $v) {