From 4bfc263fa3beafd8fedb707f09cd9d3719cb2eb6 Mon Sep 17 00:00:00 2001
From: zhouyuejun <505127606@qq.com>
Date: Thu, 17 Jan 2019 16:16:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A3=E5=BA=A6=E8=AE=A1=E5=88=92=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91=E5=86=85=E5=AE=B9=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../seasonal-plan.component.html              |  2 +-
 .../seasonal-plan/seasonal-plan.component.ts  | 54 +++++++++----------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.html b/src/app/pages/seasonal-plan/seasonal-plan.component.html
index 8079caa..040afc2 100644
--- a/src/app/pages/seasonal-plan/seasonal-plan.component.html
+++ b/src/app/pages/seasonal-plan/seasonal-plan.component.html
@@ -5,7 +5,7 @@
                 <div class="line-operator-left input-container mb-3 col-xlg-8 col-mlg-8 col-xl-8 col-lg-10">
                     <select class="mr-4 form-control" [(ngModel)]="SEL_COL" name="" id="">
                         <option value="">选择列名</option>
-                        <option *ngFor="let col of col_lists" [value]="col.col_code">{{col.col_chn}}</option>
+                        <option *ngFor="let col of render_col_lists" [value]="col.COL_CODE">{{col.COL_CN}}</option>
                     </select>
                     <label class="radio-inline custom-radio nowrap mr-4">
                         <input type="radio" [(ngModel)]="FLT_POS" [value]="1" name="filter-position">
diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.ts b/src/app/pages/seasonal-plan/seasonal-plan.component.ts
index e1ab54e..afd8525 100644
--- a/src/app/pages/seasonal-plan/seasonal-plan.component.ts
+++ b/src/app/pages/seasonal-plan/seasonal-plan.component.ts
@@ -27,25 +27,25 @@ export class SeasonalPlanComponent implements OnInit {
     }
 
     //选择列名
-    public col_lists = [
-        { col_code: 'flightNumber', col_chn: '航班号' },
-        { col_code: 'seasonRecIdChn', col_chn: '航班季度' },
-        { col_code: 'internationalCode', col_chn: '国际代码' },
-        { col_code: 'airlineChnName', col_chn: '航空公司' },
-        { col_code: 'routeTypeChn', col_chn: '航线类别' },
-        { col_code: 'flightTypeChnName', col_chn: '航班类别' },
-        /* { col_code: 'flightTask', col_chn: '航班任务' }, */
-        { col_code: 'operationDays', col_chn: '运营日' },
-        { col_code: 'startDate', col_chn: '开始日期' },
-        { col_code: 'endDate', col_chn: '结束日期' },
-        { col_code: 'routChn', col_chn: '航线' },
-        { col_code: 'arriOrDeptChn', col_chn: '进/出港' },
-        { col_code: 'arrivalTimeTra', col_chn: '到达时间' },
-        { col_code: 'departureTimeTra', col_chn: '出发时间' },
-        { col_code: 'aircraftTypeName', col_chn: '机型' },
-        { col_code: 'flyingDistance', col_chn: '飞行距离(千米)' },
-        { col_code: 'flyingTime', col_chn: '飞行时间(分钟)' },
-    ]
+    // public col_lists = [
+    //     { col_code: 'flightNumber', col_chn: '航班号' },
+    //     { col_code: 'seasonName', col_chn: '航班季度' },
+    //     { col_code: 'internationalCode', col_chn: '国际代码' },
+    //     { col_code: 'airlineChnName', col_chn: '航空公司' },
+    //     { col_code: 'routeTypeChn', col_chn: '航线类别' },
+    //     { col_code: 'flightTypeChnName', col_chn: '航班类别' },
+    //     /* { col_code: 'flightTask', col_chn: '航班任务' }, */
+    //     { col_code: 'operationDays', col_chn: '运营日' },
+    //     { col_code: 'startDate', col_chn: '开始日期' },
+    //     { col_code: 'endDate', col_chn: '结束日期' },
+    //     { col_code: 'routChn', col_chn: '航线' },
+    //     { col_code: 'arriOrDeptChn', col_chn: '进/出港' },
+    //     { col_code: 'arrivalTimeTra', col_chn: '到达时间' },
+    //     { col_code: 'departureTimeTra', col_chn: '出发时间' },
+    //     { col_code: 'aircraftTypeName', col_chn: '机型' },
+    //     { col_code: 'flyingDistance', col_chn: '飞行距离(千米)' },
+    //     { col_code: 'flyingTime', col_chn: '飞行时间(分钟)' },
+    // ]
 
     // 搜索条件
     SEARCH = '';    //手动输入条件
@@ -76,9 +76,9 @@ export class SeasonalPlanComponent implements OnInit {
     public wait_render_data: Array<object> = [];
     public render_data: Array<object> = [];  //显示数据，即需要显示的数据
 
-    render_col_lists: Array<object> = [
+    public render_col_lists: Array<object> = [
         { "COL_CODE": "flightNumber", "COL_CN": "航班号", "COL_WIDTH": "85px" },
-        { "COL_CODE": "seasonRecIdChn", "COL_CN": "航班季度", "COL_WIDTH": "85px" },
+        { "COL_CODE": "seasonName", "COL_CN": "航班季度", "COL_WIDTH": "85px" },
         { "COL_CODE": "internationalCode", "COL_CN": "国际代码", "COL_WIDTH": "85px" },
         { "COL_CODE": "airlineChnName", "COL_CN": "航空公司", "COL_WIDTH": "205px" },
         { "COL_CODE": "routeTypeChn", "COL_CN": "航线类别", "COL_WIDTH": "85px" },
@@ -468,10 +468,10 @@ export class SeasonalPlanComponent implements OnInit {
             } else {
                 filterData = filterData.filter(item => {
                     let is_satis = false;
-                    let cols = this.col_lists;
+                    let cols = this.render_col_lists;
                     for (let i = 0; i < cols.length; i++) {
-                        if (item[cols[i].col_code]) {
-                            if (item[cols[i].col_code].toString().match(new RegExp(this.SEARCH, 'i'))) {
+                        if (item[cols[i]['COL_CODE']]) {
+                            if (item[cols[i]['COL_CODE']].toString().match(new RegExp(this.SEARCH, 'i'))) {
                                 is_satis = true;
                                 break;
                             } else {
@@ -518,10 +518,10 @@ export class SeasonalPlanComponent implements OnInit {
             });
         } else {
             filterData.forEach(element => {
-                let cols = this.col_lists;
+                let cols = this.render_col_lists;
                 for (let i = 0; i < cols.length; i++) {
-                    if (element[cols[i].col_code]) {
-                        if (element[cols[i].col_code].toString().match(new RegExp(this.SEARCH, 'i'))) {
+                    if (element[cols[i]['COL_CODE']]) {
+                        if (element[cols[i]['COL_CODE']].toString().match(new RegExp(this.SEARCH, 'i'))) {
                             transArray.push(element)
                             break;
                         } else {