Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

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

@@ -75,7 +75,7 @@
                   <input
                     nz-input
                     [(ngModel)]="data1.detailedAddress"
-                    (click)="openMap('start', idx)"
+                    (click)="openMap('start', idx,data1.detailedAddress)"
                     formControlName="loadAddress{{ idx }}"
                     placeholder="请输入装货地"
                     readonly="true"
@@ -126,7 +126,7 @@
                   <input
                     nz-input
                     [(ngModel)]="data2.detailedAddress"
-                    (click)="openMap('end', idx)"
+                    (click)="openMap('end', idx,data2.detailedAddress)"
                     formControlName="unloadAddress{{ idx }}"
                     placeholder="请输入卸货地"
                     readonly="true"

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

@@ -443,13 +443,13 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
         this.loadTime = res.loadTime;
         this.unloadTime = res.unloadTime;
         this.dirvingMessage = res.billExpenseDetails;
-            // 计算里程，时间
+        // 计算里程，时间
-      if (this.startInfo?.[0]?.area && this.endInfo?.[0]?.area) {
+        if (this.startInfo?.[0]?.area && this.endInfo?.[0]?.area) {
-        this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => {
+          this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => {
-          this.totalDistance = res.distance;
+            this.totalDistance = res.distance;
-          this.totalTime = res.time;
+            this.totalTime = res.time;
-        });
+          });
-      }
+        }
       }
     });
   }
@@ -560,12 +560,13 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
   }
   // -------------------装卸货信息处理
   // 打开地图
-  openMap(type: string, index: number) {
+  openMap(type: string, index: number, address: string) {
     console.log(type);
     console.log(index);
-    
+
     const modalRef = this.modalService.create({
       nzTitle: '',
+      nzComponentParams: { selectedAddress: address },
       nzContent: AmapPoiPickerComponent,
       nzWidth: 900,
       nzOnOk: item => {
@@ -883,8 +884,8 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
     }
     console.log(elf);
   }
-   // 装卸货地址互换
+  // 装卸货地址互换
-   swapAddress() {
+  swapAddress() {
     this.startInfo.forEach((element: any, index: any) => {
       this.validateForm1.removeControl(`loadAddress${index}`);
       this.validateForm1.removeControl(`loadName${index}`);

src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts

@@ -1,5 +1,5 @@
 import AMapLoader from '@amap/amap-jsapi-loader';
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { ChangeDetectorRef, Component, Input, OnInit, ViewChild } from '@angular/core';
 import { amapConf } from '@conf/amap.config';
 import { NzModalRef } from 'ng-zorro-antd/modal';
 import { throwError } from 'rxjs';
@@ -27,7 +27,10 @@ export class AmapPoiPickerComponent implements OnInit {
   infoWindow: any;
   geocoder: any;
 
-  constructor(private modalRef: NzModalRef, private service: AmapService) {}
+  @Input()
+  selectedAddress!: string;
+
+  constructor(private modalRef: NzModalRef, private service: AmapService, private cdr: ChangeDetectorRef) {}
   ngOnInit(): void {
     this.mapInit();
     // this.PoiPicker();
@@ -77,6 +80,8 @@ export class AmapPoiPickerComponent implements OnInit {
 
         // 地图创建成功
         this.aMap.on('complete', () => {
+          console.log('地图创建成功');
+          this.cdr.detectChanges();
           this.poiPickerReady(poiPicker);
         });
 
@@ -113,12 +118,21 @@ export class AmapPoiPickerComponent implements OnInit {
       radius: 1000 //范围，默认：500
     });
 
-    // 获取当前定位
+    if (this.selectedAddress) {
-    this.service.getCurrentPosition().subscribe(res => {
+      this.geocoder.getLocation(this.selectedAddress, (status: any, result: any) => {
-      if (res) {
+        if (status === 'complete' && result.info === 'OK') {
-        this.selectedPOI(res.position);
+          // result中对应详细地理坐标信息
-      }
+          this.selectedPOI(result.geocodes?.[0].location);
-    });
+        }
+      });
+    } else {
+      // 获取当前定位
+      this.service.getCurrentPosition().subscribe(res => {
+        if (res) {
+          this.selectedPOI(res.position);
+        }
+      });
+    }
 
     //选取了某个POI
     poiPicker.on('poiPicked', (poiResult: any) => {