From a16c6a72dfb3911f614bf57267ef942528d60281 Mon Sep 17 00:00:00 2001
From: zhouyuejun <505127606@qq.com>
Date: Tue, 15 Jan 2019 20:20:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=BB=E8=88=AA=E7=8F=AD?=
 =?UTF-8?q?=E7=9A=84=E5=85=B1=E4=BA=AB=E8=88=AA=E7=8F=AD=E5=8F=B7=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../related-tab/related-tab.component.html    | 49 ++++++++++++++++---
 .../main/related-tab/related-tab.component.ts |  2 +-
 src/app/utils/flights-data-handle.ts          | 16 +-----
 src/app/utils/web-worker-handle.ts            | 13 -----
 src/assets/web-worker-handle.js               | 13 -----
 5 files changed, 45 insertions(+), 48 deletions(-)

diff --git a/src/app/pages/main/related-tab/related-tab.component.html b/src/app/pages/main/related-tab/related-tab.component.html
index 7864c1a..b2e66a4 100644
--- a/src/app/pages/main/related-tab/related-tab.component.html
+++ b/src/app/pages/main/related-tab/related-tab.component.html
@@ -2,8 +2,13 @@
     <div class="mb-4 fieldset-card">
         <fieldset>
             <legend>共享航班代码</legend>
-            <div>
-                <p>共享航班号：{{lines['renderFlight'].MAFL}}</p>
+            <div class="pre mb-2" *ngIf="lines['preFlight']&&lines['preFlight']['MAFL'].length>0">
+                <p>到达航班：</p>
+                <p *ngFor="let mafl of lines['preFlight']['MAFL']">{{mafl.FLNO}}</p>
+            </div>
+            <div class="rea" *ngIf="lines['reaFlight']&&lines['reaFlight']['MAFL'].length>0">
+                <p>出发航班：</p>
+                <p *ngFor="let mafl of lines['reaFlight']['MAFL']">{{mafl.FLNO}}</p>
             </div>
         </fieldset>
     </div>
@@ -11,8 +16,10 @@
         <fieldset>
             <legend>经停机场</legend>
             <div>
-                <p *ngFor="let airport of airports"><label>{{airport.airport}}</label>（到达 &nbsp;&nbsp;{{airport.scat?airport.scat:'__ : __'}} &nbsp;&nbsp;| &nbsp;&nbsp;出发 &nbsp;&nbsp;{{airport.scdt?airport.scdt:'__ : __'}}）</p>
-                
+                <p *ngFor="let airport of airports">
+                    <label>{{airport.airport}}</label>
+                    <label>（到达： {{airport.scat?airport.scat:' __ : __ '}} | 出发： {{airport.scdt?airport.scdt:' __ : __ '}}）</label>
+                </p>
             </div>
         </fieldset>
     </div>
@@ -30,7 +37,37 @@
     <div class="mb-4 fieldset-card">
         <fieldset>
             <legend>航班状态记录</legend>
-            <p>{{lines['renderFlight'].FTSS}}</p>
+            <!-- <p>{{lines['renderFlight'].FTSS}}</p> -->
+            <div class="pre" *ngIf="lines['preFlight']&&lines['preFlight']['ABN'].length>0">
+                <p>到达航班：{{lines['preFlight']['FLNO']}}</p>
+                <div class="fl-dely">
+
+                </div>
+                <div class="fl-cncl">
+
+                </div>
+                <div class="fl-fdiv">
+
+                </div>
+                <div class="fl-fret">
+
+                </div>
+            </div>
+            <div class="rea" *ngIf="lines['reaFlight']&&lines['reaFlight']['ABN'].length>0">
+                <p>出发航班：{{lines['reaFlight']['FLNO']}}</p>
+                <div class="fl-dely">
+
+                </div>
+                <div class="fl-cncl">
+
+                </div>
+                <div class="fl-fdiv">
+
+                </div>
+                <div class="fl-fret">
+
+                </div>
+            </div>
         </fieldset>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/pages/main/related-tab/related-tab.component.ts b/src/app/pages/main/related-tab/related-tab.component.ts
