From 8a69428675ff5123d9356bc88820e55ee81ef565 Mon Sep 17 00:00:00 2001
From: "714943302@qq.com" <you@example.com>
Date: Thu, 15 Nov 2018 18:01:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=9E=8B=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=8F=8A=E7=B2=BE=E7=A1=AE=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aircraft-type.component.html              | 10 ++---
 .../aircraft-type/aircraft-type.component.ts  | 12 +++++-
 src/assets/mock-data/aircraft-type-data.json  | 42 +++++++++----------
 3 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/src/app/pages/basic-data/aircraft-type/aircraft-type.component.html b/src/app/pages/basic-data/aircraft-type/aircraft-type.component.html
index 5cf7aa7..534ecf7 100644
--- a/src/app/pages/basic-data/aircraft-type/aircraft-type.component.html
+++ b/src/app/pages/basic-data/aircraft-type/aircraft-type.component.html
@@ -27,7 +27,7 @@
             <div class="second-condition mb-3 row">
               <div class="input-container mr-4">
                 <label for="">航空公司：&nbsp;&nbsp;</label>
-                <select  class="form-control">
+                <select  class="form-control" [(ngModel)]="filterItems.HK" (ngModelChange)="inputFliter()">
                     <option value=""></option>
                     <option value="GH">海南航空公司</option>
                     <option value="CH">国外航空公司</option>
@@ -35,11 +35,11 @@
             </div>
             <div class="input-container mr-4">
                 <label for="">机型：&nbsp;&nbsp;</label>
-                <select  class="form-control">
+                <select  class="form-control" [(ngModel)]="filterItems.JX" (ngModelChange)="inputFliter()">
                     <option value=""></option>
-                    <option value="0">A306</option>
-                    <option value="1">A252</option>
-                    <option value="2">A256</option>
+                    <option value="A">A306</option>
+                    <option value="B">B252</option>
+                    <option value="C">C256</option>
                 </select>
             </div>
           </div>
diff --git a/src/app/pages/basic-data/aircraft-type/aircraft-type.component.ts b/src/app/pages/basic-data/aircraft-type/aircraft-type.component.ts
index 8719cfe..5f6b88d 100644
--- a/src/app/pages/basic-data/aircraft-type/aircraft-type.component.ts
+++ b/src/app/pages/basic-data/aircraft-type/aircraft-type.component.ts
@@ -45,10 +45,20 @@ FLT_POS = 1;    //过滤还是定位
 SEL_COL = '';   //选择列名
 
 public filterItems = {
-    
+    HK: '',    //航空公司
+    JX: '',    //机型
 }
 
 public formatter = {
+    'HK': {
+        'GH': '海南航空公司',
+        'CH': '国外航空公司'
+    },
+    'JX': {
+        'A': 'A306',
+        'B': 'B252',
+        "C": 'C256'
+    },
     'SODT': dateFormatter,
     'ESTT': dateFormatter,
     'ACTT': dateFormatter
diff --git a/src/assets/mock-data/aircraft-type-data.json b/src/assets/mock-data/aircraft-type-data.json
index 9225d48..fb6c9f4 100644
--- a/src/assets/mock-data/aircraft-type-data.json
+++ b/src/assets/mock-data/aircraft-type-data.json
@@ -1,7 +1,7 @@
 [
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"海南航空公司\", \"JX\": \"B8888\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"B\"}",
         "offset": 1988,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -9,7 +9,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"海南航空公司\", \"JX\": \"B8888\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"CH\", \"JX\": \"C\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -17,7 +17,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"海南航空公司\", \"JX\": \"B8888\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"CH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -25,7 +25,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"海南航空公司\", \"JX\": \"B8888\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"C\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -33,7 +33,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"海南航空公司\", \"JX\": \"B8888\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"CH\", \"JX\": \"B\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -41,7 +41,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"海南航空公司\", \"JX\": \"B8888\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -49,7 +49,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"海南航空公司\", \"JX\": \"B8888\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"CH\", \"JX\": \"B\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -57,7 +57,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"海南航空公司\", \"JX\": \"B8888\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"C\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -65,7 +65,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"海南航空公司\", \"JX\": \"B8888\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -73,7 +73,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"海南航空公司\", \"JX\": \"B8888\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -81,7 +81,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"海南航空公司\", \"JX\": \"B8888\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -89,7 +89,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"海南航空公司\", \"JX\": \"B8888\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -97,7 +97,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"海南航空公司\", \"JX\": \"B8888\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -105,7 +105,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"海南航空公司\", \"JX\": \"B8888\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -113,7 +113,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"海南航空公司\", \"JX\": \"B8888\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -121,7 +121,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"海南航空公司\", \"JX\": \"B8888\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -129,7 +129,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"海南航空公司\", \"JX\": \"B8888\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -137,7 +137,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"海南航空公司\", \"JX\": \"B8888\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -145,7 +145,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"海南航空公司\", \"JX\": \"B8888\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -153,7 +153,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"海南航空公司\", \"JX\": \"B8888\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -161,7 +161,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"海南航空公司\", \"JX\": \"B8888\"}",
+        "value": "{\"ALCD\": \"415\", \"FLNO\": \"B6532\", \"HZ\": \"926999.0\", \"ZY\": \"9999.0\", \"LQ\": \"2\", \"ZJ\": \"海南航空公司\", \"HK\": \"GH\", \"JX\": \"A\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,