wzh пре 4 година
родитељ
комит
a1c1102d48
1 измењених фајлова са 3 додато и 2 уклоњено
  1. 3 2
      api/application/controllers/Lampcontrol.php

+ 3 - 2
api/application/controllers/Lampcontrol.php

@@ -1668,7 +1668,7 @@ class Lampcontrol extends Base_Controller {
                 }
                 $battstatusArr = array(0=>'空闲',1=>'放电',2=>'充电',3=>'一边充电一边放电',''=>'未知状态');
                 $unknown = '未知状态';
-                $title = array('序号','电池状态','充电阶段','电池电压(V)','当天最低电压(V)','当天最高电压(V)','电池温度(℃)','当天电池最低温度(℃)','当天电池最高温度(℃)','更新时间');
+                $title = array('序号','电池状态','充电阶段','电池电压(V)','当天最低电压(V)','当天最高电压(V)','电池温度(℃)','当天电池最低温度(℃)','当天电池最高温度(℃)','过放次数','更新时间');
             }else{
                 $name = 'Battery';
                 if ($lampData['protocoltype'] == 2) {
@@ -1678,7 +1678,7 @@ class Lampcontrol extends Base_Controller {
                 }
                 $battstatusArr = array(0=>'Free',1=>'Discharge',2=>'Charge',3=>'Discharge while charging',''=>'Unknown state');
                 $unknown = 'Unknown state';
-                $title = array('Serial number','Battery status','Charging stage','Battery voltage(V)','The lowest voltage of the day(V)','Maximum Voltage of the Day(V)','Battery temperature(℃)','Battery minimum temperature for the day(℃)','The highest temperature of the battery on that day(℃)','Update time');
+                $title = array('Serial number','Battery status','Charging stage','Battery voltage(V)','Minimum voltage(V)','Highest voltage(V)','surface temperature(℃)','minimum temperature(℃)','highest temperature(℃)','Over Discharge times','Update time');
             }
             $indexArr = [2=>'16',3=>'32',4=>'48',5=>'64'];
             foreach ($lampInfoList as $k=>$l) {
@@ -1694,6 +1694,7 @@ class Lampcontrol extends Base_Controller {
                 $temp[$k][] = $l['batttemper'];
                 $temp[$k][] = $l['daybattmintemper'];
                 $temp[$k][] = $l['daybattmaxtemper'];
+                $temp[$k][] = $l['overtimes'];
                 $temp[$k][] = date_change($l["updatetime"],8,$timezone['value']);
                 $i ++;
             }