diff --git a/src/app/routes/datatable/reporting/components/view-track/view-track.component.ts b/src/app/routes/datatable/reporting/components/view-track/view-track.component.ts index 1cb10886..5b136434 100644 --- a/src/app/routes/datatable/reporting/components/view-track/view-track.component.ts +++ b/src/app/routes/datatable/reporting/components/view-track/view-track.component.ts @@ -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; }); } diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts index 1810bbca..c2831b9f 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts @@ -76,8 +76,8 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit { schema: SFSchema = {}; ui: SFUISchema = {}; logColumns2: STColumn[] = [ - { title: '时间', index: 'vinOutTime' }, - { title: '地点', index: 'cityName' } + { title: '时间', index: 'parkBte' }, + { title: '地点', index: 'parkAdr' } ]; logColumns: STColumn[] = [ { title: '款项', index: 'expenseCodeLabel' }, @@ -973,10 +973,10 @@ export class OrderManagementBulkDetailChangeComponent 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); }); } } diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index a03bad84..e17ffb5e 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts @@ -38,8 +38,8 @@ export class OrderManagementBulkeDetailComponent implements OnInit { modalTitle: string = ''; isVisible = false; logColumns2: STColumn[] = [ - { title: '时间', index: 'vinOutTime' }, - { title: '地点', index: 'cityName' } + { title: '时间', index: 'parkBte' }, + { title: '地点', index: 'parkAdr' } ]; logColumns: STColumn[] = [ { title: '款项', index: 'expenseCodeLabel' }, @@ -90,14 +90,14 @@ export class OrderManagementBulkeDetailComponent implements OnInit { markerLabel: '装', color: 'blue', 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 }, { markerLabel: '卸', color: 'red', 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 } ]; @@ -178,10 +178,10 @@ export class OrderManagementBulkeDetailComponent 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); }); } } diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts index ab686a33..3c75bab5 100644 --- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts @@ -90,8 +90,8 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { mapList: any[] = []; //地图点位数据组 addressItems: any[] = []; //打点地址数据组 logColumns2: STColumn[] = [ - { title: '时间', index: 'vinOutTime' }, - { title: '地点', index: 'cityName' } + { title: '时间', index: 'parkBte' }, + { title: '地点', index: 'parkAdr' } ]; constructor( private route: ActivatedRoute, @@ -928,10 +928,10 @@ export class OrderManagementVehicleDetailChangeComponent 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); }); } } diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts index ed73f379..3d5c822c 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts @@ -43,8 +43,8 @@ export class OrderManagementVehicleDetailComponent implements OnInit { approvalLsit: any; isVisible = false; logColumns2: STColumn[] = [ - { title: '时间', index: 'vinOutTime' }, - { title: '地点', index: 'cityName' } + { title: '时间', index: 'parkBte' }, + { title: '地点', index: 'parkAdr' } ]; logColumns: STColumn[] = [ { title: '款项', index: 'expenseCodeLabel' }, @@ -80,14 +80,14 @@ export class OrderManagementVehicleDetailComponent implements OnInit { markerLabel: '装', color: 'blue', 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 }, { markerLabel: '卸', color: 'red', 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 } ]; @@ -165,16 +165,16 @@ export class OrderManagementVehicleDetailComponent implements OnInit { let list: any[] = []; points?.forEach((item: any) => { 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))], time: item.gtm }); }); 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); }); } } diff --git a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts index a4c5b6a2..976896dc 100644 --- a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts +++ b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts @@ -38,8 +38,8 @@ export class OneCarOrderViewtrackComponent implements OnInit { mapList:any[] = []; //地图点位数据组 addressItems: any[] = []; //打点地址数据组 logColumns2: STColumn[] = [ - { title: '时间', index: 'vinOutTime' }, - { title: '地点', index: 'cityName' }, + { title: '时间', index: 'parkBte' }, + { title: '地点', index: 'parkAdr' }, ]; constructor( private modalRef: NzModalRef, @@ -70,10 +70,10 @@ export class OneCarOrderViewtrackComponent implements OnInit { }); }); this.mapList = list; - this.addressItems = res.cityArray; + this.addressItems = res.parkAdr; if(this.addressItems && this.addressItems.length > 0){ this.addressItems.forEach(item => { - item.vinOutTime = this.getLocalTime(item.vinOutTime); + item.parkBte = this.getLocalTime(item.parkBte); }); } } diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts index f6cf87c7..37877333 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts @@ -39,8 +39,8 @@ export class WaybillManagementBulkeDetailComponent implements OnInit { modalTitle:string = ''; unLoadingPlaceVOList: any = []; logColumns2: STColumn[] = [ - { title: '时间', index: 'vinOutTime' }, - { title: '地点', index: 'cityName' }, + { title: '时间', index: 'parkBte' }, + { title: '地点', index: 'parkAdr' }, ]; logColumns: STColumn[] = [ { title: '款项', index: 'costCodeLabel' }, @@ -172,10 +172,10 @@ sureArrive(item: any) { }); }); 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); }); } } diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts index 5a266b42..1b96e1f4 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts @@ -165,10 +165,10 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro }); }); 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); }); } } diff --git a/src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts b/src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts index 4bf4469b..4bda83dd 100644 --- a/src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts +++ b/src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts @@ -175,7 +175,7 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges, OnDestroy position: info.pathData.points[info.pointIndex].lnglat, content: `