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:
潘晓云
2022-04-13 10:16:24 +08:00
parent 28648fa672 3d576487d4
commit 13d7859a2d
9 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,10 +50,10 @@ export class DatatableReportingvViewTrackComponent implements OnInit {
}); });
}); });
this.mapList = list; this.mapList = list;
this.addressItems = [...res.cityArray]; this.addressItems = [...res.parkArray];
if (this.addressItems && this.addressItems.length > 0) { if (this.addressItems && this.addressItems.length > 0) {
this.addressItems.forEach(item => { 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]; this.addressItems = [...res.enclosureDataAppTrack];
if (this.addressItems && this.addressItems.length > 0) { if (this.addressItems && this.addressItems.length > 0) {
this.addressItems.forEach(item => { this.addressItems.forEach(item => {
item.vinOutTime = item.vinOutTime ? this.getLocalTime(item.gtm) : ''; item.parkBte = item.parkBte ? this.getLocalTime(item.parkBte) : '';
item.cityName = item.appAdress; item.cityName = item.appAdress;
}); });
} }

8
src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
View File

@ -76,8 +76,8 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
schema: SFSchema = {}; schema: SFSchema = {};
ui: SFUISchema = {}; ui: SFUISchema = {};
logColumns2: STColumn[] = [ logColumns2: STColumn[] = [
{ title: '时间', index: 'vinOutTime' }, { title: '时间', index: 'parkBte' },
{ title: '地点', index: 'cityName' } { title: '地点', index: 'parkAdr' }
]; ];
logColumns: STColumn[] = [ logColumns: STColumn[] = [
{ title: '款项', index: 'expenseCodeLabel' }, { title: '款项', index: 'expenseCodeLabel' },
@ -973,10 +973,10 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
}); });
}); });
this.mapList = list; this.mapList = list;
this.addressItems = res?.cityArray; this.addressItems = res?.parkArray;
if (this.addressItems && this.addressItems.length > 0) { if (this.addressItems && this.addressItems.length > 0) {
this.addressItems.forEach(item => { this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.vinOutTime); item.parkBte = this.getLocalTime(item.parkBte);
}); });
} }
} }

12
src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
View File

@ -38,8 +38,8 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
modalTitle: string = ''; modalTitle: string = '';
isVisible = false; isVisible = false;
logColumns2: STColumn[] = [ logColumns2: STColumn[] = [
{ title: '时间', index: 'vinOutTime' }, { title: '时间', index: 'parkBte' },
{ title: '地点', index: 'cityName' } { title: '地点', index: 'parkAdr' }
]; ];
logColumns: STColumn[] = [ logColumns: STColumn[] = [
{ title: '款项', index: 'expenseCodeLabel' }, { title: '款项', index: 'expenseCodeLabel' },
@ -90,14 +90,14 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
markerLabel: '装', markerLabel: '装',
color: 'blue', color: 'blue',
position: [res.startingPoint.longitude, res.startingPoint.latitude], position: [res.startingPoint.longitude, res.startingPoint.latitude],
title: '发货地：' + res.startingPoint.detailedAddress, title: `发货地：${res.startingPoint.province}${res.startingPoint.city}${res.startingPoint.area}${res.startingPoint.detailedAddress}`,
time: '计划出发时间：' + res.loadPlanTime time: '计划出发时间：' + res.loadPlanTime
}, },
{ {
markerLabel: '卸', markerLabel: '卸',
color: 'red', color: 'red',
position: [res.endPoint.longitude, res.endPoint.latitude], position: [res.endPoint.longitude, res.endPoint.latitude],
title: '卸货地地：' + res.endPoint.detailedAddress, title: `卸货地：${res.endPoint.province}${res.endPoint.city}${res.endPoint.area}${res.endPoint.detailedAddress}`,
time: '计划卸货时间：' + res.unloadPlanTime time: '计划卸货时间：' + res.unloadPlanTime
} }
]; ];
@ -178,10 +178,10 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
}); });
}); });
this.mapList = list; this.mapList = list;
this.addressItems = res.cityArray; this.addressItems = res.parkArray;
if (this.addressItems && this.addressItems.length > 0) { if (this.addressItems && this.addressItems.length > 0) {
this.addressItems.forEach(item => { this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.vinOutTime); item.parkBte = this.getLocalTime(item.parkBte);
}); });
} }
} }

