From 4c6e4d9567fcdbf0df9fcdd736a1a0f15a37c5fa Mon Sep 17 00:00:00 2001
From: "714943302@qq.com" <you@example.com>
Date: Tue, 27 Nov 2018 12:02:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=9E=E6=9C=BA-=E6=9C=BA=E5=9E=8B=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=BD=AC=E6=8D=A2=E4=BF=A1=E6=81=AF=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.html    | 14 +++++++-------
 .../basic-data/aircraft/aircraft.component.ts      |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/app/pages/basic-data/aircraft/aircraft.component.html b/src/app/pages/basic-data/aircraft/aircraft.component.html
index 7f7ce0b..ef98737 100644
--- a/src/app/pages/basic-data/aircraft/aircraft.component.html
+++ b/src/app/pages/basic-data/aircraft/aircraft.component.html
@@ -11,8 +11,8 @@
                         <option value="maxTakeoffWeight">最大起飞重量</option>
                         <option value="maxAirbridges">最大廊桥数</option>
                         <option value="aircraftOwnerCode">机主航空公司</option>
-                        <option value="airlineCode">航空公司</option>
-                        <option value="aircraftTypeCode">机型</option>
+                        <option value="airlineName">航空公司</option>
+                        <option value="aircraftTypeName">机型</option>
                     </select>
                     <label class="radio-inline custom-radio nowrap mr-4">
                         <input type="radio" [(ngModel)]="FLT_POS" [value]="1" name="filter-position">
@@ -28,7 +28,7 @@
                     <!-- <button type="button" class="btn btn-info mr-3">打印</button>
                     <button type="button" class="btn btn-info mr-3">飞机登记</button>
                     <button type="button" class="btn btn-info mr-3">定制查询</button> -->
-                    <button type="button" class="btn btn-info mr-3">刷新</button>
+                    <!-- <button type="button" class="btn btn-info mr-3">刷新</button> -->
                 </div>
             </div>
   
@@ -37,14 +37,14 @@
                 <label for="airlineCode">航空公司：&nbsp;&nbsp;</label>
                 <select  class="form-control" [(ngModel)]="filterItems.airlineCode" (ngModelChange)="selectChange()" id="airlineCompany">
                     <option value=""></option>
-                    <option *ngFor="let item of airlines" [value]="item.airlineName">{{item.airlineName}}</option>
+                    <option *ngFor="let item of airlines" [value]="item.airlineCode">{{item.airlineName}}</option>
                 </select>
             </div>
             <div class="input-container mr-4">
                 <label for="aircraftTypeCode">机型：&nbsp;&nbsp;</label>
                 <select  class="form-control" [(ngModel)]="filterItems.aircraftTypeCode" (ngModelChange)="selectChange()" id="jx">
                     <option value=""></option>
-                    <option *ngFor="let item of aircraftTypes" [value]="item.aircraftTypeName">{{item.aircraftTypeName}}</option>
+                    <option *ngFor="let item of aircraftTypes" [value]="item.aircraftTypeCode">{{item.aircraftTypeName}}</option>
                 </select>
             </div>
           </div>
@@ -77,8 +77,8 @@
                             <td>{{aircraft.maxTakeoffWeight}}</td>
                             <td>{{aircraft.maxAirbridges}}</td>
                             <td>{{aircraft.aircraftOwnerCode}}</td>
-                            <td>{{aircraft.airlineCode}}</td>
-                            <td>{{aircraft.aircraftTypeCode}}</td>
+                            <td>{{aircraft.airlineName}}</td>
+                            <td>{{aircraft.aircraftTypeName}}</td>
                             <!-- <td *ngFor="let airline_col of aircraft_lists" [ngStyle]="{'background-color':getColor(airline_col.COL_CODE)}">{{airline_row['renderFlight'][airline_col.COL_CODE]}}</td> -->
                         </tr>
                     </tbody>
diff --git a/src/app/pages/basic-data/aircraft/aircraft.component.ts b/src/app/pages/basic-data/aircraft/aircraft.component.ts
index 90ada75..ff52b43 100644
--- a/src/app/pages/basic-data/aircraft/aircraft.component.ts
+++ b/src/app/pages/basic-data/aircraft/aircraft.component.ts
@@ -76,7 +76,7 @@ basicDataTransHandle() {
     this.render_data.forEach(item => {
         //机型数据转换处理
         let aircraftTypesLinkIndex = this.aircraftTypes.findIndex(val => val.aircraftTypeCode === item['aircraftTypeCode']);
-        item['aircraftTypeCode'] = this.aircraftTypes[aircraftTypesLinkIndex].aircraftTypeName;
+        item['aircraftTypeName'] = this.aircraftTypes[aircraftTypesLinkIndex].aircraftTypeName;
     })
 }
 
@@ -84,7 +84,7 @@ basicDataAirlinesHandle() {
     this.render_data.forEach(item => {
         //航空公司数据处理
         let airlinesLinkIndex = this.airlines.findIndex(val => val.airlineCode === item['airlineCode']);
-        item['airlineCode'] = this.airlines[airlinesLinkIndex].airlineName;
+        item['airlineName'] = this.airlines[airlinesLinkIndex].airlineName;
     })
 }
 /**