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

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-03-02 16:30:19 +08:00
parent 1db6ff1c4e
commit 1155b23859
4 changed files with 21 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -894,7 +894,7 @@ resourceStatus: any;
const modalRef = this.modal.create({ const modalRef = this.modal.create({
nzTitle: '查看轨迹', nzTitle: '查看轨迹',
nzContent: OneCarOrderViewtrackComponent, nzContent: OneCarOrderViewtrackComponent,
nzWidth: 1200, nzWidth: '800px',
nzComponentParams: { nzComponentParams: {
i: item, i: item,
}, },

16
src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html
View File

@ -4,19 +4,19 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-02-22 13:53:29 * @Date : 2022-02-22 13:53:29
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-02-28 16:47:04 * @LastEditTime : 2022-03-02 16:10:44
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\view-track\\view-track.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\view-track\\view-track.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
<div nz-row> <div>
<nz-card nzTitle="轨迹信息" [nzExtra]="extraTemplate" > <nz-card nzTitle="轨迹信息" [nzExtra]="extraTemplate" >
<div nz-row> <div style="display: flex; flex: 1;">
<div nz-col [nzSpan]="12"> <div style=" flex: 1;">
<st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }"> <st #st [data]="addressItems" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
</st> </st>
</div> </div>
<div nz-col [nzSpan]="12" class="mapBox"> <div style="flex: 1;" >
<amap-path-simplifier [mapWidth]="'400px'" [MapList]="MapList"></amap-path-simplifier> <amap-path-simplifier [mapWidth]="'100%'" [MapList]="MapList"></amap-path-simplifier>
</div> </div>
</div> </div>
</nz-card> </nz-card>

10
src/app/routes/order-management/modal/vehicle/view-track/view-track.component.less
View File

@ -1,10 +1,10 @@
:host { :host {
::ng-deep { ::ng-deep {
.mapBox { // .mapBox {
iframe, canvas { // iframe, canvas {
width: 400px !important; // width: 400px !important;
} // }
} // }
} }

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

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-02-22 13:53:29 * @Date : 2022-02-22 13:53:29
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-03-02 15:58:57 * @LastEditTime : 2022-03-02 16:02:51
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\view-track\\view-track.component.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\view-track\\view-track.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -37,24 +37,8 @@ export class OneCarOrderViewtrackComponent implements OnInit {
trajectory = 'car'; trajectory = 'car';
addressItems: any[] = []; //打点地址数据组 addressItems: any[] = []; //打点地址数据组
logColumns: STColumn[] = [ logColumns: STColumn[] = [
{ title: '款项', index: 'expenseCodeLabel' }, { title: '时间', index: 'vinOutTime' },
{ title: '小计（元）', render: 'price' }, { title: '地点', index: 'cityName' },
{ title: '运输费（元）', render: 'price' },
{ title: '附加费（元）', render: 'surcharge' },
{ title: '支付时间', index: 'paymentTime' },
{
title: '支付状态',
className: 'text-center',
index: 'paymentStatus',
type: 'badge',
width: '120px',
badge: {
'1': { text: '待申请', color: 'warning' },
'2': { text: '已支付', color: 'success' },
'3': { text: '已拒绝', color: 'warning' },
'4': { text: '申请中', color: 'warning' }
}
}
]; ];
constructor( constructor(
private modalRef: NzModalRef, private modalRef: NzModalRef,
@ -81,11 +65,11 @@ export class OneCarOrderViewtrackComponent implements OnInit {
}); });
}); });
this.MapList = list; this.MapList = list;
this.addressItems = res.parkArray; // this.addressItems = res.parkArray;
if (this.addressItems && this.addressItems.length > 0) { this.addressItems = res.cityArray;
if(this.addressItems && this.addressItems.length > 0){
this.addressItems.forEach(item => { this.addressItems.forEach(item => {
item.parkBte = this.getLocalTime(item.parkBte); item.vinOutTime = this.getLocalTime(item.vinOutTime);
item.parkEte = this.getLocalTime(item.parkEte);
}); });
} }
} }