增加-机场集团、国家、机型组、航空集团下拉框数据对接

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

@@ -32,6 +32,14 @@ export class BasicDataService {
     public terminal_area_subject = new Subject<any>();
     public airline: Array<any>;
     public airline_subject = new Subject<any>();
+    public country: Array<any>;
+    public country_subject = new Subject<any>();
+    public aircraft_type_group: Array<any>;
+    public aircraft_type_group_subject = new Subject<any>();
+    public airportgroup: Array<any>;
+    public airportgroup_subject = new Subject<any>();
+    public airlinegroup: Array<any>;
+    public airlinegroup_subject = new Subject<any>();
 
     constructor(
         private httpClient: HttpClientService
@@ -52,6 +60,10 @@ export class BasicDataService {
         let aircraftHttp = this.httpClient.get('/adminapi/basicdata/sysAircrafts');
         let terminalAreaHttp = this.httpClient.get('/adminapi/basicdata/ormsTerminalareas');
         let airlineHttp = this.httpClient.get('/adminapi/basicdata/sysAirlines');
+        let countryHttp = this.httpClient.get('/adminapi/basicdata/sysCountry');
+        let aircrafttypesGroupHttp = this.httpClient.get('/adminapi/basicdata/sysAircrafttypesGroup');
+        let airportGroupsHttp = this.httpClient.get('/adminapi/basicdata/sysAirportGroups');
+        let airlineGroupHttp = this.httpClient.get('/adminapi/basicdata/sysAirlineGroup');
         zip(
             flightStatusHttp,
             checkinGroupHttp,
@@ -66,7 +78,11 @@ export class BasicDataService {
             aircraftTypeHttp,
             aircraftHttp,
             terminalAreaHttp,
-            airlineHttp
+            airlineHttp,
+            countryHttp,
+            aircrafttypesGroupHttp,
+            airportGroupsHttp,
+            airlineGroupHttp
         ).subscribe(
             ([
                 flightStatusRes,
@@ -82,7 +98,11 @@ export class BasicDataService {
                 aircraftTypeRes,
                 aircraftRes,
                 terminalAreaRes,
-                airlineRes
+                airlineRes,
+                countryRes,
+                aircraftTypeGroupRes,
+                airportGroupRes,
+                airlineGroupRes
             ]) => {
                 this.flightStatus = flightStatusRes.body;
                 this.flightStatus_subject.next(flightStatusRes.body);
@@ -112,6 +132,14 @@ export class BasicDataService {
                 this.city_subject.next(cityRes.body);
                 this.airport = airportRes.body;
                 this.airport_subject.next(airportRes.body);
+                this.country = countryRes.body;
+                this.country_subject.next(countryRes.body);
+                this.aircraft_type_group = aircraftTypeGroupRes.body;
+                this.aircraft_type_group_subject.next(aircraftTypeGroupRes.body);
+                this.airportgroup = airportGroupRes.body;
+                this.airportgroup_subject.next(airportGroupRes.body);
+                this.airlinegroup = airlineGroupRes.body;
+                this.airlinegroup_subject.next(airlineGroupRes.body);
             }
         )
     }

src/app/pages/basic-data/aircraft-type/aircraft-type.component.html

@@ -24,7 +24,7 @@
                   <label for="aircrafttypegroupId">机型组：&nbsp;&nbsp;</label>
                   <select  class="form-control" [(ngModel)]="filterItems.aircrafttypegroupId" (ngModelChange)="selectChange()" id="jgroup">
                       <option value=""></option>
-                      <option *ngFor="let item of aircraftTypes" [value]="item.aircrafttypegroupId">{{item.aircrafttypegroupId}}</option>
+                      <option *ngFor="let item of aircraftTypesGroups" [value]="item.aircrafttypegroupId">{{item.aircraftTypeGroupName}}</option>
                   </select>
               </div>
             </div>

src/app/pages/basic-data/aircraft-type/aircraft-type.component.ts

@@ -39,11 +39,13 @@ export class AircraftTypeComponent implements OnInit {
         aircrafttypegroupId: '',
     }
 
+    aircraftTypesGroups: Array<any>; //机型组
     aircraftTypes: Array<any>;
     public row_state: any = { renderFlight: {} };
     public render_data: Array<object> = [];  //显示数据，即需要显示的数据
 
     ngOnInit() {
+        this.aircraftTypesGroups = this.basicDataService.aircraft_type_group;
         this.aircraftTypes = this.basicDataService.aircraft_type;
         this.render_data = this.basicDataService.aircraft_type;
         this.basicDataService.aircraft_type_subject.subscribe(
@@ -52,6 +54,10 @@ export class AircraftTypeComponent implements OnInit {
                 this.render_data = data;
             }
         )
+        //机型组
+        this.basicDataService.aircraft_type_group_subject.subscribe(
+            data => this.aircraftTypesGroups = data
+        )
         /**
          * 固定表头
          */

src/app/pages/basic-data/airline/airline.component.html

@@ -21,10 +21,10 @@
   
             <div class="second-condition mb-3 row">
               <div class="input-container mr-4">
-                <label for="airlineName">航空集团：&nbsp;&nbsp;</label>
-                <select class="form-control" [(ngModel)]="filterItems.airlineName" (ngModelChange)="selectChange()" id="handkong">
+                <label for="airlineGroupId">航空集团：&nbsp;&nbsp;</label>
+                <select class="form-control" [(ngModel)]="filterItems.airlineGroupId" (ngModelChange)="selectChange()" id="handkong">
                     <option value=""></option>
-                    <option *ngFor="let item of airlines" [value]="item.airlineName" >{{item.airlineName}}</option>
+                    <option *ngFor="let item of airlinegroups" [value]="item.airlineGroupId" >{{item.airlineGroupName}}</option>
                 </select>
             </div>
             <div class="input-container mr-4">

src/app/pages/basic-data/airline/airline.component.ts

@@ -29,6 +29,7 @@ export class AirlineComponent implements OnInit {
     FLT_POS = 1;    //过滤还是定位
     SEL_COL = '';   //选择列名
 
+    airlinegroups: Array<any>; //航空集团
     airlines: Array<any>;
     public row_state: any = { renderFlight: {} };
     public render_data: Array<object> = [];  //显示数据，即需要显示的数据
@@ -39,6 +40,7 @@ export class AirlineComponent implements OnInit {
         briefNameChn: '',
     }
     ngOnInit() {
+        this.airlinegroups = this.basicDataService.airlinegroup;
         this.airlines = this.basicDataService.airline;
         this.render_data = this.basicDataService.airline;
         this.basicDataService.airline_subject.subscribe(
@@ -47,6 +49,9 @@ export class AirlineComponent implements OnInit {
                 this.render_data = data;
             }
         )
+        this.basicDataService.airlinegroup_subject.subscribe(
+            data => this.airlinegroups = data
+        )
         /**
          * 固定表头
          */

src/app/pages/basic-data/airport/airport.component.html

@@ -24,7 +24,7 @@
               <label for="airportGroupId">机场集团：&nbsp;&nbsp;</label>
               <select  class="form-control" [(ngModel)]="filterItems.airportGroupId" (ngModelChange)="selectChange()" id="jt">
                   <option value=""></option>
-                  <option *ngFor="let item of airports" [value]="item.airportGroupId">{{item.airportGroupId}}</option>
+                  <option *ngFor="let item of airportgroups" [value]="item.airportGroupId">{{item.airportGroupName}}</option>
               </select>
           </div>
           <div class="input-container mr-4">

src/app/pages/basic-data/airport/airport.component.ts

@@ -37,12 +37,14 @@ export class AirportComponent implements OnInit {
         cityId: '',
     }
 
+    airportgroups: Array<any>; //机场集团
     citys: Array<any>; //城市
     airports: Array<any>;
     public row_state: any = { renderFlight: {} };
     public render_data: Array<object> = [];  //显示数据，即需要显示的数据
 
     ngOnInit() {
+        this.airportgroups = this.basicDataService.airportgroup;
         this.citys = this.basicDataService.city;
         this.airports = this.basicDataService.airport;
         this.render_data = this.basicDataService.airport;
@@ -53,9 +55,10 @@ export class AirportComponent implements OnInit {
             }
         )
         this.basicDataService.city_subject.subscribe(
-            data => {
-                this.citys = data;
-            }
+            data => this.citys = data
+        )
+        this.basicDataService.airportgroup_subject.subscribe(
+            data => this.airportgroups = data
         )
         /**
          * 固定表头

src/app/pages/basic-data/city/city.component.html

@@ -22,10 +22,9 @@
             <div class="second-condition mb-3 row">
                 <div class="input-container mr-4">
                     <label for="countryId">国家：&nbsp;&nbsp;</label>
-                    <select class="form-control" [(ngModel)]="filterItems.countryId" (ngModelChange)="selectChange()"
-                        id="citry">
+                    <select class="form-control" [(ngModel)]="filterItems.countryId" (ngModelChange)="selectChange()" id="citry">
                         <option value=""></option>
-                        <option *ngFor="let item of citys" [value]="item.countryId">{{item.countryId}}</option>
+                        <option *ngFor="let item of countrys" [value]="item.countryId">{{item.countryNameChn}}</option>
                     </select>
                 </div>
             </div>

src/app/pages/basic-data/city/city.component.ts

@@ -30,11 +30,13 @@ export class CityComponent implements OnInit {
         countryId: '',
     }
 
+    countrys: Array<any>; //国家
     citys: Array<any>;
     public row_state: any = { renderFlight: {} };
     public render_data: Array<object> = [];  //显示数据，即需要显示的数据
 
     ngOnInit() {
+        this.countrys = this.basicDataService.country;
         this.citys = this.basicDataService.city;
         this.render_data = this.basicDataService.city;
         this.basicDataService.city_subject.subscribe(
@@ -43,6 +45,9 @@ export class CityComponent implements OnInit {
                 this.render_data = data;
             }
         )
+        this.basicDataService.country_subject.subscribe(
+            data => this.countrys = data
+        )
         /**
          * 固定表头
          */