From 63741d8ae8235fb4d445feccf7ab848545a21efd Mon Sep 17 00:00:00 2001
From: zhouyuejun <505127606@qq.com>
Date: Thu, 24 Jan 2019 10:22:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=88=AA=E7=8F=AD=E8=BF=94=E8=88=AA=E5=8F=8A?=
 =?UTF-8?q?=E6=92=A4=E9=94=80=E8=BF=94=E8=88=AA=E6=B6=88=E6=81=AF=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/main/main.component.ts          | 14 ++++---
 .../related-tab/related-tab.component.html    |  8 ++--
 .../main/related-tab/related-tab.component.ts | 12 ++++--
 src/app/utils/alert-message-handle.ts         | 37 +++----------------
 4 files changed, 28 insertions(+), 43 deletions(-)

diff --git a/src/app/pages/main/main.component.ts b/src/app/pages/main/main.component.ts
index 7e95347..760881d 100644
--- a/src/app/pages/main/main.component.ts
+++ b/src/app/pages/main/main.component.ts
@@ -862,9 +862,9 @@ export class MainComponent implements OnInit {
             } else {
                 return false;
             }
-        }else{
+        } else {
             if (this.row_state['preFlight'] && this.row_state['reaFlight']) {
-                if ((flight['preFlight']['FLID'] === this.row_state['preFlight']['FLID'])&&(flight['reaFlight']['FLID'] === this.row_state['reaFlight']['FLID'])) {
+                if ((flight['preFlight']['FLID'] === this.row_state['preFlight']['FLID']) && (flight['reaFlight']['FLID'] === this.row_state['reaFlight']['FLID'])) {
                     return true;
                 } else {
                     return false;
@@ -1037,19 +1037,23 @@ export class MainComponent implements OnInit {
 
     getReturnNotes(flight) {
         if (this.orderHandle.isArriFlight(flight)) {
-            if (flight['preFlight']['FRET']) {
+            let preFret = flight['preFlight']['FRET'];
+            if (preFret && preFret.VALUE && preFret.REID) {
                 return true;
             } else {
                 return false;
             }
         } else if (this.orderHandle.isDeptFlight(flight)) {
-            if (flight['reaFlight']['FRET']) {
+            let reaFret = flight['reaFlight']['FRET'];
+            if (reaFret && reaFret.VALUE && reaFret.REID) {
                 return true;
             } else {
                 return false;
             }
         } else {
-            if ((flight['preFlight']['FRET']) || (flight['reaFlight']['FRET'])) {
+            let preFret = flight['preFlight']['FRET'];
+            let reaFret = flight['reaFlight']['FRET'];
+            if ((preFret && preFret.VALUE && preFret.REID) || (reaFret && reaFret.VALUE && reaFret.REID)) {
                 return true;
             } else {
                 return false;
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 aff22d8..af9b49a 100644
--- a/src/app/pages/main/related-tab/related-tab.component.html
+++ b/src/app/pages/main/related-tab/related-tab.component.html
@@ -54,10 +54,10 @@
                 </div>
                 <div class="fl-fret" *ngIf="prefret">
                     <p *ngIf="prefret.REID==='A'">
-                        空返：（空返时间：{{xxx}} 空返原因：{{prefret.VALUE}}）
+                        空返：（空返原因：{{prefret.VALUE}}）
                     </p>
                     <p *ngIf="prefret.REID==='G'">
-                        地返：（地返时间：{{xxx}} 地返原因：{{prefret.VALUE}}）
+                        地返：（地返原因：{{prefret.VALUE}}）
                     </p>
                 </div>
             </div>
@@ -77,10 +77,10 @@
                 </div>
                 <div class="fl-fret" *ngIf="reafret">
                     <p *ngIf="reafret.REID==='A'">
-                        空返：（空返时间：{{xxx}} 空返原因：{{reafret.VALUE}}）
+                        空返：（空返原因：{{reafret.VALUE}}）
                     </p>
                     <p *ngIf="reafret.REID==='G'">
-                        地返：（地返时间：{{xxx}} 地返原因：{{reafret.VALUE}}）
+                        地返：（地返原因：{{reafret.VALUE}}）
                     </p>
                 </div>
             </div>
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 d89e41b..1f6953d 100644
--- a/src/app/pages/main/related-tab/related-tab.component.ts
+++ b/src/app/pages/main/related-tab/related-tab.component.ts
@@ -65,7 +65,7 @@ export class RelatedTabComponent implements OnInit {
                 this.predelay['STRT'] = new Date(dateFormatter(this.predelay['STRT'])).getTime();
                 this.predelay['DURA'] = parseInt(this.predelay['DURA'].substr(0, 2)) * 3600000 + parseInt(this.predelay['DURA'].substr(2, 3)) * 60000 + this.predelay['STRT']
             }
-            if (cancleIndex > -1) { 
+            if (cancleIndex > -1) {
                 this.precancle = this.lines.preFlight['ABN'][cancleIndex].BODY;
                 this.precancle = new Date(dateFormatter(this.precancle)).getTime();
             }
@@ -77,7 +77,10 @@ export class RelatedTabComponent implements OnInit {
                 }
             }
             if (fretIndex > -1) {
-                this.prefret = this.lines.preFlight['ABN'][fretIndex].BODY;
+                let fret = this.lines.preFlight['ABN'][fretIndex].BODY;
+                if (fret.VALUE && fret.REID) {
+                    this.prefret = fret;
+                }
             }
         }
         if (this.lines.reaFlight && this.lines.reaFlight['ABN'] && this.lines.reaFlight['ABN'].length > 0) {
@@ -104,7 +107,10 @@ export class RelatedTabComponent implements OnInit {
                 }
             }
             if (fretIndex > -1) {
-                this.reafret = this.lines.reaFlight['ABN'][fretIndex].BODY;
+                let fret = this.lines.reaFlight['ABN'][fretIndex].BODY;
+                if (fret.VALUE && fret.REID) {
+                    this.reafret = fret;
+                }
             }
         }
     };
diff --git a/src/app/utils/alert-message-handle.ts b/src/app/utils/alert-message-handle.ts
index 1bc83be..80b4fdd 100644
--- a/src/app/utils/alert-message-handle.ts
+++ b/src/app/utils/alert-message-handle.ts
@@ -1,29 +1,5 @@
 import dateFormatter from './date-formatter';
 export class AlertMessageHandle {
-    // public alertMessage = {
-    //     'FLOP-CNCL':'',
-    //     'FLOP-FRET':'', 
-    //     'FLOP-FDIV':'',
-    //     'FLOP-FDEL':'',
-    //     'FLOP-DELY':'',
-    //     'FLOP-ACTT':'',
-    //     'FLOP-GTDT':'',
-    //     'FLOP-PSDT':'',
-    //     'FLOP-ESTT':'',
-    //     'FLOP-PADT':'',
-    //     'FLOP-CKDT':'',
-    //     'FLOP-BOTM':'',
-    //     'FLOP-CLDT':'',
-    //     'FLOP-ROUT':'',
-    //     'FLOP-VIPP':'',
-    //     'FLOP-HNAG':'',
-    //     'FLOP-FLBG':'',
-    //     'FLOP-RENO':'',
-    //     'FLOP-ABTM':'',
-    //     'FLOP-CHOT':'',
-    //     'FLOP-TRML':'',
-    // }
-
     public flopCncl(message, airports) {
         if (message.FLOP.CNCL) {
             return message.FLOP.FFID + '航班取消';
@@ -32,12 +8,11 @@ export class AlertMessageHandle {
         }
     }
     public flopFret(message, airports) {
-        if (message.FLOP.FRET.REID === 'G') {
-            return message.FLOP.FFID + '航班从地面返回，返回原因：' + (message.FLOP.FRET.content || message.FLOP.FRET.VALUE);
-        } else if (message.FLOP.FRET.REID === 'A') {
-            return message.FLOP.FFID + '航班从空中返回，返回原因：' + (message.FLOP.FRET.content || message.FLOP.FRET.VALUE);
+        let returnData = message.FLOP.FRET
+        if (returnData && returnData.REID && returnData.VALUE) {
+            return message.FLOP.FFID + "航班从" + ((returnData.REID === "A") ? "空中返回" : "地面返回") + " \n\n返回原因：" + returnData.VALUE;
         } else {
-            return message.FLOP.FFID + '航班从空中或地面返回，返回原因：' + (message.FLOP.FRET.content || message.FLOP.FRET.VALUE);
+            return message.FLOP.FFID + "航班返航撤销";
         }
     }
     public flopFdiv(message, airports) {
@@ -137,7 +112,7 @@ export class AlertMessageHandle {
         if (Array.isArray(message.FLOP['ROUT']) && message.FLOP['ROUT'].length > 0) {
             for (let i = 0; i < message.FLOP['ROUT'].length; i++) {
                 let airportIndex = airports.findIndex(val => val.airportCodeIata === message.FLOP['ROUT'][i]['APCD']);
-                if(airportIndex>-1){
+                if (airportIndex > -1) {
                     if (airports[airportIndex].briefNameChn) {
                         rout.push(airports[airportIndex].briefNameChn);
                     } else {
@@ -147,7 +122,7 @@ export class AlertMessageHandle {
             }
         } else if (Object.prototype.toString.call(message.FLOP['ROUT']) === '[object Object]') {
             let airportIndex = airports.findIndex(val => val.airportCodeIata === message.FLOP['ROUT']['APCD']);
-            if(airportIndex>-1){
+            if (airportIndex > -1) {
                 if (airports[airportIndex].briefNameChn) {
                     rout.push(airports[airportIndex].briefNameChn);
                 } else {