From 6407b9d85e352e2244e5dc458a38d9f7aded3bd3 Mon Sep 17 00:00:00 2001
From: "714943302@qq.com" <you@example.com>
Date: Mon, 10 Dec 2018 16:21:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A3=E5=BA=A6=E8=AE=A1=E5=88=92-=E8=88=AA?=
 =?UTF-8?q?=E5=93=A5=E8=88=AA=E7=A9=BA=E3=80=81=E6=9C=BA=E5=9E=8B=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=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

---
 .../seasonal-plan.component.html              |  4 +--
 .../seasonal-plan/seasonal-plan.component.ts  | 25 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 3 deletions(-)

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 @@
                       <option value="arriOrDept">进/出港</option>
                       <option value="arrivalTime">到达时间</option>
                       <option value="departureTime">出发时间</option>
-                      <option value="aircraftTypeCode">机型</option>
+                      <option value="aircraftTypeName">机型</option>
                       <option value="flyingDistance">飞行距离(千米)</option>
                       <option value="flyingTime">飞行时间(分钟)</option>
                      <!--  <option *ngFor="let col of col_lists" [value]="col.col_code">{{col.col_chn}}</option> -->
@@ -159,7 +159,7 @@
                           <td>{{seasonal.arriOrDept}}</td>
                           <td>{{seasonal.arrivalTime}}</td>
                           <td>{{seasonal.departureTime}}</td>
-                          <td>{{seasonal.aircraftTypeCode}}</td>
+                          <td>{{seasonal.aircraftTypeName}}</td>
                           <td>{{seasonal.flyingDistance}}</td>
                           <td>{{seasonal.flyingTime}}</td>
                          <!--  <td *ngFor="let seasonal of seasonal_lists" [ngStyle]="{'background-color':getColor(seasonal.COL_CODE)}">{{airline_row['renderFlight'][seasonal.COL_CODE]}}</td> -->
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<any>; 
     airlines : Array<any>; //航空公司
+    aircraftTypes : Array<any>; //机型
     public row_state: any = { renderFlight: {} };
     public render_data: Array<object> = [];  //显示数据，即需要显示的数据
     public return_data: Array<object> = []; //下拉框显示数据
@@ -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;
+            }
         })
     }