Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

src/app/key-unit/router-gis/router-gis.component.ts

@@ -14,29 +14,34 @@ export class RouterGISComponent implements OnInit {
   constructor(public _ngZone:NgZone,public snackBar: MatSnackBar,private http:HttpClient,private route:ActivatedRoute,) { }
 
   ngOnInit(): void {
-    this.getCompanyData()
   }
 
   ngAfterViewInit(): void {
+    let async = this.getCompanyData()
     window.setTimeout(()=>{
-      this.mapInit()
+      async.then(res=>{
+        this.mapInit()
+      })
     },0)
   }
 
   //获取单位 信息
   getCompanyData () {
-    this.http.get(`/api/Companies/${this.route.snapshot.queryParams.id}`).subscribe((data:any)=>{
+    return new Promise((resolve,reject)=>{
-      if (data.driveRouteStartPoint && data.driveRouteStartPoint.x && data.driveRouteStartPoint.y && data.driveRouteStartName) { //开始坐标 名称
+      this.http.get(`/api/Companies/${this.route.snapshot.queryParams.id}`).subscribe((data:any)=>{
-        this.routeStart = data.driveRouteStartName
+        if (data.driveRouteStartPoint && data.driveRouteStartPoint.x && data.driveRouteStartPoint.y && data.driveRouteStartName) { //开始坐标 名称
-        this.startCoordinate = [data.driveRouteStartPoint.x,data.driveRouteStartPoint.y]
+          this.routeStart = data.driveRouteStartName
-      }
+          this.startCoordinate = [data.driveRouteStartPoint.x,data.driveRouteStartPoint.y]
-      if (data.driveRouteEndPoint && data.driveRouteEndPoint.x && data.driveRouteEndPoint.y && data.driveRouteEndName) { //结束坐标 名称
+        }
-        this.routeEnd = data.driveRouteEndName
+        if (data.driveRouteEndPoint && data.driveRouteEndPoint.x && data.driveRouteEndPoint.y && data.driveRouteEndName) { //结束坐标 名称
-        this.endCoordinate = [data.driveRouteEndPoint.x,data.driveRouteEndPoint.y]
+          this.routeEnd = data.driveRouteEndName
-      } else if (data.location && data.location.x && data.location.y) {
+          this.endCoordinate = [data.driveRouteEndPoint.x,data.driveRouteEndPoint.y]
-        this.routeEnd = data.name
+        } else if (data.location && data.location.x && data.location.y) {
-        this.endCoordinate = [data.location.x,data.location.y]
+          this.routeEnd = data.name
-      }
+          this.endCoordinate = [data.location.x,data.location.y]
+        }
+        resolve('success')
+      }) //http
     })
   }