fix bug

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

@@ -296,20 +296,20 @@
     <sv label="是否回单">
       {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }}
     </sv>
-    <sv label="回单类型">
+    <sv label="回单类型" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
       {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}
     </sv>
-    <sv label="联系人"> {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} </sv>
+    <sv label="联系人" *ngIf="i?.supplementaryInformationVO?.stateReceipt"> {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} </sv>
-    <sv label="所在地区">
+    <sv label="所在地区" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
       {{ i?.supplementaryInformationVO?.area }}
     </sv>
-    <sv label="详细地址">
+    <sv label="详细地址" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
       {{ i?.supplementaryInformationVO?.address }}
     </sv>
   
   </sv-container>
   <sv-container col="1" class="mt-md">
-    <sv label="回单凭证">
+    <sv label="回单凭证" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
       <nz-upload
       class="avatar-uploader"
       [nzAction]="service.$api_upload_url"

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

@@ -182,19 +182,19 @@
     <sv label="是否回单">
       {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }}
     </sv>
-    <sv label="回单类型">
+    <sv label="回单类型" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
       {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}
     </sv>
-    <sv label="联系人"> {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} </sv>
+    <sv label="联系人" *ngIf="i?.supplementaryInformationVO?.stateReceipt"> {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} </sv>
-    <sv label="所在地区">
+    <sv label="所在地区" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
       {{ i?.supplementaryInformationVO?.area }}
     </sv>
-    <sv label="详细地址">
+    <sv label="详细地址" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
       {{ i?.supplementaryInformationVO?.address }}
     </sv>
   </sv-container>
   <sv-container col="1" class="mt-md">
-    <sv label="回单凭证">
+    <sv label="回单凭证" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
       <app-imagelist [imgList]="i?.receiptFilePath"></app-imagelist>
     </sv>
     <sv label="备注">

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-03-09 13:38:21
+ * @LastEditTime : 2022-03-09 10:33:44
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -48,8 +48,8 @@
         <sv label="调度员">{{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }} </sv>
         <sv label="外部订单号">{{ i?.externalBillCode }}</sv>
         <sv label="货源编号">{{ i?.resourceCode }} </sv>
-        <sv label="运单号">{{ i?.wayBillCode }}</sv>
+        <sv label="运单号">{{ i?.wayBillId }}</sv>
-        <sv label="承诺付款天数">{{ i?.paymentDays }}</sv>
+        <sv label="承诺付款天数">{{ i?.goodsResource?.dispatchName }}</sv>
       </div>
 
       <nz-tabset style="margin-top: 15px">
@@ -203,7 +203,7 @@
           </st>
         </div>
         <div nz-col [nzSpan]="12">
-          <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [MapList]="mapList" [pois]="pois"></amap-path-simplifier>
+          <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [MapList]="mapList"></amap-path-simplifier>
         </div>
       </div>
     </nz-card>

src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html

@@ -155,19 +155,19 @@
       <sv label="是否回单">
         {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }}
       </sv>
-      <sv label="回单类型">
+      <sv label="回单类型" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
         {{ i?.supplementaryInformationVO?.receiptTypeLabel }}
       </sv>
-      <sv label="联系人">
+      <sv label="联系人" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
         {{ i?.supplementaryInformationVO?.receiptUserName ? i?.supplementaryInformationVO?.receiptUserName + '/' : '' }}  {{ i?.supplementaryInformationVO?.phon }}
       </sv>
-      <sv label="所在地区">
+      <sv label="所在地区" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
         {{ i?.supplementaryInformationVO?.area }}
       </sv>
-      <sv label="详细地址">
+      <sv label="详细地址" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
         {{ i?.supplementaryInformationVO?.address }}
       </sv>
-      <sv label="备注">
+      <sv label="备注" >
         {{ i?.supplementaryInformationVO?.remarks }}
       </sv>
     </sv-container>

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

@@ -199,13 +199,13 @@
       <sv label="是否回单">
         {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }}
       </sv>
-      <sv label="回单类型">
+      <sv label="回单类型" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
         {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}
       </sv>
-      <sv label="所在地区">
+      <sv label="所在地区" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
         {{ i?.supplementaryInformationVO?.area }}
       </sv>
