fix bug

src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html

@@ -189,20 +189,25 @@
     </sv>
   </sv-container>
 </nz-card>
-
 <nz-card>
   <div nz-row>
-    <nz-card nzTitle="轨迹信息" style="width: 100%;" #distannce5>
-      <div nz-row > 
-        <div nz-col [nzSpan]='12'>
-    <!-- <st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
-    </st> -->
-  </div>
-  <div nz-col [nzSpan]='12'>
-     <amap-path-simplifier></amap-path-simplifier>
-   </div>
-   </div>
+    <nz-card nzTitle="轨迹信息" style="width: 100%" id="distannce5"  [nzExtra]="extraTemplate" #distannce5>
+      <div nz-row>
+        <div nz-col [nzSpan]="12">
+          <st [scroll]="{y: '500px'}" #st [data]="addressItems" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
+    </st>
+        </div>
+        <div nz-col [nzSpan]="12">
+          <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [MapList]="MapList"></amap-path-simplifier>
+        </div>
+      </div>
     </nz-card>
+    <ng-template #extraTemplate>
+      <nz-radio-group [(ngModel)]="trajectory">
+        <label nz-radio-button nzValue="car">车辆轨迹</label>
+        <label nz-radio-button nzValue="driver">司机轨迹</label>
+      </nz-radio-group>
+    </ng-template>
   </div>
 </nz-card>
 

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

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-02-21 19:46:47
+ * @LastEditTime : 2022-03-02 16:26:15
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.ts
@@ -10,6 +10,7 @@ import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { STColumn } from '@delon/abc/st';
 import { _HttpClient } from '@delon/theme';
+import format from 'date-fns/format';
 import { NzCardComponent } from 'ng-zorro-antd/card';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { NzModalService } from 'ng-zorro-antd/modal';
@@ -24,30 +25,19 @@ import { WaybillManagementServe } from '../../services/waybill-management.servic
 export class WaybillManagementVehicleDetailComponent implements OnInit {
 
   id = this.route.snapshot.params.id;
+  MapList: any[]=[];
   i: any;
   totalObj: any;
   attObj: any;
   isVisible = false;
-  logColumns: STColumn[] = [
-    { title: '款项', index: 'costName' },
-    { title: '运输费（元）', index: 'price', render: 'price' },
-    { title: '支付时间', render: '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' },
-      },
-    },
-  ];
   imges: any;
   unLoadingPlaceVOList: any = [];
+  logColumns: STColumn[] = [
+    { title: '时间', index: 'vinOutTime' },
+    { title: '地点', index: 'cityName' },
+  ];
+  trajectory = 'car';
+  addressItems: any[] = []; //打点地址数据组
 
   constructor(
     private route: ActivatedRoute,
@@ -60,7 +50,7 @@ export class WaybillManagementVehicleDetailComponent implements OnInit {
 
   ngOnInit(): void {
     this.initData()
-   
+    this.MapInit()
   }
   initData() {
     const params = {
@@ -140,4 +130,30 @@ goDistance(elf: NzCardComponent) {
    
   });
   }
+    // 获取轨迹
+    MapInit() {
+      this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => {
+        if (res) {
+          const points = res.trackArray;
+          let list :any[] = [];
+          points?.forEach((item: any) => {
+            list.push({
+              name: item.hgt,
+              lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))]
+            });
+          });
+          this.MapList = list;
+          this.addressItems = res.parkArray;
+          if(this.addressItems && this.addressItems.length > 0){
+            this.addressItems.forEach(item => {
+              item.vinOutTime = this.getLocalTime(item.vinOutTime);
+            });
+          }
+        }
+      });
+    }
+    
+  getLocalTime(time: any) {
+    return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss');
+  }
 }