航班信息显示转换

src/app/pages/basic-data-service.ts

@@ -4,6 +4,8 @@ import { Subject, forkJoin, zip } from 'rxjs'
 
 @Injectable()
 export class BasicDataService {
+    public flightStatus:Array<any>;
+    public flightStatus_subject = new Subject<any>();
     public checkin_group: Array<any>;
     public checkin_group_subject = new Subject<any>();
     public gate: Array<any>;
@@ -36,7 +38,7 @@ export class BasicDataService {
     ) { }
 
     loadBasicData() {
-        console.log('---')
+        let flightStatusHttp = this.httpClient.get('/adminapi/basicdata/sysFlightStatus');
         let checkinGroupHttp = this.httpClient.get('/adminapi/basicdata/checkinGroups');
         let gateHttp = this.httpClient.get('/adminapi/basicdata/ormsGates');
         let terminalHttp = this.httpClient.get('/adminapi/basicdata/ormsTerminals');
@@ -51,6 +53,7 @@ export class BasicDataService {
         let terminalAreaHttp = this.httpClient.get('/adminapi/basicdata/ormsTerminalareas');
         let airlineHttp = this.httpClient.get('/adminapi/basicdata/sysAirlines');
         zip(
+            flightStatusHttp,
             checkinGroupHttp,
             gateHttp,
             terminalHttp,
@@ -66,6 +69,7 @@ export class BasicDataService {
             airlineHttp
         ).subscribe(
             ([
+                flightStatusRes,
                 checkinGroupRes,
                 gateRes,
                 terminalRes,
@@ -80,12 +84,15 @@ export class BasicDataService {
                 terminalAreaRes,
                 airlineRes
             ]) => {
+                console.log('---')
+                this.flightStatus = flightStatusRes.body;
+                this.flightStatus_subject.next(flightStatusRes.body);
                 this.checkin_group = checkinGroupRes.body;
                 this.checkin_group_subject.next(checkinGroupRes.body);
                 this.gate = gateRes.body;
                 this.gate_subject.next(gateRes.body);
                 this.terminal = terminalRes.body;
-                this.terminal_area_subject.next(terminalRes.body);
+                this.terminal_subject.next(terminalRes.body);
                 this.chut = chutRes.body;
                 this.chut_subject.next(chutRes.body);
                 this.stand = standRes.body;
@@ -94,10 +101,6 @@ export class BasicDataService {
                 this.carousel_subject.next(carouselRes.body);
                 this.checkin_desk = checkinDeskRes.body;
                 this.checkin_desk_subject.next(checkinDeskRes.body);
-                this.airport = airportRes.body;
-                this.airport_subject.next(airportRes.body);
-                this.city = cityRes.body;
-                this.city_subject.next(cityRes.body);
                 this.aircraft_type = aircraftTypeRes.body;
                 this.aircraft_type_subject.next(aircraftTypeRes.body);
                 this.aircraft = aircraftRes.body;
@@ -106,6 +109,10 @@ export class BasicDataService {
                 this.terminal_area_subject.next(terminalAreaRes.body);
                 this.airline = airlineRes.body;
                 this.airline_subject.next(airlineRes.body);
+                this.city = cityRes.body;
+                this.city_subject.next(cityRes.body);
+                this.airport = airportRes.body;
+                this.airport_subject.next(airportRes.body);
             }
         )
     }