From 1a943a845795c18a15c5a217aaed07abf90c8aa6 Mon Sep 17 00:00:00 2001
From: zhouyuejun <505127606@qq.com>
Date: Fri, 21 Jun 2019 17:10:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E9=80=89=E5=88=97=E5=90=8D=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/historical-data/historical-data.component.html | 2 +-
 .../pages/historical-data/historical-data.component.ts   | 9 +++++++--
 src/app/pages/main/main.component.ts                     | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/app/pages/historical-data/historical-data.component.html b/src/app/pages/historical-data/historical-data.component.html
index 5d1c015..1b93695 100644
--- a/src/app/pages/historical-data/historical-data.component.html
+++ b/src/app/pages/historical-data/historical-data.component.html
@@ -5,7 +5,7 @@
                 <div class="line-operator-left input-container mb-2">
                     <select [(ngModel)]="SEL_COL" class="mr-4 form-control" (ngModelChange)="resetPositionArray()" name="" id="">
                         <option value="">选择列名</option>
-                        <option *ngFor="let airline_col of render_col_lists" [value]="airline_col.COL_CODE">{{airline_col.COL_CN}}</option>
+                        <option *ngFor="let airline_col of select_col_lists" [value]="airline_col.COL_CODE">{{airline_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/historical-data/historical-data.component.ts b/src/app/pages/historical-data/historical-data.component.ts
index 6cfe2f7..573ffc2 100644
--- a/src/app/pages/historical-data/historical-data.component.ts
+++ b/src/app/pages/historical-data/historical-data.component.ts
@@ -51,6 +51,7 @@ export class HistoricalDataComponent implements OnInit {
 
     public col_lists: Array<object>;    //列数据
     public render_col_lists: Array<object>;
+    public select_col_lists: Array<object>;
 
     public row_state: any = {};
 
@@ -124,6 +125,8 @@ export class HistoricalDataComponent implements OnInit {
                     if (element.groupCode === 'userSettingCol') {
                         this.col_lists = JSON.parse(element.settingContent).defaultData;
                         this.render_col_lists = JSON.parse(element.settingContent).targetList;
+                        this.select_col_lists = JSON.parse(element.settingContent).targetList;
+                        this.select_col_lists.unshift({ "COL_CODE": "FLNO", "COL_CN": "航班号", "COL_ORDER": "0", "COL_WIDTH": "140px" })
                     }
                 })
 
@@ -311,6 +314,8 @@ export class HistoricalDataComponent implements OnInit {
                     if (element.groupCode === 'userSettingCol') {
                         this.col_lists = JSON.parse(element.settingContent).defaultData;
                         this.render_col_lists = JSON.parse(element.settingContent).targetList;
+                        this.select_col_lists = JSON.parse(element.settingContent).targetList;
+                        this.select_col_lists.unshift({ "COL_CODE": "FLNO", "COL_CN": "航班号", "COL_ORDER": "0", "COL_WIDTH": "140px" })
                     }
                 })
                 //获取航班动态信息
@@ -527,7 +532,7 @@ export class HistoricalDataComponent implements OnInit {
             } else {
                 filterData = filterData.filter(item => {
                     let is_satis = false;
-                    let cols = this.col_lists;
+                    let cols = this.select_col_lists;
                     for (let i = 0; i < cols.length; i++) {
                         if (item['renderFlight'][cols[i]['COL_CODE']]) {
                             if (item['renderFlight'][cols[i]['COL_CODE']].toString().match(new RegExp(this.LASTSEARCH, 'i'))) {
@@ -655,7 +660,7 @@ export class HistoricalDataComponent implements OnInit {
                 }
             }
         } else {
-            let cols = this.render_col_lists;
+            let cols = this.select_col_lists;
             for (let i = 0; i < filterData.length; i++) {
                 if (i === filterData.length - 1) {
                     this.positionedArray = [];
diff --git a/src/app/pages/main/main.component.ts b/src/app/pages/main/main.component.ts
index d7e3433..85db454 100644
--- a/src/app/pages/main/main.component.ts
+++ b/src/app/pages/main/main.component.ts
@@ -1070,7 +1070,7 @@ export class MainComponent implements OnInit {
             } else {
                 filterData = filterData.filter(item => {
                     let is_satis = false;
-                    let cols = this.col_lists;
+                    let cols = this.select_col_lists;
                     for (let i = 0; i < cols.length; i++) {
                         if (item['renderFlight'][cols[i]['COL_CODE']]) {
                             if (item['renderFlight'][cols[i]['COL_CODE']].toString().match(new RegExp(this.LASTSEARCH, 'i'))) {