From 4e041d67143661291ea12a6d0d9f73f61f189c6f Mon Sep 17 00:00:00 2001 From: "714943302@qq.com" Date: Mon, 10 Dec 2018 10:55:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E8=BD=AC=E6=8D=A2=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aircraft/aircraft.component.html | 6 ++-- .../basic-data/aircraft/aircraft.component.ts | 33 ++++++++++++++++++- .../basic-data/airport/airport.component.html | 2 +- .../basic-data/airport/airport.component.ts | 19 ++++++++++- .../checkin-desk/checkin-desk.component.html | 4 +-- .../checkin-desk/checkin-desk.component.ts | 31 +++++++++++++++++ .../pages/basic-data/city/city.component.html | 2 +- .../pages/basic-data/city/city.component.ts | 18 +++++++++- 8 files changed, 105 insertions(+), 10 deletions(-) diff --git a/src/app/pages/basic-data/aircraft/aircraft.component.html b/src/app/pages/basic-data/aircraft/aircraft.component.html index ee79a63..8177055 100644 --- a/src/app/pages/basic-data/aircraft/aircraft.component.html +++ b/src/app/pages/basic-data/aircraft/aircraft.component.html @@ -31,7 +31,7 @@ @@ -63,8 +63,8 @@ {{aircraft.maxTakeoffWeight}} {{aircraft.maxAirbridges}} {{aircraft.aircraftOwnerCode}} - {{aircraft.airlineCode}} - {{aircraft.aircraftTypeCode}} + {{aircraft.airlineName}} + {{aircraft.aircraftTypeName}} diff --git a/src/app/pages/basic-data/aircraft/aircraft.component.ts b/src/app/pages/basic-data/aircraft/aircraft.component.ts index 2ffa8e8..55a5095 100644 --- a/src/app/pages/basic-data/aircraft/aircraft.component.ts +++ b/src/app/pages/basic-data/aircraft/aircraft.component.ts @@ -49,11 +49,17 @@ export class AircraftComponent implements OnInit { data => { this.aircrafts = data; this.render_data = data; + if(this.aircraftTypes && this.aircraftTypes.length > 0){//机型列表数据转换 + this.basicDataTransHandle(); + } } ) this.basicDataService.airline_subject.subscribe( data => { this.airlines = data; + if(this.airlines && this.airlines.length > 0){//航空公司数据转换处理 + this.airlinesHandle(); + } } ) this.basicDataService.aircraft_type_subject.subscribe( @@ -61,7 +67,16 @@ 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; + }) /** * 固定表头 */ @@ -73,6 +88,22 @@ export class AircraftComponent implements OnInit { tableCont.addEventListener('scroll', scrollHandle); } + //航空公司数据转换处理 + airlinesHandle() { + this.render_data.forEach(item => { + let airlinesLinkIndex = this.airlines.findIndex(val => val.airlineCode === item['airlineCode']); + item['airlineName'] = this.airlines[airlinesLinkIndex].airlineName; + }) + } + + //机型数据转换处理 + basicDataTransHandle() { + this.render_data.forEach(item => { + let aircraftTypesLinkIndex = this.aircraftTypes.findIndex(val => val.aircraftTypeCode === item['aircraftTypeCode']); + item['aircraftTypeName'] = this.aircraftTypes[aircraftTypesLinkIndex].aircraftTypeName; + }) + } + /** * 选中某行 * @param i diff --git a/src/app/pages/basic-data/airport/airport.component.html b/src/app/pages/basic-data/airport/airport.component.html index 6372c7f..560cac3 100644 --- a/src/app/pages/basic-data/airport/airport.component.html +++ b/src/app/pages/basic-data/airport/airport.component.html @@ -68,7 +68,7 @@ {{airport.airportCodeCaa}} {{airport.airportCodeIcao}} {{airport.airportGroupId}} - {{airport.cityId}} + {{airport.cityNameChn}} diff --git a/src/app/pages/basic-data/airport/airport.component.ts b/src/app/pages/basic-data/airport/airport.component.ts index b2567fa..58364ef 100644 --- a/src/app/pages/basic-data/airport/airport.component.ts +++ b/src/app/pages/basic-data/airport/airport.component.ts @@ -52,14 +52,24 @@ export class AirportComponent implements OnInit { data => { this.airports = data; this.render_data = data; + if(this.citys && this.citys.length > 0){//城市数据列表转换处理 + this.basicDataTransHandle(); + } } ) this.basicDataService.city_subject.subscribe( - data => this.citys = data + data => { + this.citys = data; + } ) this.basicDataService.airportgroup_subject.subscribe( 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; + }) /** * 固定表头 */ @@ -71,6 +81,13 @@ export class AirportComponent implements OnInit { tableCont.addEventListener('scroll', scrollHandle); } + //城市数据转换处理 + basicDataTransHandle() { + this.render_data.forEach(item => { + let citysLinkIndex = this.citys.findIndex(val => val.cityId === item['cityId']); + item['cityNameChn'] = this.citys[citysLinkIndex].cityNameChn; + }) + } /** * 选中某行 diff --git a/src/app/pages/basic-data/checkin-desk/checkin-desk.component.html b/src/app/pages/basic-data/checkin-desk/checkin-desk.component.html index 292b1e9..4d02c13 100644 --- a/src/app/pages/basic-data/checkin-desk/checkin-desk.component.html +++ b/src/app/pages/basic-data/checkin-desk/checkin-desk.component.html @@ -63,8 +63,8 @@ {{i+1}} {{checkinDesk.checkindeskCode}} {{checkinDesk.checkindeskName}} - {{checkinDesk.checkinGroupCode}} - {{checkinDesk.chutCode}} + {{checkinDesk.checkinGroupName}} + {{checkinDesk.chutName}} {{checkinDesk.terminalAreaCode|terminalArea}} 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 da2be7d..5838b1f 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 @@ -50,6 +50,12 @@ export class CheckinDeskComponent implements OnInit { data => { this.checkinDesks = data; this.render_data = data; + if(this.checkinGroups && this.checkinGroups.length > 0){//值机岛列表数据转换 + this.basicDataTransHandle(); + } + if(this.chuts && this.chuts.length > 0){//行李传送带列表数据转换 + this.chutsHandle(); + } } ) this.basicDataService.terminal_area_subject.subscribe( @@ -67,6 +73,15 @@ 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; + }) /** * 固定表头 */ @@ -78,6 +93,22 @@ export class CheckinDeskComponent implements OnInit { tableCont.addEventListener('scroll', scrollHandle); } + //值机岛数据转换处理 + basicDataTransHandle() { + this.render_data.forEach(item => { + let checkinGroupsLinkIndex = this.checkinGroups.findIndex(val => val.checkinGroupCode === item['checkinGroupCode']); + item['checkinGroupName'] = this.checkinGroups[checkinGroupsLinkIndex].checkinGroupName; + }) + } + + //行李传送带数据转换处理 + chutsHandle() { + this.render_data.forEach(item => { + let chutsLinkIndex = this.chuts.findIndex(val => val.chutCode === item['chutCode']); + item['chutName'] = this.chuts[chutsLinkIndex].chutName; + }) + } + /** * 选中某行 * @param i diff --git a/src/app/pages/basic-data/city/city.component.html b/src/app/pages/basic-data/city/city.component.html index bfbedce..d8558e6 100644 --- a/src/app/pages/basic-data/city/city.component.html +++ b/src/app/pages/basic-data/city/city.component.html @@ -48,7 +48,7 @@ {{city.cityCode}} {{city.cityNameChn}} {{city.cityNameEng}} - {{city.countryId}} + {{city.countryNameChn}} diff --git a/src/app/pages/basic-data/city/city.component.ts b/src/app/pages/basic-data/city/city.component.ts index f7d4a54..45091db 100644 --- a/src/app/pages/basic-data/city/city.component.ts +++ b/src/app/pages/basic-data/city/city.component.ts @@ -46,8 +46,17 @@ export class CityComponent implements OnInit { } ) this.basicDataService.country_subject.subscribe( - data => this.countrys = data + data => { + this.countrys = data + if(this.countrys && this.countrys.length > 0){//国家列表数据转换 + this.basicDataTransHandle(); + } + } ) + this.render_data.forEach(item => {//国家数据转换处理 + let countryLinkIndex = this.countrys.findIndex(val => val.countryId === item['countryId']); + item['countryNameChn'] = this.countrys[countryLinkIndex].countryNameChn; + }) /** * 固定表头 */ @@ -59,6 +68,13 @@ export class CityComponent implements OnInit { tableCont.addEventListener('scroll', scrollHandle); } + //国家数据转换处理 + basicDataTransHandle() { + this.render_data.forEach(item => { + let countryLinkIndex = this.countrys.findIndex(val => val.countryId === item['countryId']); + item['countryNameChn'] = this.countrys[countryLinkIndex].countryNameChn; + }) + } /** * 选中某行 * @param i