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

---
 .../carousel/carousel.component.html          | 17 ++++----
 .../basic-data/carousel/carousel.component.ts | 13 +++++-
 src/assets/mock-data/carousel-data.json       | 42 +++++++++----------
 3 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/src/app/pages/basic-data/carousel/carousel.component.html b/src/app/pages/basic-data/carousel/carousel.component.html
index 006fb27..8492f7c 100644
--- a/src/app/pages/basic-data/carousel/carousel.component.html
+++ b/src/app/pages/basic-data/carousel/carousel.component.html
@@ -26,18 +26,19 @@
           <div class="second-condition mb-3 row">
             <div class="input-container mr-4">
               <label for="">所属航站楼区域：&nbsp;&nbsp;</label>
-              <select  class="form-control">
-                  <option value=""></option>
-                  <option value="GH">国内区域</option>
-                  <option value="CH">国外区域</option>
+              <select  class="form-control" [(ngModel)]="filterItems.HZ" (ngModelChange)="inputFliter()">
+                   <option value=""></option>
+                   <option value="GH">国内区域</option>
+                   <option value="CH">国际区域</option>
+                   <option value="QT">其他区域</option>
               </select>
           </div>
           <div class="input-container mr-4">
               <label for="">资源状态：&nbsp;&nbsp;</label>
-              <select  class="form-control">
-                  <option value=""></option>
-                  <option value="GH">可用</option>
-                  <option value="CH">不可用</option>
+              <select  class="form-control" [(ngModel)]="filterItems.ZY" (ngModelChange)="inputFliter()">
+                   <option value=""></option>
+                   <option value="K">可用</option>
+                   <option value="R">不可用</option>
               </select>
           </div>
         </div>
