|
|
@@ -308,7 +308,7 @@ class Lampcontrol extends Base_Controller {
|
|
|
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (array_key_exists('lampstatus',$value)) {
|
|
|
$value['lampstatus'] = !empty($value['lampstatus']) ? $value['lampstatus'] : "0";
|
|
|
}
|
|
|
@@ -3505,7 +3505,8 @@ class Lampcontrol extends Base_Controller {
|
|
|
|
|
|
$arr = [2=>'16',3=>'32',4=>'48',5=>'64'];
|
|
|
foreach ($res as &$v) {
|
|
|
- $v['updatetime'] = date_change($v["updatetime"],8,$timezone['value']);
|
|
|
+ // $v['updatetime'] = date_change($v["updatetime"],8,$timezone['value']);
|
|
|
+ $v['updatetime'] = set_timezone($v["updatetime"],$timezone['value']);
|
|
|
if ($lampData['protocoltype'] == 1 && $table == 'battery_info_log') {
|
|
|
$v['chargestage'] = isset($arr[intval($v['chargestage'])]) ? $arr[intval($v['chargestage'])] : $v['chargestage'];
|
|
|
}
|