-      <sv label="详细地址">
+      <sv label="详细地址" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
         {{ i?.supplementaryInformationVO?.address }}
       </sv>
       <sv label="备注">

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-02-28 11:50:00
+ * @LastEditTime : 2022-03-10 15:58:18
  * @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\\bulk-detail\\bulk-detail.component.html
@@ -183,22 +183,22 @@
     <sv label="是否回单">
       {{i?.receiptType == 1 ?'是':'否'}}
     </sv>
-    <sv label="回单类型">
+    <sv label="回单类型" *ngIf="i?.receiptType == 1">
       {{i?.receiptTypeLabel}}
     </sv>
-    <sv label="联系人">
+    <sv label="联系人" *ngIf="i?.receiptType == 1">
       {{i?.receiptUser}} / {{i?.receiptUserPhone}}
     </sv>
-    <sv label="所在地区">
+    <sv label="所在地区" *ngIf="i?.receiptType == 1">
       {{i?.receiptPlace}}
     </sv>
-    <sv label="详细地址">
+    <sv label="详细地址" *ngIf="i?.receiptType == 1">
       {{i?.receiptAddress}}
     </sv>
   
   </sv-container>
   <sv-container col="1" class="mt-md">
-    <sv label="回单凭证">
+    <sv label="回单凭证" *ngIf="i?.receiptType == 1">
       <app-imagelist [imgList]="[i?.receiptFilePath]"></app-imagelist>
     </sv>
     <sv label="备注">
@@ -209,19 +209,19 @@
 
 <nz-card>
   <div nz-row>
-    <nz-card nzTitle="轨迹信息" style="width: 100%" id="distannce5"  [nzExtra]="extraTemplate" #distannce5>
+    <nz-card nzTitle="轨迹信息" style="width: 100%" [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 [scroll]="{y: '500px'}" #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">
-    </st> 
+          </st>
         </div>
         <div nz-col [nzSpan]="12">
-          <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [MapList]="MapList"></amap-path-simplifier>
+          <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [MapList]="mapList"></amap-path-simplifier>
         </div>
       </div>
     </nz-card>
     <ng-template #extraTemplate>
-      <nz-radio-group [(ngModel)]="trajectory">
+      <nz-radio-group [(ngModel)]="trajectory" (ngModelChange)="trajectoryChange($event)">
         <label nz-radio-button nzValue="car">车辆轨迹</label>
         <label nz-radio-button nzValue="driver">司机轨迹</label>
       </nz-radio-group>

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

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-03-02 16:24:32
+ * @LastEditTime : 2022-03-10 16:00:17
  * @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\\bulk-detail\\bulk-detail.component.ts
@@ -30,14 +30,35 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
   attObj: any;
   isVisible = false;
   MapList: any[]=[];
+  trajectory = 'car';
+  mapList:any[] = [];  //地图点位数据组
+  addressItems:any[] = [];  //打点地址数据组
   imges: any;
   unLoadingPlaceVOList: any = [];
-  logColumns: STColumn[] = [
+  logColumns2: STColumn[] = [
     { title: '时间', index: 'vinOutTime' },
     { title: '地点', index: 'cityName' },
   ];
-  trajectory = 'car';
+  logColumns: STColumn[] = [
-  addressItems: any[] = []; //打点地址数据组
+    { title: '款项', index: 'costCodeLabel' },
+    { 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' }
+      }
+    }
+  ];
   constructor(
     private route: ActivatedRoute,
     private msgSrv: NzMessageService,
@@ -50,7 +71,7 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
 
   ngOnInit(): void {
     this.initData()
-    this.MapInit()
+    this.getDriverTrajectory()
   }
   initData() {
     const params = {
@@ -137,8 +158,8 @@ sureArrive(item: any) {
     this.initData()
 });
 }
-  // 获取轨迹
+  // 获取车辆轨迹
-  MapInit() {
+  getTrajectory(){
     this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => {
       if (res) {
         const points = res.trackArray;
@@ -149,8 +170,8 @@ sureArrive(item: any) {
             lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))]
           });
         });
