From 9be90eabe25ba82ced2d765ae79d21728bcabe4e Mon Sep 17 00:00:00 2001
From: "714943302@qq.com" <you@example.com>
Date: Fri, 16 Nov 2018 14:18:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=8E=E5=B8=82=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

---
 .../pages/basic-data/city/city.component.html |  8 ++--
 .../pages/basic-data/city/city.component.ts   |  7 +++-
 src/assets/mock-data/checkin-data.json        | 42 +++++++++----------
 src/assets/mock-data/checkin-group.json       |  2 +-
 src/assets/mock-data/city-data.json           | 42 +++++++++----------
 5 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/src/app/pages/basic-data/city/city.component.html b/src/app/pages/basic-data/city/city.component.html
index a8412a2..f74993a 100644
--- a/src/app/pages/basic-data/city/city.component.html
+++ b/src/app/pages/basic-data/city/city.component.html
@@ -37,11 +37,11 @@
           </div>
           <div class="input-container mr-4">
               <label for="">国家：&nbsp;&nbsp;</label>
-              <select  class="form-control">
+              <select  class="form-control"  [(ngModel)]="filterItems.ZY" (ngModelChange)="inputFliter()">
                   <option value=""></option>
-                  <option value="0">中国</option>
-                  <option value="1">美国</option>
-                  <option value="2">英国</option>
+                  <option value="ZG">中国</option>
+                  <option value="MG">美国</option>
+                  <option value="YG">英国</option>
               </select>
           </div>
           <div class="third-condition row">
