diff --git a/src/app/pages/basic-data/aircraft/aircraft.component.ts b/src/app/pages/basic-data/aircraft/aircraft.component.ts index 55a5095..d8f3509 100644 --- a/src/app/pages/basic-data/aircraft/aircraft.component.ts +++ b/src/app/pages/basic-data/aircraft/aircraft.component.ts @@ -67,16 +67,12 @@ export class AircraftComponent implements OnInit { this.aircraftTypes = data; } ) - //机型数据转换处理 - this.render_data.forEach(item => { - let aircraftTypesLinkIndex = this.aircraftTypes.findIndex(val => val.aircraftTypeCode === item['aircraftTypeCode']); - item['aircraftTypeName'] = this.aircraftTypes[aircraftTypesLinkIndex].aircraftTypeName; - }) - //航空公司数据转换处理 - this.render_data.forEach(item => { - let airlinesLinkIndex = this.airlines.findIndex(val => val.airlineCode === item['airlineCode']); - item['airlineName'] = this.airlines[airlinesLinkIndex].airlineName; - }) + if(this.render_data){ + //机型数据转换处理 + this.basicDataTransHandle(); + //航空公司数据转换处理 + this.airlinesHandle(); + } /** * 固定表头 */ diff --git a/src/app/pages/basic-data/airport/airport.component.ts b/src/app/pages/basic-data/airport/airport.component.ts index 58364ef..674990b 100644 --- a/src/app/pages/basic-data/airport/airport.component.ts +++ b/src/app/pages/basic-data/airport/airport.component.ts @@ -66,10 +66,9 @@ export class AirportComponent implements OnInit { data => this.airportgroups = data ) //城市数据转换处理 - this.render_data.forEach(item => { - let citysLinkIndex = this.citys.findIndex(val => val.cityId === item['cityId']); - item['cityNameChn'] = this.citys[citysLinkIndex].cityNameChn; - }) + if(this.render_data){ + this.basicDataTransHandle(); + } /** * 固定表头 */ diff --git a/src/app/pages/basic-data/checkin-desk/checkin-desk.component.ts b/src/app/pages/basic-data/checkin-desk/checkin-desk.component.ts index 5838b1f..fd2b9c1 100644 --- a/src/app/pages/basic-data/checkin-desk/checkin-desk.component.ts +++ b/src/app/pages/basic-data/checkin-desk/checkin-desk.component.ts @@ -73,15 +73,13 @@ export class CheckinDeskComponent implements OnInit { this.chuts = data; } ) - this.render_data.forEach(item => {//值机岛数据转换处理 - let checkinGroupsLinkIndex = this.checkinGroups.findIndex(val => val.checkinGroupCode === item['checkinGroupCode']); - item['checkinGroupName'] = this.checkinGroups[checkinGroupsLinkIndex].checkinGroupName; - }) - //行李传送带数据转换处理 - this.render_data.forEach(item => { - let chutsLinkIndex = this.chuts.findIndex(val => val.chutCode === item['chutCode']); - item['chutName'] = this.chuts[chutsLinkIndex].chutName; - }) + if(this.render_data){ + //值机岛列表数据转换 + this.basicDataTransHandle(); + //行李传送带数据转换处理 + this.chutsHandle(); + } + /** * 固定表头 */ diff --git a/src/app/pages/basic-data/city/city.component.ts b/src/app/pages/basic-data/city/city.component.ts index 45091db..9744178 100644 --- a/src/app/pages/basic-data/city/city.component.ts +++ b/src/app/pages/basic-data/city/city.component.ts @@ -53,10 +53,10 @@ export class CityComponent implements OnInit { } } ) - this.render_data.forEach(item => {//国家数据转换处理 - let countryLinkIndex = this.countrys.findIndex(val => val.countryId === item['countryId']); - item['countryNameChn'] = this.countrys[countryLinkIndex].countryNameChn; - }) + if(this.render_data){ + //国家列表数据转换 + this.basicDataTransHandle(); + } /** * 固定表头 */