index d675968..e0131e7 100644
--- a/src/app/pages/main/related-tab/related-tab.component.ts
+++ b/src/app/pages/main/related-tab/related-tab.component.ts
@@ -8,7 +8,7 @@ import timeFormatter from '../../../utils/time-formatter';
 })
 export class RelatedTabComponent implements OnInit {
     public lines;
-    public airports;
+    public airports; 
     @Input() set flight(flight) {
         this.lines = Object.assign({}, flight);
         if (this.lines.preFlight && !this.lines.reaFlight) {
diff --git a/src/app/utils/flights-data-handle.ts b/src/app/utils/flights-data-handle.ts
index b513ec1..d0e85f3 100644
--- a/src/app/utils/flights-data-handle.ts
+++ b/src/app/utils/flights-data-handle.ts
@@ -69,20 +69,6 @@ export class FlightsDataHandle {
         raw_flights.forEach(element => {
             copy_raw_flights.push(Object.assign({}, element))
         })
-        for (let i = 0; i < copy_raw_flights.length; i++) {
-            if (copy_raw_flights[i]['MAID']) {
-                let index = copy_raw_flights.findIndex(val => { return val['FLID'] === copy_raw_flights[i]['MAID'] });
-                if (index > -1) {
-                    if (copy_raw_flights[index]['MAFL'] && Array.isArray(copy_raw_flights[index]['MAFL'])) {
-                        copy_raw_flights[index]['MAFL'].push(copy_raw_flights[i]['FLNO']);
-                    } else {
-                        copy_raw_flights[index]['MAFL'] = [];
-                        copy_raw_flights[index]['MAFL'].push(copy_raw_flights[i]['FLNO']);
-                    }
-                }
-            }
-        }
-
         for (let i = 0; i < copy_raw_flights.length; i++) {
             if (copy_raw_flights[i]['MVIN'] === 'A') {
                 if (copy_raw_flights[i]['TAID']) {
@@ -98,7 +84,7 @@ export class FlightsDataHandle {
                     }
                 }
             }
-        }
+        };
 
         copy_raw_flights.forEach(element => {
             let flights_item = {};
diff --git a/src/app/utils/web-worker-handle.ts b/src/app/utils/web-worker-handle.ts
index 3886d2f..a29bf91 100644
--- a/src/app/utils/web-worker-handle.ts
+++ b/src/app/utils/web-worker-handle.ts
@@ -837,19 +837,6 @@ export default function (dynamicData) {
     raw_data.forEach(element => {
         copy_raw_flights.push(Object.assign({}, element))
     });
-    for (let i = 0; i < copy_raw_flights.length; i++) {
-        if (copy_raw_flights[i]['MAID']) {
-            let index = copy_raw_flights.findIndex(val => { return val['FLID'] === copy_raw_flights[i]['MAID'] });
-            if (index > -1) {
-                if (copy_raw_flights[index]['MAFL'] && Array.isArray(copy_raw_flights[index]['MAFL'])) {
-                    copy_raw_flights[index]['MAFL'].push(copy_raw_flights[i]['FLNO']);
-                } else {
-                    copy_raw_flights[index]['MAFL'] = [];
-                    copy_raw_flights[index]['MAFL'].push(copy_raw_flights[i]['FLNO']);
-                }
-            }
-        }
-    };
     for (let i = 0; i < copy_raw_flights.length; i++) {
         if (copy_raw_flights[i]['MVIN'] === 'A') {
             if (copy_raw_flights[i]['TAID']) {
diff --git a/src/assets/web-worker-handle.js b/src/assets/web-worker-handle.js
index 04a47cd..6550f6d 100644
--- a/src/assets/web-worker-handle.js
+++ b/src/assets/web-worker-handle.js
@@ -838,19 +838,6 @@ onmessage = function (dynamicData) {
         copy_raw_flights.push(Object.assign({}, element))
     });
 
-    for (let i = 0; i < copy_raw_flights.length; i++) {
-        if (copy_raw_flights[i]['MAID']) {
-            let index = copy_raw_flights.findIndex(val => { return val['FLID'] === copy_raw_flights[i]['MAID'] });
-            if (index > -1) {
-                if (copy_raw_flights[index]['MAFL'] && Array.isArray(copy_raw_flights[index]['MAFL'])) {
-                    copy_raw_flights[index]['MAFL'].push(copy_raw_flights[i]['FLNO']);
-                } else {
-                    copy_raw_flights[index]['MAFL'] = [];
-                    copy_raw_flights[index]['MAFL'].push(copy_raw_flights[i]['FLNO']);
-                }
-            }
-        }
-    };
     for (let i = 0; i < copy_raw_flights.length; i++) {
         if (copy_raw_flights[i]['MVIN'] === 'A') {
             if (copy_raw_flights[i]['TAID']) {