8
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
View File

@ -90,8 +90,8 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
mapList: any[] = []; //地图点位数据组 mapList: any[] = []; //地图点位数据组
addressItems: any[] = []; //打点地址数据组 addressItems: any[] = []; //打点地址数据组
logColumns2: STColumn[] = [ logColumns2: STColumn[] = [
{ title: '时间', index: 'vinOutTime' }, { title: '时间', index: 'parkBte' },
{ title: '地点', index: 'cityName' } { title: '地点', index: 'parkAdr' }
]; ];
constructor( constructor(
private route: ActivatedRoute, private route: ActivatedRoute,
@ -928,10 +928,10 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}); });
}); });
this.mapList = list; this.mapList = list;
this.addressItems = res?.cityArray; this.addressItems = res?.parkArray;
if (this.addressItems && this.addressItems.length > 0) { if (this.addressItems && this.addressItems.length > 0) {
this.addressItems.forEach(item => { this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.vinOutTime); item.parkBte = this.getLocalTime(item.parkBte);
}); });
} }
} }

14
src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
View File

@ -43,8 +43,8 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
approvalLsit: any; approvalLsit: any;
isVisible = false; isVisible = false;
logColumns2: STColumn[] = [ logColumns2: STColumn[] = [
{ title: '时间', index: 'vinOutTime' }, { title: '时间', index: 'parkBte' },
{ title: '地点', index: 'cityName' } { title: '地点', index: 'parkAdr' }
]; ];
logColumns: STColumn[] = [ logColumns: STColumn[] = [
{ title: '款项', index: 'expenseCodeLabel' }, { title: '款项', index: 'expenseCodeLabel' },
@ -80,14 +80,14 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
markerLabel: '装', markerLabel: '装',
color: 'blue', color: 'blue',
position: [res.startingPoint.longitude, res.startingPoint.latitude], position: [res.startingPoint.longitude, res.startingPoint.latitude],
title: '发货地：' + res.startingPoint.detailedAddress, title: `发货地：${res.startingPoint.province}${res.startingPoint.city}${res.startingPoint.area}${res.startingPoint.detailedAddress}`,
time: '计划出发时间：' +res.loadPlanTime time: '计划出发时间：' +res.loadPlanTime
}, },
{ {
markerLabel: '卸', markerLabel: '卸',
color: 'red', color: 'red',
position: [res.endPoint.longitude, res.endPoint.latitude], position: [res.endPoint.longitude, res.endPoint.latitude],
title: '卸货地地：' + res.endPoint.detailedAddress, title: `卸货地：${res.endPoint.province}${res.endPoint.city}${res.endPoint.area}${res.endPoint.detailedAddress}`,
time: '计划卸货时间：' + res.unloadPlanTime time: '计划卸货时间：' + res.unloadPlanTime
} }
]; ];
@ -165,16 +165,16 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
let list: any[] = []; let list: any[] = [];
points?.forEach((item: any) => { points?.forEach((item: any) => {
list.push({ list.push({
name: `${item.spd}km/h`, name: `${item.spd}`,
lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))], lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))],
time: item.gtm time: item.gtm
}); });
}); });
this.mapList = list; this.mapList = list;
this.addressItems = res.cityArray; this.addressItems = res.parkArray;
if (this.addressItems && this.addressItems.length > 0) { if (this.addressItems && this.addressItems.length > 0) {
this.addressItems.forEach(item => { this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.vinOutTime); item.parkBte = this.getLocalTime(item.parkBte);
}); });
} }
} }

