From 7e2d84c443ca8c212d61244d37b85dda9b308f45 Mon Sep 17 00:00:00 2001
From: zhouyuejun <505127606@qq.com>
Date: Thu, 9 May 2019 11:31:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=88=AA=E7=8F=AD=E5=8A=A8=E6=80=81=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=88=97=E6=B7=BB=E5=8A=A0=E8=88=AA=E7=8F=AD=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/main/main.component.html |  2 +-
 src/app/pages/main/main.component.ts   | 27 +++++++++++++++-----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/app/pages/main/main.component.html b/src/app/pages/main/main.component.html
index 74e2638..1f5bad6 100644
--- a/src/app/pages/main/main.component.html
+++ b/src/app/pages/main/main.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()">
                         <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/main/main.component.ts b/src/app/pages/main/main.component.ts
index 310c4cc..bda09c3 100644
--- a/src/app/pages/main/main.component.ts
+++ b/src/app/pages/main/main.component.ts
@@ -96,6 +96,7 @@ export class MainComponent implements OnInit {
     public commonCol: Array<object>;
     public col_lists: Array<object>;    //列数据
     public render_col_lists: Array<object>;
+    public select_col_lists: Array<object>;
 
     public airline_color: Array<object> = [];
     public airline_message_alert: Array<object> = [];
@@ -163,6 +164,8 @@ export class MainComponent 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" })
                     } else if (element.groupCode === 'userSettingColor') {
                         this.airline_color = JSON.parse(element.settingContent);
                     } else if (element.groupCode === 'userSettingMsgAlert') {
@@ -386,6 +389,8 @@ export class MainComponent 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" })
                     } else if (element.groupCode === 'userSettingColor') {
                         this.airline_color = JSON.parse(element.settingContent);
                     } else if (element.groupCode === 'userSettingMsgAlert') {
@@ -438,7 +443,7 @@ export class MainComponent implements OnInit {
         })
 
         let colArray = [];
-        this.render_col_lists.forEach(element => {
+        this.select_col_lists.forEach(element => {
             let column = { 'key': element['COL_CODE'], "name": element['COL_CN'] }
             colArray.push(column);
         })
@@ -631,7 +636,7 @@ export class MainComponent implements OnInit {
                 groupCode: 'userSettingSelected',
                 settingContent: settingContent,
             }).subscribe(() => {
-                
+
             })
         } else if (type === 'time') {
             this.positionedArray = [];
@@ -652,7 +657,7 @@ export class MainComponent implements OnInit {
                     for (const key in filterItems) {
                         if (filterItems.hasOwnProperty(key) && filterItems[key]) {
                             if (key === 'Abnormal_state') {
-                                if(item['preFlight']['ABN'].findIndex((val)=>val['TYPE']===filterItems[key])>-1){
+                                if (item['preFlight']['ABN'].findIndex((val) => val['TYPE'] === filterItems[key]) > -1) {
                                     is_satis = true;
                                     continue;
                                 } else {
@@ -688,7 +693,7 @@ export class MainComponent implements OnInit {
                     for (const key in filterItems) {
                         if (filterItems.hasOwnProperty(key) && filterItems[key]) {
                             if (key === 'Abnormal_state') {
-                                if (item['reaFlight']['ABN'].findIndex((val)=>val['TYPE']===filterItems[key])>-1) {
+                                if (item['reaFlight']['ABN'].findIndex((val) => val['TYPE'] === filterItems[key]) > -1) {
                                     is_satis = true;
                                     continue;
                                 } else {
@@ -725,7 +730,7 @@ export class MainComponent implements OnInit {
                     for (const key in filterItems) {
                         if (filterItems.hasOwnProperty(key) && filterItems[key]) {
                             if (key === 'Abnormal_state') {
-                                if (item['preFlight']['ABN'].findIndex((val)=>val['TYPE']===filterItems[key])>-1) {
+                                if (item['preFlight']['ABN'].findIndex((val) => val['TYPE'] === filterItems[key]) > -1) {
                                     pre_satis = true;
                                     continue;
                                 } else {
@@ -758,7 +763,7 @@ export class MainComponent implements OnInit {
                     for (const key in filterItems) {
                         if (filterItems.hasOwnProperty(key) && filterItems[key]) {
                             if (key === 'Abnormal_state') {
-                                if (item['reaFlight']['ABN'].findIndex((val)=>val['TYPE']===filterItems[key])>-1) {
+                                if (item['reaFlight']['ABN'].findIndex((val) => val['TYPE'] === filterItems[key]) > -1) {
                                     rea_satis = true;
                                     continue;
                                 } else {
@@ -813,7 +818,7 @@ export class MainComponent implements OnInit {
                     for (const key in filterItems) {
                         if (filterItems.hasOwnProperty(key) && filterItems[key]) {
                             if (key === 'Abnormal_state') {
-                                if (item['preFlight']['ABN'].findIndex((val)=>val['TYPE']===filterItems[key])>-1) {
+                                if (item['preFlight']['ABN'].findIndex((val) => val['TYPE'] === filterItems[key]) > -1) {
                                     is_satis = true;
                                     continue;
                                 } else {
@@ -838,7 +843,7 @@ export class MainComponent implements OnInit {
                     for (const key in filterItems) {
                         if (filterItems.hasOwnProperty(key) && filterItems[key]) {
                             if (key === 'Abnormal_state') {
-                                if (item['reaFlight']['ABN'].findIndex((val)=>val['TYPE']===filterItems[key])>-1) {
+                                if (item['reaFlight']['ABN'].findIndex((val) => val['TYPE'] === filterItems[key]) > -1) {
                                     is_satis = true;
                                     continue;
                                 } else {
@@ -864,7 +869,7 @@ export class MainComponent implements OnInit {
                     for (const key in filterItems) {
                         if (filterItems.hasOwnProperty(key) && filterItems[key]) {
                             if (key === 'Abnormal_state') {
-                                if (item['preFlight']['ABN'].findIndex((val)=>val['TYPE']===filterItems[key])>-1) {
+                                if (item['preFlight']['ABN'].findIndex((val) => val['TYPE'] === filterItems[key]) > -1) {
                                     pre_satis = true;
                                     continue;
                                 } else {
@@ -886,7 +891,7 @@ export class MainComponent implements OnInit {
                     for (const key in filterItems) {
                         if (filterItems.hasOwnProperty(key) && filterItems[key]) {
                             if (key === 'Abnormal_state') {
-                                if (item['reaFlight']['ABN'].findIndex((val)=>val['TYPE']===filterItems[key])>-1) {
+                                if (item['reaFlight']['ABN'].findIndex((val) => val['TYPE'] === filterItems[key]) > -1) {
                                     rea_satis = true;
                                     continue;
                                 } else {
@@ -1120,7 +1125,7 @@ export class MainComponent 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 = [];