Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop
This commit is contained in:
@ -50,10 +50,10 @@ export class DatatableReportingvViewTrackComponent implements OnInit {
|
||||
});
|
||||
});
|
||||
this.mapList = list;
|
||||
this.addressItems = [...res.cityArray];
|
||||
this.addressItems = [...res.parkArray];
|
||||
if (this.addressItems && this.addressItems.length > 0) {
|
||||
this.addressItems.forEach(item => {
|
||||
item.vinOutTime = this.getLocalTime(item.vinOutTime);
|
||||
item.parkBte = this.getLocalTime(item.parkBte);
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -78,7 +78,7 @@ export class DatatableReportingvViewTrackComponent implements OnInit {
|
||||
this.addressItems = [...res.enclosureDataAppTrack];
|
||||
if (this.addressItems && this.addressItems.length > 0) {
|
||||
this.addressItems.forEach(item => {
|
||||
item.vinOutTime = item.vinOutTime ? this.getLocalTime(item.gtm) : '';
|
||||
item.parkBte = item.parkBte ? this.getLocalTime(item.parkBte) : '';
|
||||
item.cityName = item.appAdress;
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user