From 8cb3f94bf489c50db23603294a0bd0cdcdd337b9 Mon Sep 17 00:00:00 2001
From: "714943302@qq.com" <you@example.com>
Date: Mon, 26 Nov 2018 17:41:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=9C=BA=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/basic-data/airport/airport.component.html | 2 +-
 src/app/pages/basic-data/airport/airport.component.ts   | 9 ++++++++-
 src/app/pages/basic-data/city/city.component.html       | 8 ++++----
 3 files changed, 13 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 38f70a8..c5339e9 100644
--- a/src/app/pages/basic-data/airport/airport.component.html
+++ b/src/app/pages/basic-data/airport/airport.component.html
@@ -52,7 +52,7 @@
                   <!-- <option value="GZ">广州</option>
                   <option value="SH">上海</option>
                   <option value="BJ">北京</option> -->
-                  <option *ngFor="let item of airports" [value]="item.cityId">{{item.cityId}}</option>
+                  <option *ngFor="let item of citys" [value]="item.cityNameChn">{{item.cityNameChn}}</option>
               </select>
           </div>
         </div>
diff --git a/src/app/pages/basic-data/airport/airport.component.ts b/src/app/pages/basic-data/airport/airport.component.ts
index 9336e4d..42ba007 100644
--- a/src/app/pages/basic-data/airport/airport.component.ts
+++ b/src/app/pages/basic-data/airport/airport.component.ts
@@ -25,7 +25,7 @@ public filterItems = {
     airportGroupId:'',
     cityId:'',
 }
-
+citys : Array<any>; //城市
 airports : Array<any>;
 public row_state: any = { renderFlight: {} };
 public render_data: Array<object> = [];  //显示数据，即需要显示的数据
@@ -39,6 +39,13 @@ ngOnInit() {
             this.render_data = this.airports;
         }
     )
+    //城市
+    this.citys = this.basicDataService.city;
+    this.basicDataService.city_subject.subscribe(
+        data=>{
+            this.citys = data;
+        }
+    )
     /**
      * 固定表头
      */
diff --git a/src/app/pages/basic-data/city/city.component.html b/src/app/pages/basic-data/city/city.component.html
index 0d6507a..4b2b006 100644
--- a/src/app/pages/basic-data/city/city.component.html
+++ b/src/app/pages/basic-data/city/city.component.html
@@ -31,12 +31,12 @@
           </div>
 
           <div class="second-condition mb-3 row">
-            <div class="input-container mr-4">
+            <!-- <div class="input-container mr-4">
               <label for="">洲/地区：&nbsp;&nbsp;</label>
               <select  class="form-control">
                   <option value=""></option>
               </select>
-          </div>
+            </div> -->
           <div class="input-container mr-4">
               <label for="countryId">国家：&nbsp;&nbsp;</label>
               <select  class="form-control"  [(ngModel)]="filterItems.countryId" (ngModelChange)="selectChange()" id="citry">
@@ -48,10 +48,10 @@
               </select>
           </div>
           <div class="third-condition row">
-            <label class="radio-inline custom-checkbox nowrap checkInfo mr-4">
+            <!-- <label class="radio-inline custom-checkbox nowrap checkInfo mr-4">
                 <input type="checkbox">
                 <span>洲/地区-国家关联</span>
-            </label>
+            </label> -->
             <label class="radio-inline custom-checkbox nowrap checkInfo mr-4">
                 <input type="checkbox">
                 <span>国家-城市关联</span>