From f5b69ae78f49ead588c28caf46d4478e50696050 Mon Sep 17 00:00:00 2001
From: "714943302@qq.com" <you@example.com>
Date: Mon, 10 Dec 2018 13:54:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic-data/aircraft/aircraft.component.ts    | 16 ++++++----------
 .../basic-data/airport/airport.component.ts      |  7 +++----
 .../checkin-desk/checkin-desk.component.ts       | 16 +++++++---------
 src/app/pages/basic-data/city/city.component.ts  |  8 ++++----
 4 files changed, 20 insertions(+), 27 deletions(-)

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();
+        }
         /**
          * 固定表头
          */