From 2ce48cc7573da47afa137c6ee8284f8d423c48a0 Mon Sep 17 00:00:00 2001
From: "714943302@qq.com" <you@example.com>
Date: Tue, 11 Dec 2018 09:33:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=9C=BA=E9=9B=86=E5=9B=A2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=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

---
 .../basic-data/airport/airport.component.html |  2 +-
 .../basic-data/airport/airport.component.ts   | 24 ++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/app/pages/basic-data/airport/airport.component.html b/src/app/pages/basic-data/airport/airport.component.html
index 560cac3..d69f1b4 100644
--- a/src/app/pages/basic-data/airport/airport.component.html
+++ b/src/app/pages/basic-data/airport/airport.component.html
@@ -67,7 +67,7 @@
                           <td>{{airport.airportCodeIata}}</td>
                           <td>{{airport.airportCodeCaa}}</td>
                           <td>{{airport.airportCodeIcao}}</td>
-                          <td>{{airport.airportGroupId}}</td>
+                          <td>{{airport.airportGroupName}}</td>
                           <td>{{airport.cityNameChn}}</td>
                       </tr>
                   </tbody>
diff --git a/src/app/pages/basic-data/airport/airport.component.ts b/src/app/pages/basic-data/airport/airport.component.ts
index 012025d..0a6dc4a 100644
--- a/src/app/pages/basic-data/airport/airport.component.ts
+++ b/src/app/pages/basic-data/airport/airport.component.ts
@@ -22,7 +22,7 @@ export class AirportComponent implements OnInit {
         { col_code: 'airportCodeIata', col_chn: 'IATA码' },
         { col_code: 'airportCodeCaa', col_chn: 'CAA码' },
         { col_code: 'airportCodeIcao', col_chn: 'ICAO码' },
-        { col_code: 'airportGroupId', col_chn: '机场集团' },
+        { col_code: 'airportGroupName', col_chn: '机场集团' },
         { col_code: 'cityNameChn', col_chn: '所在城市' },
     ]
 
@@ -55,6 +55,7 @@ export class AirportComponent implements OnInit {
                 if(this.citys && this.citys.length > 0){//城市数据列表转换处理
                     this.basicDataTransHandle();
                 }
+                
             }
         )
         this.basicDataService.city_subject.subscribe(
@@ -63,11 +64,18 @@ export class AirportComponent implements OnInit {
             }
         )
         this.basicDataService.airportgroup_subject.subscribe(
-            data => this.airportgroups = data
+            data => {
+                this.airportgroups = data
+                if(this.airportgroups && this.airportgroups.length > 0){//机场集团数据列表转换处理
+                    this.airportgroupsHandle();
+                }
+            }
         )
-        //城市数据转换处理
         if(this.render_data){
+            //城市数据转换处理
             this.basicDataTransHandle();
+            //机场集团数据转换处理
+            this.airportgroupsHandle();
         }
         /**
          * 固定表头
@@ -80,6 +88,16 @@ export class AirportComponent implements OnInit {
         tableCont.addEventListener('scroll', scrollHandle);
     }
 
+    //机场集团数据转换处理
+    airportgroupsHandle() {
+        this.render_data.forEach(item => {
+            let airportgroupsLinkIndex = this.airportgroups.findIndex(val => val.airportGroupId === item['airportGroupId']);
+            if(this.airportgroups[airportgroupsLinkIndex]){
+                item['airportGroupName'] = this.airportgroups[airportgroupsLinkIndex].airportGroupName;
+            }
+        })
+    }
+
     //城市数据转换处理
     basicDataTransHandle() {
         this.render_data.forEach(item => {