diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 1e14877d..69ef767a 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -894,7 +894,7 @@ resourceStatus: any; const modalRef = this.modal.create({ nzTitle: '查看轨迹', nzContent: OneCarOrderViewtrackComponent, - nzWidth: 1200, + nzWidth: '800px', nzComponentParams: { i: item, }, diff --git a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html index 474bc951..22d42094 100644 --- a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html +++ b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html @@ -4,19 +4,19 @@ * @Author : Shiming * @Date : 2022-02-22 13:53:29 * @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 * Copyright (C) 2022 huzhenhong. All rights reserved. --> -
+
-
-
- - +
+
+ +
-
- +
+
diff --git a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.less b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.less index 14049ec8..ae775710 100644 --- a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.less +++ b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.less @@ -1,10 +1,10 @@ :host { ::ng-deep { - .mapBox { - iframe, canvas { - width: 400px !important; - } - } + // .mapBox { + // iframe, canvas { + // width: 400px !important; + // } + // } } 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 4916bc04..5bb83e8a 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-22 13:53:29 * @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 * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -37,24 +37,8 @@ export class OneCarOrderViewtrackComponent implements OnInit { trajectory = 'car'; addressItems: any[] = []; //打点地址数据组 logColumns: STColumn[] = [ - { title: '款项', index: 'expenseCodeLabel' }, - { title: '小计(元)', render: 'price' }, - { 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' } - } - } + { title: '时间', index: 'vinOutTime' }, + { title: '地点', index: 'cityName' }, ]; constructor( private modalRef: NzModalRef, @@ -81,11 +65,11 @@ export class OneCarOrderViewtrackComponent implements OnInit { }); }); this.MapList = list; - this.addressItems = res.parkArray; - if (this.addressItems && this.addressItems.length > 0) { + // this.addressItems = res.parkArray; + this.addressItems = res.cityArray; + if(this.addressItems && this.addressItems.length > 0){ this.addressItems.forEach(item => { - item.parkBte = this.getLocalTime(item.parkBte); - item.parkEte = this.getLocalTime(item.parkEte); + item.vinOutTime = this.getLocalTime(item.vinOutTime); }); } }