diff --git a/src/app/pages/basic-data/carousel/carousel.component.ts b/src/app/pages/basic-data/carousel/carousel.component.ts
index f20f411..c83334d 100644
--- a/src/app/pages/basic-data/carousel/carousel.component.ts
+++ b/src/app/pages/basic-data/carousel/carousel.component.ts
@@ -45,10 +45,21 @@ FLT_POS = 1;    //过滤还是定位
 SEL_COL = '';   //选择列名
 
 public filterItems = {
-
+    HZ: '',    //所属航站楼区域
+    ZY: '',    //资源状态
 }
 
 public formatter = {
+    'HZ': {
+        'GH': '国内区域',
+        'CH': '国际区域',
+        "QT": '其他区域'
+    },
+    'ZY': {
+        'K': '可用',
+        'R': '不可用',
+        "T": '其他'
+    },
     'SODT': dateFormatter,
     'ESTT': dateFormatter,
     'ACTT': dateFormatter
diff --git a/src/assets/mock-data/carousel-data.json b/src/assets/mock-data/carousel-data.json
index b772104..d8b8f14 100644
--- a/src/assets/mock-data/carousel-data.json
+++ b/src/assets/mock-data/carousel-data.json
@@ -1,7 +1,7 @@
 [
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"一号行李转盘\", \"FLNO\": \"1\", \"HZ\": \"2号楼国内区\", \"ZY\": \"可用\"}",
+        "value": "{\"ALCD\": \"一号登机口\", \"FLNO\": \"1\", \"HZ\": \"QT\", \"ZY\": \"R\"}",
         "offset": 1988,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -9,7 +9,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"一号行李转盘\", \"FLNO\": \"2\", \"HZ\": \"2号楼国内区\", \"ZY\": \"可用\"}",
+        "value": "{\"ALCD\": \"一号登机口\", \"FLNO\": \"2\", \"HZ\": \"GH\", \"ZY\": \"R\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -17,7 +17,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"一号行李转盘\", \"FLNO\": \"2\", \"HZ\": \"2号楼国内区\", \"ZY\": \"可用\"}",
+        "value": "{\"ALCD\": \"一号登机口\", \"FLNO\": \"2\", \"HZ\": \"CH\", \"ZY\": \"R\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -25,7 +25,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"一号行李转盘\", \"FLNO\": \"2\", \"HZ\": \"2号楼国内区\", \"ZY\": \"可用\"}",
+        "value": "{\"ALCD\": \"一号登机口\", \"FLNO\": \"2\", \"HZ\": \"GH\", \"ZY\": \"K\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -33,7 +33,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"一号行李转盘\", \"FLNO\": \"2\", \"HZ\": \"2号楼国内区\", \"ZY\": \"可用\"}",
+        "value": "{\"ALCD\": \"一号登机口\", \"FLNO\": \"2\", \"HZ\": \"CH\", \"ZY\": \"R\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -41,7 +41,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"一号行李转盘\", \"FLNO\": \"2\", \"HZ\": \"2号楼国内区\", \"ZY\": \"可用\"}",
+        "value": "{\"ALCD\": \"一号登机口\", \"FLNO\": \"2\", \"HZ\": \"GH\", \"ZY\": \"R\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -49,7 +49,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"一号行李转盘\", \"FLNO\": \"2\", \"HZ\": \"2号楼国内区\", \"ZY\": \"可用\"}",
+        "value": "{\"ALCD\": \"一号登机口\", \"FLNO\": \"2\", \"HZ\": \"CH\", \"ZY\": \"K\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -57,7 +57,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"一号行李转盘\", \"FLNO\": \"2\", \"HZ\": \"2号楼国内区\", \"ZY\": \"可用\"}",
+        "value": "{\"ALCD\": \"一号登机口\", \"FLNO\": \"2\", \"HZ\": \"GH\", \"ZY\": \"K\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -65,7 +65,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"一号行李转盘\", \"FLNO\": \"2\", \"HZ\": \"2号楼国内区\", \"ZY\": \"可用\"}",
+        "value": "{\"ALCD\": \"一号登机口\", \"FLNO\": \"2\", \"HZ\": \"CH\", \"ZY\": \"K\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -73,7 +73,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"一号行李转盘\", \"FLNO\": \"2\", \"HZ\": \"2号楼国内区\", \"ZY\": \"可用\"}",
+        "value": "{\"ALCD\": \"一号登机口\", \"FLNO\": \"2\", \"HZ\": \"QT\", \"ZY\": \"K\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -81,7 +81,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"一号行李转盘\", \"FLNO\": \"2\", \"HZ\": \"2号楼国内区\", \"ZY\": \"可用\"}",
+        "value": "{\"ALCD\": \"一号登机口\", \"FLNO\": \"2\", \"HZ\": \"CH\", \"ZY\": \"K\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -89,7 +89,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"一号行李转盘\", \"FLNO\": \"2\", \"HZ\": \"2号楼国内区\", \"ZY\": \"可用\"}",
+        "value": "{\"ALCD\": \"一号登机口\", \"FLNO\": \"2\", \"HZ\": \"QT\", \"ZY\": \"K\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -97,7 +97,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"一号行李转盘\", \"FLNO\": \"2\", \"HZ\": \"2号楼国内区\", \"ZY\": \"可用\"}",
+        "value": "{\"ALCD\": \"一号登机口\", \"FLNO\": \"2\", \"HZ\": \"CH\", \"ZY\": \"K\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -105,7 +105,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"一号行李转盘\", \"FLNO\": \"2\", \"HZ\": \"2号楼国内区\", \"ZY\": \"可用\"}",
+        "value": "{\"ALCD\": \"一号登机口\", \"FLNO\": \"2\", \"HZ\": \"CH\", \"ZY\": \"K\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -113,7 +113,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"一号行李转盘\", \"FLNO\": \"2\", \"HZ\": \"2号楼国内区\", \"ZY\": \"可用\"}",
+        "value": "{\"ALCD\": \"一号登机口\", \"FLNO\": \"2\", \"HZ\": \"CH\", \"ZY\": \"K\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -121,7 +121,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"一号行李转盘\", \"FLNO\": \"2\", \"HZ\": \"2号楼国内区\", \"ZY\": \"可用\"}",
+        "value": "{\"ALCD\": \"一号登机口\", \"FLNO\": \"2\", \"HZ\": \"CH\", \"ZY\": \"K\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -129,7 +129,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"一号行李转盘\", \"FLNO\": \"2\", \"HZ\": \"2号楼国内区\", \"ZY\": \"可用\"}",
+        "value": "{\"ALCD\": \"一号登机口\", \"FLNO\": \"2\", \"HZ\": \"CH\", \"ZY\": \"K\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -137,7 +137,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"一号行李转盘\", \"FLNO\": \"2\", \"HZ\": \"2号楼国内区\", \"ZY\": \"可用\"}",
+        "value": "{\"ALCD\": \"一号登机口\", \"FLNO\": \"2\", \"HZ\": \"CH\", \"ZY\": \"K\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -145,7 +145,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"一号行李转盘\", \"FLNO\": \"2\", \"HZ\": \"2号楼国内区\", \"ZY\": \"可用\"}",
+        "value": "{\"ALCD\": \"一号登机口\", \"FLNO\": \"2\", \"HZ\": \"CH\", \"ZY\": \"K\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -153,7 +153,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"一号行李转盘\", \"FLNO\": \"2\", \"HZ\": \"2号楼国内区\", \"ZY\": \"可用\"}",
+        "value": "{\"ALCD\": \"一号登机口\", \"FLNO\": \"2\", \"HZ\": \"CH\", \"ZY\": \"K\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -161,7 +161,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"一号行李转盘\", \"FLNO\": \"2\", \"HZ\": \"2号楼国内区\", \"ZY\": \"可用\"}",
+        "value": "{\"ALCD\": \"一号登机口\", \"FLNO\": \"2\", \"HZ\": \"CH\", \"ZY\": \"K\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,