diff --git a/proxy.conf.js b/proxy.conf.js
index 1f212dc6..89d93e1f 100644
--- a/proxy.conf.js
+++ b/proxy.conf.js
@@ -20,7 +20,7 @@ module.exports = {
// }
'//api': {
target: {
- host: 'tms-api-test.eascs.com',
+ host: 'tms-api-dev.eascs.com',
protocol: 'https:',
port: 443
},
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 5d971ed1..5529d685 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
@@ -1,5 +1,5 @@
/*
- * @Description :
+ * @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-28 14:42:03
@@ -60,11 +60,12 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
private msgSrv: NzMessageService,
private service: OrderManagementService,
private router: Router,
- private modal: NzModalService,
+ private modal: NzModalService
) {}
ngOnInit(): void {
this.initData();
+ this.MapInit();
}
initData() {
@@ -82,21 +83,21 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
}
});
}
-// 取消订单
-cancellation() {
- // api_get_cancelAnOrder
- this.modal.confirm({
- nzTitle: '确定取消该订单吗?',
- nzContent: `取消后无法恢复,请确认`,
- nzOnOk: () =>
- this.service.request(this.service.$api_get_cancelAnOrder, {id: this.id}).subscribe((res) => {
- if (res === true) {
- this.service.msgSrv.success('操作成功!');
- this.initData();
- }
- }),
- })
-}
+ // 取消订单
+ cancellation() {
+ // api_get_cancelAnOrder
+ this.modal.confirm({
+ nzTitle: '确定取消该订单吗?',
+ nzContent: `取消后无法恢复,请确认`,
+ nzOnOk: () =>
+ this.service.request(this.service.$api_get_cancelAnOrder, { id: this.id }).subscribe(res => {
+ if (res === true) {
+ this.service.msgSrv.success('操作成功!');
+ this.initData();
+ }
+ })
+ });
+ }
goBack() {
window.history.go(-1);
}
@@ -121,7 +122,7 @@ cancellation() {
goDistance(elf: NzCardComponent) {
if (elf) {
- elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' , });
+ elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' });
// elf['elementRef'].nativeElement.className = 'target-fix'
}
}
@@ -137,7 +138,7 @@ cancellation() {
});
});
console.log(list);
- this.MapList = list
+ this.MapList = list;
}
});
}
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 32051cb2..edaeaa25 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
@@ -16,13 +16,14 @@ const CONFIG = amapConf;
export class AmapPathSimplifierComponent implements OnInit, OnChanges {
aMap: any;
pathSimplifierIns: any;
+ navigator: any;
@Input()
pathList: any = [];
@Input()
selectedIndex = 0;
@Input()
mapWidth = '800px';
- @Input('MapList') MapList: any;
+ @Input() MapList: any;
@Input()
mapHeight = '500px';
@@ -35,15 +36,19 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges {
this.setData(changes.pathList?.currentValue);
this.setPathIndex(this.selectedIndex);
}
+ if (changes?.MapList?.currentValue && this?.pathSimplifierIns) {
+ this.pathList = [
+ {
+ name: '路线1',
+ points: changes?.MapList?.currentValue
+ }
+ ];
+ this.setData(this.pathList);
+ this.setPathIndex(this.selectedIndex);
+ }
}
ngOnInit(): void {
this.mapInit();
- this.pathList = [
- {
- name: '路线1',
- points: this.MapList
- }
- ];
// this.DataInit();
}
ngOnDestroy(): void {
@@ -104,26 +109,20 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges {
return pathData.name + ',点数量' + pathData.points?.length;
},
renderOptions: {
- renderAllPointsIfNumberBelow: 100 //绘制路线节点,如不需要可设置为-1
+ renderAllPointsIfNumberBelow: 10 //绘制路线节点,如不需要可设置为-1
}
});
(window as any).pathSimplifierIns = this.pathSimplifierIns;
this.setData(this.pathList);
- if(this.pathList.length>0){
- this.setPathIndex(this.selectedIndex);
+ if (this.pathList.length > 0) {
+ this.setPathIndex(this.selectedIndex);
}
this.pathSimplifierIns.on('pointClick', (e: any, info: any) => {
this.clcikPointEvent.emit({ e, info });
console.log('Click: ' + info.pathData.points[info.pointIndex].name);
});
- // navg1.start();
- // var navg1 = this.pathSimplifierIns.createPathNavigator(0, {
- // loop: true, //循环播放
- // speed: 1000000 //巡航速度,单位千米/小时
- // });
- // navg1.start();
}
setData(pathList: Array) {
@@ -132,5 +131,18 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges {
setPathIndex(index: number) {
this.pathSimplifierIns.setSelectedPathIndex(index);
+ this.startNav();
+ }
+
+ startNav() {
+ if (this.navigator) {
+ this.navigator.start();
+ } else {
+ this.navigator = this.pathSimplifierIns?.createPathNavigator(0, {
+ loop: true, //循环播放
+ speed: 1000000 //巡航速度,单位千米/小时
+ });
+ this.navigator?.start();
+ }
}
}