Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
wangshiming
2022-04-15 17:42:09 +08:00
parent 43bf5ea968 7e3783b479
commit 35a82362e8
20 changed files with 689 additions and 708 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
View File

@ -181,7 +181,7 @@ export class DatatableOrderReportingComponent implements OnInit {
},
}
},
putTime: {
recentlyPutTime: {
title: '上传时间',
type: 'string',
ui: {

36
src/app/routes/datatable/reporting/components/view-track/view-track.component.ts
View File

@ -4,20 +4,17 @@ import format from 'date-fns/format';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { OrderManagementService } from 'src/app/routes/order-management/services/order-management.service';
@Component({
selector: 'app-datatable-view-track',
templateUrl: './view-track.component.html',
templateUrl: './view-track.component.html'
})
export class DatatableReportingvViewTrackComponent implements OnInit {
mapList: any[] = []; //地图点位数据组
addressItems: any[] = []; //打点地址数据组
trajectory = "car";
mapList: any[] = []; //地图点位数据组
addressItems: any[] = []; //打点地址数据组
trajectory = 'car';
pois: any[] = [];
id = '';
constructor(public service: OrderManagementService, private modalRef: NzModalRef, public router: Router) {
}
constructor(public service: OrderManagementService, private modalRef: NzModalRef, public router: Router) {}
ngOnInit(): void {
if (this.trajectory === 'car') {
@ -27,11 +24,7 @@ export class DatatableReportingvViewTrackComponent implements OnInit {
}
}
selectTab(e: any) {
}
selectTab(e: any) {}
close(): void {
this.modalRef.destroy();
@ -58,8 +51,6 @@ export class DatatableReportingvViewTrackComponent implements OnInit {
}
}
});
}
// 获取司机轨迹
@ -75,12 +66,16 @@ export class DatatableReportingvViewTrackComponent implements OnInit {
});
});
this.mapList = list;
this.addressItems = [...res.enclosureDataAppTrack];
if (this.addressItems && this.addressItems.length > 0) {
this.addressItems.forEach(item => {
item.parkBte = item.parkBte ? this.getLocalTime(item.parkBte) : '';
item.cityName = item.appAdress;
const addressItems = [...res.tracks];
if (addressItems) {
addressItems.forEach(item => {
// item.parkBte = item.gtm;
item.parkBte = this.getLocalTime(item.gtm);
item.parkAdr = item.appAdress;
});
this.addressItems = [...addressItems];
} else {
this.addressItems = [];
}
}
});
@ -88,5 +83,4 @@ export class DatatableReportingvViewTrackComponent implements OnInit {
getLocalTime(time: any) {
return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss');
}
}