|
|
@@ -39,7 +39,7 @@ class Map extends Base_Controller{
|
|
|
L.latitude as latitude,
|
|
|
L.isfaulted,
|
|
|
L.netstatus as netStatus,
|
|
|
- L.logtime as updatetime,
|
|
|
+ L.updatetime as updatetime,
|
|
|
L.lampvoltage,
|
|
|
L.lampcurrent,
|
|
|
L.lamppower,
|
|
|
@@ -154,6 +154,7 @@ class Map extends Base_Controller{
|
|
|
$indexArr = array_keys($temp);
|
|
|
foreach ($data as $value) {
|
|
|
if (isset($value['updatetime']) && $value['updatetime'] == '0000-00-00 00:00:00') $value['updatetime'] = '';
|
|
|
+ $value['updatetime'] = !empty($value['updatetime']) ? date_change($value['updatetime'],0,DEF_TIMEZONE) : '';
|
|
|
if (isset($value['lampprotocoltype']) && $value['lampprotocoltype'] == 1) {
|
|
|
$indArr = [2=>'16',3=>'32',4=>'48',5=>'64'];
|
|
|
$value['chargestage'] = isset($indArr[intval($value['chargestage'])]) ? $indArr[intval($value['chargestage'])] : $value['chargestage'];
|
|
|
@@ -238,6 +239,7 @@ class Map extends Base_Controller{
|
|
|
// }
|
|
|
// $v['lampstatus'] = 1;
|
|
|
if (isset($v['updatetime']) && $v['updatetime'] == '0000-00-00 00:00:00') $v['updatetime'] = '';
|
|
|
+ $v['updatetime'] = !empty($v['updatetime']) ? date_change($v['updatetime'],0,DEF_TIMEZONE) : '';
|
|
|
if (isset($v['lampprotocoltype']) && $v['lampprotocoltype'] == 1) {
|
|
|
$indArr = [2=>'16',3=>'32',4=>'48',5=>'64'];
|
|
|
$v['chargestage'] = isset($indArr[intval($v['chargestage'])]) ? $indArr[intval($v['chargestage'])] : $v['chargestage'];
|
