From 73e3ad77cae905c089f436cb8b445ec4b83fa3f9 Mon Sep 17 00:00:00 2001
From: zhouyuejun <505127606@qq.com>
Date: Wed, 26 Dec 2018 10:11:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E8=B0=83=E4=BC=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/main/main.component.ts          | 65 ++++++++++++-------
 .../seasonal-plan.component.html              |  2 +-
 src/index.html                                |  2 +-
 3 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/src/app/pages/main/main.component.ts b/src/app/pages/main/main.component.ts
index dca7a17..15d1cd1 100644
--- a/src/app/pages/main/main.component.ts
+++ b/src/app/pages/main/main.component.ts
@@ -38,31 +38,31 @@ export class MainComponent implements OnInit {
     ) {
         this.operateSpinServiceService.showSpin();
         this.changeDetectorRef.detach();
-        this.router.events.pipe(
-            filter((event => event instanceof NavigationEnd))
-        ).subscribe(
-            (event: NavigationEnd) => {
-                if (event.urlAfterRedirects === '/app/main') {
-                    // this.operateSpinServiceService.showSpin();
-                    this.httpCilent.get('/adminapi/settings/uisettings').subscribe(
-                        data => {
-                            data.body.forEach(element => {
-                                if (element.groupCode === 'userSettingCol') {
-                                    this.col_lists = JSON.parse(element.settingContent).allCols;
-                                    this.render_col_lists = JSON.parse(element.settingContent).targetList;
-                                } else if (element.groupCode === 'userSettingColor') {
-                                    this.airline_color = JSON.parse(element.settingContent);
-                                } else if (element.groupCode === 'userSettingMsgAlert') {
-                                    this.airline_message_alert = JSON.parse(element.settingContent).targetList;
-                                }
-                            });
-                            // this.changeDetectorRef.detectChanges();
-                            // this.operateSpinServiceService.hideSpin();
-                        }
-                    )
-                }
-            }
-        )
+        // this.router.events.pipe(
+        //     filter((event => event instanceof NavigationEnd))
+        // ).subscribe(
+        //     (event: NavigationEnd) => {
+        //         if (event.urlAfterRedirects === '/app/main') {
+        //             // this.operateSpinServiceService.showSpin();
+        //             this.httpCilent.get('/adminapi/settings/uisettings').subscribe(
+        //                 data => {
+        //                     data.body.forEach(element => {
+        //                         if (element.groupCode === 'userSettingCol') {
+        //                             this.col_lists = JSON.parse(element.settingContent).allCols;
+        //                             this.render_col_lists = JSON.parse(element.settingContent).targetList;
+        //                         } else if (element.groupCode === 'userSettingColor') {
+        //                             this.airline_color = JSON.parse(element.settingContent);
+        //                         } else if (element.groupCode === 'userSettingMsgAlert') {
+        //                             this.airline_message_alert = JSON.parse(element.settingContent).targetList;
+        //                         }
+        //                     });
+        //                     this.changeDetectorRef.detectChanges();
+        //                     // this.operateSpinServiceService.hideSpin();
+        //                 }
+        //             )
+        //         }
+        //     }
+        // )
     }
     public orderHandle = new DynamicFlightOrder();
     public dataHandle = new FlightsDataHandle();
@@ -144,6 +144,21 @@ export class MainComponent implements OnInit {
             }
         )
 
+        this.httpCilent.get('/adminapi/settings/uisettings').subscribe(
+            data => {
+                data.body.forEach(element => {
+                    if (element.groupCode === 'userSettingCol') {
+                        this.col_lists = JSON.parse(element.settingContent).allCols;
+                        this.render_col_lists = JSON.parse(element.settingContent).targetList;
+                    } else if (element.groupCode === 'userSettingColor') {
+                        this.airline_color = JSON.parse(element.settingContent);
+                    } else if (element.groupCode === 'userSettingMsgAlert') {
+                        this.airline_message_alert = JSON.parse(element.settingContent).targetList;
+                    }
+                });
+            }
+        )
+
         //获取航班动态信息
         this.httpCilent.get('/msgexchangeapi/all/flights').subscribe(
             data => {
diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.html b/src/app/pages/seasonal-plan/seasonal-plan.component.html
index 507aadf..dde31ba 100644
--- a/src/app/pages/seasonal-plan/seasonal-plan.component.html
+++ b/src/app/pages/seasonal-plan/seasonal-plan.component.html
@@ -106,7 +106,7 @@
                     </thead>
                     <tbody>
                         <tr *ngFor="let seasonal of render_data;let i = index" (click)="selectRow(seasonal)" [ngClass]="{'selected':row_state.seasonflightId===seasonal.seasonflightId}">
-                            <td>{{i+1}}{{seasonal.seasonflightId}}</td>
+                            <td>{{i+1}}</td>
                             <td>{{seasonal.flightNumber}}</td>
                             <td>{{seasonal.seasonRecIdChn}}</td>
                             <td>{{seasonal.internationalCode}}</td>
diff --git a/src/index.html b/src/index.html
index fec1e36..990863c 100644
--- a/src/index.html
+++ b/src/index.html
@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="utf-8">
-    <title>广州智能科技发展有限公司</title>
+    <title>航班信息查询系统</title>
 
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <link rel="icon" type="image/x-icon" href="favicon.ico">