-        this.MapList = list;
+        this.mapList = list;
-        this.addressItems = res.parkArray;
+        this.addressItems = res.cityArray;
         if(this.addressItems && this.addressItems.length > 0){
           this.addressItems.forEach(item => {
             item.vinOutTime = this.getLocalTime(item.vinOutTime);
@@ -160,6 +181,36 @@ sureArrive(item: any) {
     });
   }
 
+   // 获取司机轨迹
+   getDriverTrajectory(){
+    this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.id }).subscribe(res => {
+      if (res) {
+        const points = res.tracks;
+        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.enclosureDataAppTrack];
+        if(this.addressItems && this.addressItems.length > 0){
+          this.addressItems.forEach(item => {
+            item.vinOutTime = this.getLocalTime(item.gtm);
+            item.cityName = item.appAdress;
+          });
+        }
+      }
+    });
+   }
+   trajectoryChange(event:any){
+    if(event ==='car'){
+      this.getTrajectory()
+    }else if(event ==='driver'){
+      this.getDriverTrajectory();
+    }
+ }
   getLocalTime(time: any) {
     return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss');
   }

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-03-09 13:40:42
+ * @LastEditTime : 2022-03-10 16:02:51
  * @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.html
@@ -132,7 +132,7 @@
 </div>
 </nz-card>
 <nz-card [nzTitle]="'运费信息' +'（到货后'+i?.paymentDays+'天内支付运费）'" #distannce3>
-  <st #st [data]="i?.billExpenseDetailVOList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
+  <!-- <st #st [data]="i?.billExpenseDetailVOList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
     <ng-template st-row="price" let-item let-index="index">
       {{ item.price | currency}}
     </ng-template>
@@ -143,7 +143,20 @@
   <div>
     总计：<span style="color: #da001b; font-size: 18px">{{ i?.freight | currency: '￥' }}</span>
   </div>
-  <div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
+  <div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div> -->
+  <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
+    <ng-template st-row="price" let-item let-index="index">
+      {{ item.price | currency }}
+    </ng-template>
+    <ng-template st-row="surcharge" let-item let-index="index">
+      {{ item.surcharge | currency }}
+    </ng-template>
+  </st>
+  <div>
+    总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight | currency }}，
+    附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}% ）
+  </div>
+  <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
 </nz-card>
 
 <nz-card nzTitle="附件信息" #distannce4>
@@ -170,22 +183,22 @@
     <sv label="是否回单">
       {{i?.receiptType == 1 ?'是':'否'}}
     </sv>
-    <sv label="回单类型">
+    <sv label="回单类型" *ngIf="i?.receiptType == 1">
       {{i?.receiptTypeLabel}}
     </sv>
-    <sv label="联系人">
+    <sv label="联系人" *ngIf="i?.receiptType == 1">
       {{i?.receiptUser}}{{ i?.receiptUserPhone ? ' /' + i?.receiptUserPhone : ''}}
     </sv>
-    <sv label="所在地区">
+    <sv label="所在地区" *ngIf="i?.receiptType == 1">
       {{i?.receiptPlace}}
     </sv>
-    <sv label="详细地址">
+    <sv label="详细地址" *ngIf="i?.receiptType == 1">
       {{i?.receiptAddress}}
     </sv>
   
   </sv-container>
   <sv-container col="1" class="mt-md">
-    <sv label="回单凭证">
+    <sv label="回单凭证" *ngIf="i?.receiptType == 1">
       <app-imagelist [imgList]="[i?.receiptFilePath]"></app-imagelist>
     </sv>
     <sv label="备注">
@@ -193,21 +206,22 @@
     </sv>
   </sv-container>
 </nz-card>
+
 <nz-card>
   <div nz-row>
