diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.html b/src/app/pages/seasonal-plan/seasonal-plan.component.html index f916291..fb832b8 100644 --- a/src/app/pages/seasonal-plan/seasonal-plan.component.html +++ b/src/app/pages/seasonal-plan/seasonal-plan.component.html @@ -19,7 +19,7 @@ - + @@ -159,7 +159,7 @@ {{seasonal.arriOrDept}} {{seasonal.arrivalTime}} {{seasonal.departureTime}} - {{seasonal.aircraftTypeCode}} + {{seasonal.aircraftTypeName}} {{seasonal.flyingDistance}} {{seasonal.flyingTime}} diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.ts b/src/app/pages/seasonal-plan/seasonal-plan.component.ts index 4ddd46a..a5431c3 100644 --- a/src/app/pages/seasonal-plan/seasonal-plan.component.ts +++ b/src/app/pages/seasonal-plan/seasonal-plan.component.ts @@ -37,6 +37,7 @@ export class SeasonalPlanComponent implements OnInit { seasonals : Array; airlines : Array; //航空公司 + aircraftTypes : Array; //机型 public row_state: any = { renderFlight: {} }; public render_data: Array = []; //显示数据,即需要显示的数据 public return_data: Array = []; //下拉框显示数据 @@ -49,6 +50,9 @@ export class SeasonalPlanComponent implements OnInit { if(this.airlines && this.airlines.length > 0){//航空公司列表数据转换 this.basicDataTransHandle(); } + if(this.aircraftTypes && this.aircraftTypes.length > 0){//机型列表数据转换 + this.aircraftTypesHandle(); + } this.render_data.forEach(element => {//航线类别列表显示数据转换 if (element['routeType'] == 'D') { element['routeType'] = '国内' @@ -154,6 +158,13 @@ export class SeasonalPlanComponent implements OnInit { this.airlines = data; } ) + //机型 + this.aircraftTypes = this.basicDataService.aircraft_type; + this.basicDataService.aircraft_type_subject.subscribe( + data => { + this.aircraftTypes = data; + } + ) /** * 固定表头 */ @@ -168,7 +179,19 @@ export class SeasonalPlanComponent implements OnInit { basicDataTransHandle() { this.render_data.forEach(item => { let airlineLinkIndex = this.airlines.findIndex(val => val.airlineId === item['airlineId']); - item['airlineChnName'] = this.airlines[airlineLinkIndex].airlineName; + if(this.airlines[airlineLinkIndex]){ + item['airlineChnName'] = this.airlines[airlineLinkIndex].airlineName; + } + }) + } + + //机型数据转换处理 + aircraftTypesHandle() { + this.render_data.forEach(item => { + let aircraftTypesLinkIndex = this.aircraftTypes.findIndex(val => val.aircraftTypeCode === item['aircraftTypeCode']); + if(this.aircraftTypes[aircraftTypesLinkIndex]){ + item['aircraftTypeName'] = this.aircraftTypes[aircraftTypesLinkIndex].aircraftTypeName; + } }) }