|
@@ -1712,10 +1712,10 @@ class Lampcontrol extends Base_Controller {
|
|
|
$i = 1;
|
|
|
if (empty($this->version)) {
|
|
|
$name = '太阳能';
|
|
|
- $title = array('序号','电压(V)','电流(A)','功率(W)','当天充电最大功率(WH)','当天充电时长(HH:MM)','更新时间');
|
|
|
+ $title = array('序号','电压(V)','电流(A)','功率(W)','当天充电最大功率(WH)','更新时间');
|
|
|
}else{
|
|
|
$name = 'Solar';
|
|
|
- $title = array('Number','Voltage(V)','Current(A)','Power(W)','Maximum Power Charged on the Day(W)','day Charging time(HH:MM)','Update time');
|
|
|
+ $title = array('Number','Voltage(V)','Current(A)','Power(W)','Maximum Power Charged on the Day(W)','Update time');
|
|
|
}
|
|
|
foreach ($lampInfoList as $k=>$l) {
|
|
|
$temp[$k][] = $i;
|
|
@@ -1723,11 +1723,11 @@ class Lampcontrol extends Base_Controller {
|
|
|
$temp[$k][] = $l['solarcurrent'];
|
|
|
$temp[$k][] = $l['solarpower'];
|
|
|
$temp[$k][] = $l['daychargemaxpow'];
|
|
|
- $h = floor($l['daydischargemincurrent'] / 3600);
|
|
|
- $h = $h < 10 ? '0'.$h : $h;
|
|
|
- $m = ceil($l['daydischargemincurrent'] % 3600 / 60);
|
|
|
- $m = $m < 10 ? '0'.$m : $m;
|
|
|
- $temp[$k][] = $h.':'.$m;
|
|
|
+ // $h = floor($l['daydischargemincurrent'] / 3600);
|
|
|
+ // $h = $h < 10 ? '0'.$h : $h;
|
|
|
+ // $m = ceil($l['daydischargemincurrent'] % 3600 / 60);
|
|
|
+ // $m = $m < 10 ? '0'.$m : $m;
|
|
|
+ // $temp[$k][] = $h.':'.$m;
|
|
|
$temp[$k][] = date_change($l["updatetime"],8,$timezone['value']);
|
|
|
$i ++;
|
|
|
}
|