-    <nz-card nzTitle="轨迹信息" style="width: 100%" id="distannce5"  [nzExtra]="extraTemplate" #distannce5>
+    <nz-card nzTitle="轨迹信息" style="width: 100%" [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 [scroll]="{y: '500px'}" #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">
-    </st>
+          </st>
         </div>
         <div nz-col [nzSpan]="12">
-          <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [MapList]="MapList"></amap-path-simplifier>
+          <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [MapList]="mapList"></amap-path-simplifier>
         </div>
       </div>
     </nz-card>
     <ng-template #extraTemplate>
-      <nz-radio-group [(ngModel)]="trajectory">
+      <nz-radio-group [(ngModel)]="trajectory" (ngModelChange)="trajectoryChange($event)">
         <label nz-radio-button nzValue="car">车辆轨迹</label>
         <label nz-radio-button nzValue="driver">司机轨迹</label>
       </nz-radio-group>

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-03-02 16:26:15
+ * @LastEditTime : 2022-03-10 16:10:51
  * @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
@@ -26,18 +26,32 @@ export class WaybillManagementVehicleDetailComponent implements OnInit {
 
   id = this.route.snapshot.params.id;
   MapList: any[]=[];
+  trajectory = 'car';
+  mapList:any[] = [];  //地图点位数据组
+  addressItems:any[] = [];  //打点地址数据组
   i: any;
   totalObj: any;
   attObj: any;
   isVisible = false;
   imges: any;
   unLoadingPlaceVOList: any = [];
-  logColumns: STColumn[] = [
+  logColumns2: STColumn[] = [
     { title: '时间', index: 'vinOutTime' },
-    { title: '地点', index: 'cityName' },
+    { title: '地点', index: 'cityName' }
+  ];
+  billExpenses: any[] = []; //运费信息表格信息
+  logColumns: STColumn[] = [
+    { title: '款项', index: 'costCodeLabel' },
+    { title: '小计（元）', render: 'price' },
+    { title: '运输费（元）', render: 'price' },
+    { title: '附加费（元）', render: 'surcharge' },
+    { title: '支付时间', index: 'paymentTime' },
+    {
+      title: '支付状态',
+      className: 'text-center',
+      index: 'paymentStatusLabel',
+    }
   ];
-  trajectory = 'car';
-  addressItems: any[] = []; //打点地址数据组
 
   constructor(
     private route: ActivatedRoute,
@@ -50,7 +64,7 @@ export class WaybillManagementVehicleDetailComponent implements OnInit {
 
   ngOnInit(): void {
     this.initData()
-    this.MapInit()
+    this.getTrajectory()
   }
   initData() {
     const params = {
@@ -62,8 +76,10 @@ export class WaybillManagementVehicleDetailComponent implements OnInit {
       this.unLoadingPlaceVOList.push(...res.dischargePlace)
       console.log(this.unLoadingPlaceVOList)
       this.i = res;
-      this.attObj = this.i?.billExpenseDetailVOList?.filter((data: any) => data.expenseCode === 'ATT')[0];
+      this.billExpenses = this.i?.billExpenseDetailVOList?.filter(
-      this.totalObj = this.i?.billExpenseDetailVOList?.filter((data: any) => data.expenseCode === 'TOTAL')[0];
+        (data: any) => data.costCode === 'PRE' || data.costCode === 'RECE' || data.costCode === 'BACK'
+      );
+      this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data: any) => data.displayStatus !== 'HIDE');
     })
   }
 
@@ -130,29 +146,60 @@ goDistance(elf: NzCardComponent) {
    
   });
   }
-    // 获取轨迹
+
-    MapInit() {
+  // 获取车辆轨迹
-      this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => {
+  getTrajectory(){
-        if (res) {
+    this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => {
-          const points = res.trackArray;
+      if (res) {
-          let list :any[] = [];
+        const points = res.trackArray;
-          points?.forEach((item: any) => {
+        let list :any[] = [];
-            list.push({
+        points?.forEach((item: any) => {
-              name: item.hgt,
+          list.push({
-              lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))]
+            name: item.hgt,
-            });
+            lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))]
+          });
+        });
+        this.mapList = list;
+        this.addressItems = res.cityArray;
+        if(this.addressItems && this.addressItems.length > 0){
+          this.addressItems.forEach(item => {
+            item.vinOutTime = this.getLocalTime(item.vinOutTime);
           });
-          this.MapList = list;
-          this.addressItems = res.parkArray;
-          if(this.addressItems && this.addressItems.length > 0){
-            this.addressItems.forEach(item => {
-              item.vinOutTime = this.getLocalTime(item.vinOutTime);
-            });
-          }
         }
-      });
+      }
+    });
+  }
+
+   // 获取司机轨迹
+   getDriverTrajectory(){
+    this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.id }).subscribe(res => {
+      if (res) {
+        const points = res.tracks;
+        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.enclosureDataAppTrack];
+        if(this.addressItems && this.addressItems.length > 0){
+          this.addressItems.forEach(item => {
+            item.vinOutTime = this.getLocalTime(item.gtm);
+            item.cityName = item.appAdress;
+          });
+        }
+      }
+    });
+   }
+   trajectoryChange(event:any){
+    if(event ==='car'){
+      this.getTrajectory()
+    }else if(event ==='driver'){
+      this.getDriverTrajectory();
     }
-    
+ }
   getLocalTime(time: any) {
     return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss');
   }