fix bug

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-28 14:42:03
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-16 15:42:18
+ * @LastEditTime : 2022-02-22 10:10:59
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -199,17 +199,23 @@
 
 <nz-card>
   <div nz-row>
-    <nz-card nzTitle="轨迹信息" style="width: 100%" id="distannce5" #distannce5>
+    <nz-card nzTitle="轨迹信息" style="width: 100%" id="distannce5"  [nzExtra]="extraTemplate" #distannce5>
       <div nz-row>
         <div nz-col [nzSpan]="12">
-          <!-- <st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
+          <st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
-    </st> -->
+    </st>
         </div>
         <div nz-col [nzSpan]="12">
           <amap-path-simplifier [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/order-management/components/vehicle-detail/vehicle-detail.component.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-28 14:42:03
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-16 16:37:16
+ * @LastEditTime : 2022-02-22 10:13:22
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -14,6 +14,7 @@ import { STColumn } from '@delon/abc/st';
 import { NzCardComponent } from 'ng-zorro-antd/card';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { NzModalService } from 'ng-zorro-antd/modal';
+import format from 'date-fns/format';
 import { OrderManagementService } from '../../services/order-management.service';
 @Component({
   selector: 'app-supply-management-vehicle-detail',
@@ -54,6 +55,8 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
       }
     }
   ];
+  trajectory = "car"
+  addressItems:any[] = [];  //打点地址数据组
 
   constructor(
     private route: ActivatedRoute,
@@ -126,20 +129,47 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
       // elf['elementRef'].nativeElement.className = 'target-fix'
     }
   }
-  MapInit() {
+  // MapInit() {
-    this.service.request('/api/sdc/billShipper/getTrajectoryByBillId', { id: this.id }).subscribe(res => {
+  //   this.service.request('/api/sdc/billShipper/getTrajectoryByBillId', { id: this.id }).subscribe(res => {
-      if (res?.trackArray) {
+  //     if (res?.trackArray) {
-        const points = res?.trackArray;
+  //       const points = res?.trackArray;
-        const list: any[] = [];
+  //       const list: any[] = [];
-        points.forEach((item: any) => {
+  //       points.forEach((item: any) => {
-          list.push({
+  //         list.push({
-            name: item?.hgt,
+  //           name: item?.hgt,
-            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))]
+  //         });
+  //       });
+  //       console.log(list);
+  //       this.MapList = list;
+  //     }
+  //   });
+  // }
+  
+  // 获取轨迹
+  MapInit(){
+    this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => {
+      if (res) {
+        const points = res.trackArray;
+        points?.forEach((item: any) => {
+          this.MapList.push({
+            name: item.hgt,
+            lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))]
           });
         });
-        console.log(list);
+        this.addressItems = res.parkArray;
-        this.MapList = list;
+        if(this.addressItems && this.addressItems.length > 0){
+          this.addressItems.forEach(item => {
+            item.parkBte = this.getLocalTime(item.parkBte);
+            item.parkEte = this.getLocalTime(item.parkEte);
+          });
+        }
       }
     });
   }
+  
+  getLocalTime(time:any) {     
+    return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss');      
+ }  
+
 }

src/app/routes/order-management/services/order-management.service.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-03 15:31:52
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-25 15:26:23
+ * @LastEditTime : 2022-02-22 10:12:14
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -158,6 +158,8 @@ export class OrderManagementService extends ShipperBaseService {
   }
   // 获取数据字典
   $api_getDictValue = `/api/mdc/pbc/dictItems/getDictValue`;
+  // 获取轨迹
+  $api_get_getTrajectory = `/api/sdc/billShipper/getTrajectoryByBillId`;
   /**
    * 根据企业ID，获取企业历史网络货运人
    * @returns