From a48b40710dec8454a96b92265ce00f2432f698c2 Mon Sep 17 00:00:00 2001
From: "714943302@qq.com" <you@example.com>
Date: Tue, 27 Nov 2018 11:51:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=9C=BA-=E5=9F=8E=E5=B8=82=E3=80=81?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=89=80=E5=9C=A8=E5=9F=8E=E5=B8=82=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=A4=84=E7=90=86=E5=8F=8A=E9=80=89=E6=8B=A9=E5=88=97?=
 =?UTF-8?q?=E5=90=8D=E3=80=81=E8=BF=87=E6=BB=A4=E3=80=81=E6=9F=A5=E6=89=BE?=
 =?UTF-8?q?=E5=AE=9A=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/basic-data/airport/airport.component.html | 8 ++++----
 src/app/pages/basic-data/airport/airport.component.ts   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/pages/basic-data/airport/airport.component.html b/src/app/pages/basic-data/airport/airport.component.html
index c5339e9..6cd49cc 100644
--- a/src/app/pages/basic-data/airport/airport.component.html
+++ b/src/app/pages/basic-data/airport/airport.component.html
@@ -14,7 +14,7 @@
                             <option value="airportCodeCaa">CAA码</option>
                             <option value="airportCodeIcao">ICAO码</option>
                             <option value="airportGroupId">机场集团</option>
-                            <option value="cityId">所在城市</option>
+                            <option value="cityName">所在城市</option>
                     </select>
                     <label class="radio-inline custom-radio nowrap mr-4">
                             <input type="radio" [(ngModel)]="FLT_POS" [value]="1" name="filter-position">
@@ -31,7 +31,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>
 
@@ -52,7 +52,7 @@
                   <!-- <option value="GZ">广州</option>
                   <option value="SH">上海</option>
                   <option value="BJ">北京</option> -->
-                  <option *ngFor="let item of citys" [value]="item.cityNameChn">{{item.cityNameChn}}</option>
+                  <option *ngFor="let item of citys" [value]="item.cityId">{{item.cityNameChn}}</option>
               </select>
           </div>
         </div>
@@ -90,7 +90,7 @@
                           <td>{{airport.airportCodeCaa}}</td>
                           <td>{{airport.airportCodeIcao}}</td>
                           <td>{{airport.airportGroupId}}</td>
-                          <td>{{airport.cityId}}</td>
+                          <td>{{airport.cityName}}</td>
                           <!-- <td *ngFor="let airline_col of airport_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/airport/airport.component.ts b/src/app/pages/basic-data/airport/airport.component.ts
index 6978f42..d3ddbb9 100644
--- a/src/app/pages/basic-data/airport/airport.component.ts
+++ b/src/app/pages/basic-data/airport/airport.component.ts
@@ -64,7 +64,7 @@ ngOnInit() {
 basicDataTransHandle() {
     this.render_data.forEach(item => {
         let citysLinkIndex = this.citys.findIndex(val => val.cityId === item['cityId']);
-        item['cityId'] = this.citys[citysLinkIndex].cityNameChn;
+        item['cityName'] = this.citys[citysLinkIndex].cityNameChn;
     })
 }
 
@@ -92,7 +92,7 @@ selectChange() {
             let is_satis = true;
             for (const key in this.filterItems) {
                 if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) {
-                    if (item[key] === this.filterItems[key]) {
+                    if (item[key] === +this.filterItems[key] || item[key] === this.filterItems[key]) {
                         is_satis = true;
                         continue;
                     } else {