diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
index db20b7d4..aef380fc 100644
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
+++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
@@ -149,7 +149,8 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
points?.forEach((item: any) => {
list.push({
name: `${item.spd}km/h`,
- 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))],
+ time: item.gtm
});
});
this.mapList = list;
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.html b/src/app/routes/order-management/components/vehicle/vehicle.component.html
index 97a70974..49042a0e 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html
@@ -110,9 +110,6 @@
-
-
+
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.less b/src/app/routes/order-management/components/vehicle/vehicle.component.less
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.spec.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.spec.ts
deleted file mode 100644
index 61b6bb2e..00000000
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.spec.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * @Description :
- * @Version : 1.0
- * @Author : Shiming
- * @Date : 2021-12-03 15:31:52
- * @LastEditors : Shiming
- * @LastEditTime : 2022-01-25 13:28:47
- * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.spec.ts
- * Copyright (C) 2022 huzhenhong. All rights reserved.
- */
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { OrderManagementVehicleComponent } from './vehicle.component';
-
-describe('OrderManagementVehicleComponent', () => {
- let component: OrderManagementVehicleComponent;
- let fixture: ComponentFixture;
-
- beforeEach(waitForAsync(() => {
- TestBed.configureTestingModule({
- declarations: [ OrderManagementVehicleComponent ]
- })
- .compileComponents();
- }));
-
- beforeEach(() => {
- fixture = TestBed.createComponent(OrderManagementVehicleComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.html b/src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.html
index 2430b12e..2b5b369d 100644
--- a/src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.html
+++ b/src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.html
@@ -8,4 +8,8 @@
* @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\amap\\amap-path-simplifier\\amap-path-simplifier.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts b/src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts
index b358e178..1c810c67 100644
--- a/src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts
+++ b/src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts
@@ -1,9 +1,10 @@
import AMapLoader from '@amap/amap-jsapi-loader';
import { Component, Input, OnChanges, OnInit, Output, SimpleChanges, EventEmitter, OnDestroy } from '@angular/core';
import { amapConf } from '@conf/amap.config';
+import { InputNumber } from '@delon/util';
import { throwError } from 'rxjs';
import { BaseService } from 'src/app/shared/services';
-import { InfoItem, MapList, PathList, POI } from '../amap.service';
+import { AmapService, InfoItem, MapList, PathList, POI } from '../amap.service';
declare var AMap: any;
declare var AMapUI: any;
declare var Loca: any;
@@ -31,6 +32,9 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges, OnDestroy
// 当前选中路线图下标
@Input()
selectedIndex = 0;
+ // 巡航倍数
+ @InputNumber()
+ navSpeed = 1;
// 标点数组
@Input()
pois: POI[] = [];
@@ -44,7 +48,7 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges, OnDestroy
@Output()
readonly clcikPointEvent = new EventEmitter();
- constructor(public service: BaseService) {}
+ constructor(public service: BaseService, private amapService: AmapService) {}
ngOnChanges(changes: SimpleChanges): void {
// 路线图变更: 设置路线图, 指定路线图
if (changes?.pathList?.currentValue && this?.pathSimplifierIns) {
@@ -154,7 +158,8 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges, OnDestroy
position: info.pathData.points[info.pointIndex].lnglat,
content: `