diff --git a/src/app/pages/basic-data/city/city.component.ts b/src/app/pages/basic-data/city/city.component.ts
index c0ffe30..953eb14 100644
--- a/src/app/pages/basic-data/city/city.component.ts
+++ b/src/app/pages/basic-data/city/city.component.ts
@@ -45,10 +45,15 @@ FLT_POS = 1;    //过滤还是定位
 SEL_COL = '';   //选择列名
 
 public filterItems = {
-    
+    ZY: '',    //所在国家
 }
 
 public formatter = {
+    'ZY': {
+        'ZG': '中国',
+        'MG': '美国',
+        "YG": '英国'
+    },
     'SODT': dateFormatter,
     'ESTT': dateFormatter,
     'ACTT': dateFormatter
diff --git a/src/assets/mock-data/checkin-data.json b/src/assets/mock-data/checkin-data.json
index 7c93dce..f2d39ef 100644
--- a/src/assets/mock-data/checkin-data.json
+++ b/src/assets/mock-data/checkin-data.json
@@ -1,7 +1,7 @@
 [
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"CZ\", \"FLNO\": \"CZ3402\"}",
+        "value": "{\"ALCD\": \"CZ\", \"FLNOJ\": \"CZ3402\"}",
         "offset": 1988,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -9,7 +9,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"CA\", \"FLNO\": \"CA4513\"}",
+        "value": "{\"ALCD\": \"CA\", \"FLNOJ\": \"CA4513\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -17,7 +17,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"CA\", \"FLNO\": \"CA4513\"}",
+        "value": "{\"ALCD\": \"CA\", \"FLNOJ\": \"CA4513\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -25,7 +25,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"CA\", \"FLNO\": \"CA4513\"}",
+        "value": "{\"ALCD\": \"CA\", \"FLNOJ\": \"CA4513\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -33,7 +33,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"CA\", \"FLNO\": \"CA4513\"}",
+        "value": "{\"ALCD\": \"CA\", \"FLNOJ\": \"CA4513\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -41,7 +41,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"CA\", \"FLNO\": \"CA4513\"}",
+        "value": "{\"ALCD\": \"CA\", \"FLNOJ\": \"CA4513\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -49,7 +49,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"CA\", \"FLNO\": \"CA4513\"}",
+        "value": "{\"ALCD\": \"CA\", \"FLNOJ\": \"CA4513\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -57,7 +57,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"CA\", \"FLNO\": \"CA4513\"}",
+        "value": "{\"ALCD\": \"CA\", \"FLNOJ\": \"CA4513\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -65,7 +65,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"CA\", \"FLNO\": \"CA4513\"}",
+        "value": "{\"ALCD\": \"CA\", \"FLNOJ\": \"CA4513\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -73,7 +73,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"CA\", \"FLNO\": \"CA4513\"}",
+        "value": "{\"ALCD\": \"CA\", \"FLNOJ\": \"CA4513\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -81,7 +81,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"CA\", \"FLNO\": \"CA4513\"}",
+        "value": "{\"ALCD\": \"CA\", \"FLNOJ\": \"CA4513\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -89,7 +89,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"CA\", \"FLNO\": \"CA4513\"}",
+        "value": "{\"ALCD\": \"CA\", \"FLNOJ\": \"CA4513\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -97,7 +97,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"CA\", \"FLNO\": \"CA4513\"}",
+        "value": "{\"ALCD\": \"CA\", \"FLNOJ\": \"CA4513\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -105,7 +105,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"CA\", \"FLNO\": \"CA4513\"}",
+        "value": "{\"ALCD\": \"CA\", \"FLNOJ\": \"CA4513\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -113,7 +113,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"CA\", \"FLNO\": \"CA4513\"}",
+        "value": "{\"ALCD\": \"CA\", \"FLNOJ\": \"CA4513\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -121,7 +121,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"CA\", \"FLNO\": \"CA4513\"}",
+        "value": "{\"ALCD\": \"CA\", \"FLNOJ\": \"CA4513\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -129,7 +129,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"CA\", \"FLNO\": \"CA4513\"}",
+        "value": "{\"ALCD\": \"CA\", \"FLNOJ\": \"CA4513\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -137,7 +137,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"CA\", \"FLNO\": \"CA4513\"}",
+        "value": "{\"ALCD\": \"CA\", \"FLNOJ\": \"CA4513\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -145,7 +145,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"CA\", \"FLNO\": \"CA4513\"}",
+        "value": "{\"ALCD\": \"CA\", \"FLNOJ\": \"CA4513\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -153,7 +153,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"CA\", \"FLNO\": \"CA4513\"}",
+        "value": "{\"ALCD\": \"CA\", \"FLNOJ\": \"CA4513\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -161,7 +161,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"CA\", \"FLNO\": \"CA4513\"}",
+        "value": "{\"ALCD\": \"CA\", \"FLNOJ\": \"CA4513\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
diff --git a/src/assets/mock-data/checkin-group.json b/src/assets/mock-data/checkin-group.json
index 2be516b..25c05e5 100644
--- a/src/assets/mock-data/checkin-group.json
+++ b/src/assets/mock-data/checkin-group.json
@@ -1,6 +1,6 @@
 [
     {
-        "COL_CODE":"FLNO",
+        "COL_CODE":"FLNOJ",
         "COL_CN":"值机岛代码",
         "COL_ORDER":"1"
     },
diff --git a/src/assets/mock-data/city-data.json b/src/assets/mock-data/city-data.json
index 0a2df63..a8583b7 100644
--- a/src/assets/mock-data/city-data.json
+++ b/src/assets/mock-data/city-data.json
@@ -1,7 +1,7 @@
 [
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"埃及\"}",
+        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"ZG\"}",
         "offset": 1988,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -9,7 +9,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"埃及\"}",
+        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"YG\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -17,7 +17,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"埃及\"}",
+        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"MG\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -25,7 +25,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"埃及\"}",
+        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"YG\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -33,7 +33,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"埃及\"}",
+        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"MG\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -41,7 +41,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"埃及\"}",
+        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"ZG\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -49,7 +49,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"埃及\"}",
+        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"MG\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -57,7 +57,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"埃及\"}",
+        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"ZG\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -65,7 +65,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"埃及\"}",
+        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"MG\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -73,7 +73,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"埃及\"}",
+        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"MG\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -81,7 +81,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"埃及\"}",
+        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"MG\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -89,7 +89,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"埃及\"}",
+        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"MG\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -97,7 +97,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"埃及\"}",
+        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"MG\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -105,7 +105,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"埃及\"}",
+        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"MG\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -113,7 +113,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"埃及\"}",
+        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"MG\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -121,7 +121,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"埃及\"}",
+        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"MG\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -129,7 +129,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"埃及\"}",
+        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"MG\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -137,7 +137,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"埃及\"}",
+        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"MG\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -145,7 +145,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"埃及\"}",
+        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"MG\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -153,7 +153,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"埃及\"}",
+        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"MG\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,
@@ -161,7 +161,7 @@
     },
     {
         "topic": "schd",
-        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"埃及\"}",
+        "value": "{\"ALCD\": \"开罗\", \"FLNO\": \"YYJ\", \"HZ\": \"ICAJI\", \"ZY\": \"MG\"}",
         "offset": 1989,
         "partition": 0,
         "highWaterOffset": 3975,