From e1c7a28376b61f2d75109f0034fc8a8a1b0f4398 Mon Sep 17 00:00:00 2001
From: zhouyuejun <505127606@qq.com>
Date: Wed, 27 Feb 2019 16:38:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E6=9C=BA=E6=A1=A5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9=E5=8F=8A=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=88=AA=E7=A9=BA=E5=85=AC=E5=8F=B8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic-data/airline/airline.component.html | 19 ---------------
 .../basic-data/airline/airline.component.ts   | 24 ++++++++++++-------
 src/app/pages/main/main.component.ts          |  4 ++++
 src/app/services/websocket.service.ts         |  4 ----
 src/app/utils/transfer-render-handle.ts       | 15 ++----------
 5 files changed, 22 insertions(+), 44 deletions(-)

diff --git a/src/app/pages/basic-data/airline/airline.component.html b/src/app/pages/basic-data/airline/airline.component.html
index 4a42f53..51cd637 100644
--- a/src/app/pages/basic-data/airline/airline.component.html
+++ b/src/app/pages/basic-data/airline/airline.component.html
@@ -20,25 +20,6 @@
                         (keyup.enter)="inputEnter()" id="gl">
                 </div>
             </div>
-
-            <div class="second-condition mb-3 row">
-                <div class="input-container mr-4">
-                    <label for="airlineGroupId">航空集团：&nbsp;&nbsp;</label>
-                    <select class="form-control" [(ngModel)]="filterItems.airlineGroupId" (ngModelChange)="selectChange()"
-                        id="handkong">
-                        <option value=""></option>
-                        <option *ngFor="let item of airlinegroups" [value]="item.airlineGroupId">{{item.airlineGroupName}}</option>
-                    </select>
-                </div>
-                <!-- <div class="input-container mr-4">
-                    <label for="briefNameChn">航班代理：&nbsp;&nbsp;</label>
-                    <select class="form-control" [(ngModel)]="filterItems.briefNameChn" (ngModelChange)="selectChange()"
-                        id="hb">
-                        <option value=""></option>
-                        <option *ngFor="let items of airlines" [value]="items.briefNameChn">{{items.briefNameChn}}</option>
-                    </select>
-                </div> -->
-            </div>
         </div>
 
         <div class="airline-table">
diff --git a/src/app/pages/basic-data/airline/airline.component.ts b/src/app/pages/basic-data/airline/airline.component.ts
index ddd136b..47dc232 100644
--- a/src/app/pages/basic-data/airline/airline.component.ts
+++ b/src/app/pages/basic-data/airline/airline.component.ts
@@ -40,7 +40,7 @@ export class AirlineComponent implements OnInit {
         airlineGroupId: '',
     }
 
-    public airlinegroups: Array<any>; //航空集团
+    // public airlinegroups: Array<any>; //航空集团
     public airlines: Array<any>;
 
     public wait_render_data: Array<object> = [];
@@ -68,22 +68,23 @@ export class AirlineComponent implements OnInit {
         }.bind(this)
 
         this.airlines = this.basicDataService.airline;
-        this.airlinegroups = this.basicDataService.airlinegroup;
+        // this.airlinegroups = this.basicDataService.airlinegroup;
 
-        if (this.airlinegroups && Array.isArray(this.airlinegroups)) {
+        if (this.airlines && Array.isArray(this.airlines)) {
             this.dataTransfer();
         } else {
             this.basicDataService.airline_subject.subscribe(
                 data => {
                     this.airlines = data;
-                }
-            )
-            this.basicDataService.airlinegroup_subject.subscribe(
-                data => {
-                    this.airlinegroups = data;
                     this.dataTransfer();
                 }
             )
+            // this.basicDataService.airlinegroup_subject.subscribe(
+            //     data => {
+            //         this.airlinegroups = data;
+            //         this.dataTransfer();
+            //     }
+            // )
         }
     }
 
@@ -94,6 +95,13 @@ export class AirlineComponent implements OnInit {
             item['parentAirlineName'] = this.airlines[airlinesLinkIndex].airlineName;
         }
     }
+    // //航空集团数据转换处理
+    // airlineGroupTransHandle(item){
+    //     let airlineGroupIndex = this.airlinegroups.findIndex(val => val.airlineGroupId === item['airlineGroupId']);
+    //     if (airlineGroupIndex > -1) {
+    //         item['airlineGroupName'] = this.airlinegroups[airlineGroupIndex].airlineGroupName;
+    //     }
+    // }
 
     /**
      * 数据转换显示统一处理
diff --git a/src/app/pages/main/main.component.ts b/src/app/pages/main/main.component.ts
index 757848d..4af1e19 100644
--- a/src/app/pages/main/main.component.ts
+++ b/src/app/pages/main/main.component.ts
@@ -137,6 +137,10 @@ export class MainComponent implements OnInit {
         //订阅航班更新
         this.websocketService.dynamicsMessage().subscribe(
             event => {
+                setInterval(() => {
+                    let msg = { "topic": "heart-beat", "message": "" };
+                    this.websocketService.websocket.send(JSON.stringify(msg));
+                }, 30000);
                 let data = JSON.parse(event as string);
                 if (data.topic === 'schd') {
                     let message = JSON.parse(data.message);
diff --git a/src/app/services/websocket.service.ts b/src/app/services/websocket.service.ts
index 690cb22..7efc9b8 100644
--- a/src/app/services/websocket.service.ts
+++ b/src/app/services/websocket.service.ts
@@ -17,10 +17,6 @@ export class WebsocketService {
         }
 
         this.websocket = new WebSocket(url);
-        setInterval(() => {
-            let msg = { "topic": "heart-beat", "message": "" };
-            this.websocket.send(JSON.stringify(msg));
-        }, 30000);
         return new Observable(ob => {
             this.websocket.onopen = () => {
                 console.log('websocket was connected...')
diff --git a/src/app/utils/transfer-render-handle.ts b/src/app/utils/transfer-render-handle.ts
index a437528..1544d44 100644
--- a/src/app/utils/transfer-render-handle.ts
+++ b/src/app/utils/transfer-render-handle.ts
@@ -97,19 +97,8 @@ export class TransferRenderHandle {
         }
     }
     public abdgFormatter(flight) {
-        if (flight['ABTM']) {
-            if (Array.isArray(flight['ABTM']) && flight['ABTM'].length > 0) {
-                let abdg = [];
-                for (let i = 0; i < flight['ABTM'].length; i++) {
-                    abdg.push(flight['ABTM'][i]['ABDG']);
-                }
-                let set = new Set(abdg);
-                return Array.from(set).join(',');
-            } else if (Object.prototype.toString.call(flight['ABTM']) === '[object Object]') {
-                return flight['ABTM']['ABDG'];
-            } else {
-                return '';
-            }
+        if (flight['ABDG']) {
+            return flight['ABDG'];
         } else {
             return '';
         }