8
src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts
View File

@ -38,8 +38,8 @@ export class OneCarOrderViewtrackComponent implements OnInit {
mapList:any[] = []; //地图点位数据组 mapList:any[] = []; //地图点位数据组
addressItems: any[] = []; //打点地址数据组 addressItems: any[] = []; //打点地址数据组
logColumns2: STColumn[] = [ logColumns2: STColumn[] = [
{ title: '时间', index: 'vinOutTime' }, { title: '时间', index: 'parkBte' },
{ title: '地点', index: 'cityName' }, { title: '地点', index: 'parkAdr' },
]; ];
constructor( constructor(
private modalRef: NzModalRef, private modalRef: NzModalRef,
@ -70,10 +70,10 @@ export class OneCarOrderViewtrackComponent implements OnInit {
}); });
}); });
this.mapList = list; this.mapList = list;
this.addressItems = res.cityArray; this.addressItems = res.parkAdr;
if(this.addressItems && this.addressItems.length > 0){ if(this.addressItems && this.addressItems.length > 0){
this.addressItems.forEach(item => { this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.vinOutTime); item.parkBte = this.getLocalTime(item.parkBte);
}); });
} }
} }

8
src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts
View File

@ -39,8 +39,8 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
modalTitle:string = ''; modalTitle:string = '';
unLoadingPlaceVOList: any = []; unLoadingPlaceVOList: any = [];
logColumns2: STColumn[] = [ logColumns2: STColumn[] = [
{ title: '时间', index: 'vinOutTime' }, { title: '时间', index: 'parkBte' },
{ title: '地点', index: 'cityName' }, { title: '地点', index: 'parkAdr' },
]; ];
logColumns: STColumn[] = [ logColumns: STColumn[] = [
{ title: '款项', index: 'costCodeLabel' }, { title: '款项', index: 'costCodeLabel' },
@ -172,10 +172,10 @@ sureArrive(item: any) {
}); });
}); });
this.mapList = list; this.mapList = list;
this.addressItems = res.cityArray; this.addressItems = res.parkArray;
if(this.addressItems && this.addressItems.length > 0){ if(this.addressItems && this.addressItems.length > 0){
this.addressItems.forEach(item => { this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.vinOutTime); item.parkBte = this.getLocalTime(item.parkBte);
}); });
} }
} }

4
src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts
View File

@ -165,10 +165,10 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro
}); });
}); });
this.mapList = list; this.mapList = list;
this.addressItems = res.cityArray; this.addressItems = res.parkArray;
if (this.addressItems && this.addressItems.length > 0) { if (this.addressItems && this.addressItems.length > 0) {
this.addressItems.forEach(item => { this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.vinOutTime); item.parkBte = this.getLocalTime(item.parkBte);
}); });
} }
} }

2
src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts
View File

@ -175,7 +175,7 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges, OnDestroy
position: info.pathData.points[info.pointIndex].lnglat, position: info.pathData.points[info.pointIndex].lnglat,
content: ` content: `
<label style="font-weight: bold;">${result.regeocode.formattedAddress}<label/><br/> <label style="font-weight: bold;">${result.regeocode.formattedAddress}<label/><br/>
<label style="font-weight: 400;">车速: ${info.pathData.points[info.pointIndex].name}<label/><br/> <label style="font-weight: 400;">车速: ${info.pathData.points[info.pointIndex].name}km/h<label/><br/>
<label style="font-weight: 400;">东经: ${info.pathData.points[info.pointIndex].lnglat?.[0]}, 北纬：${ <label style="font-weight: 400;">东经: ${info.pathData.points[info.pointIndex].lnglat?.[0]}, 北纬：${
info.pathData.points[info.pointIndex].lnglat?.[1] info.pathData.points[info.pointIndex].lnglat?.[1]
}<label/><br/> }<label/><br/>