From dd7bc734958ffbb01ba2ee338043b8ff156b1a64 Mon Sep 17 00:00:00 2001
From: zhouyuejun <505127606@qq.com>
Date: Thu, 17 Jan 2019 15:01:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=88=AA=E7=8F=AD=E8=AF=A6=E7=BB=86=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=81=9C=E6=9C=BA=E4=BD=8D=E6=98=BE=E7=A4=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/detail-tab/detail-tab.component.ts   | 53 ++++++-------------
 src/app/pages/main/main.component.ts          |  2 -
 2 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/src/app/pages/main/detail-tab/detail-tab.component.ts b/src/app/pages/main/detail-tab/detail-tab.component.ts
index cd8db99..bfc80a3 100644
--- a/src/app/pages/main/detail-tab/detail-tab.component.ts
+++ b/src/app/pages/main/detail-tab/detail-tab.component.ts
@@ -14,32 +14,31 @@ export class DetailTabComponent implements OnInit {
 
     @Input() set flight(flight) {
         this.lines = Object.assign({}, flight);
-
         if (this.lines.preFlight && !this.lines.reaFlight) {
             this.singleFlight = this.lines.renderFlight;
             let psst = this.psstFormatter(this.lines.preFlight);
             if (psst) {
-                this.showPsst = this.singleFlight.STND + '(' + psst + ')';
+                this.showPsst = (this.singleFlight.STND || '') + '(' + psst + ')';
             } else {
-                this.showPsst = this.singleFlight.STND
+                this.showPsst = (this.singleFlight.STND || '')
             }
             this.btnClickDisabled = true;
         } else if (!this.lines.preFlight && this.lines.reaFlight) {
             this.singleFlight = this.lines.renderFlight;
             let psst = this.psstFormatter(this.lines.reaFlight);
             if (psst) {
-                this.showPsst = this.singleFlight.STND + '(' + psst + ')';
+                this.showPsst = (this.singleFlight.STND || '') + '(' + psst + ')';
             } else {
-                this.showPsst = this.singleFlight.STND
+                this.showPsst = (this.singleFlight.STND || '')
             }
             this.btnClickDisabled = true;
         } else {
             this.singleFlight = this.lines.renderPreFlight;
             let psst = this.psstFormatter(this.lines.preFlight);
             if (psst) {
-                this.showPsst = this.singleFlight.STND + '(' + psst + ')';
+                this.showPsst = (this.singleFlight.STND || '') + '(' + psst + ')';
             } else {
-                this.showPsst = this.singleFlight.STND
+                this.showPsst = (this.singleFlight.STND || '')
             }
             this.btnClickDisabled = false;
         };
@@ -54,57 +53,39 @@ export class DetailTabComponent implements OnInit {
             this.singleFlight = this.lines.renderFlight;
             let psst = this.psstFormatter(this.lines.preFlight);
             if (psst) {
-                this.showPsst = this.singleFlight.STND + '(' + psst + ')';
+                this.showPsst = (this.singleFlight.STND || '') + '(' + psst + ')';
             } else {
-                this.showPsst = this.singleFlight.STND
-            }
-            this.btnClickDisabled = true;
-        } else if (!this.lines.preFlight && this.lines.reaFlight) {
-            this.singleFlight = this.lines.renderFlight;
-            let psst = this.psstFormatter(this.lines.reaFlight);
-            if (psst) {
-                this.showPsst = this.singleFlight.STND + '(' + psst + ')';
-            } else {
-                this.showPsst = this.singleFlight.STND
+                this.showPsst = (this.singleFlight.STND || '')
             }
             this.btnClickDisabled = true;
         } else {
             this.singleFlight = this.lines.renderPreFlight;
             let psst = this.psstFormatter(this.lines.preFlight);
             if (psst) {
-                this.showPsst = this.singleFlight.STND + '(' + psst + ')';
+                this.showPsst = (this.singleFlight.STND || '') + '(' + psst + ')';
             } else {
-                this.showPsst = this.singleFlight.STND
+                this.showPsst = (this.singleFlight.STND || '');
             }
             this.btnClickDisabled = false;
         };
     }
     showReaFlight() {
-        if (this.lines.preFlight && !this.lines.reaFlight) {
-            this.singleFlight = this.lines.renderFlight;
-            let psst = this.psstFormatter(this.lines.preFlight);
-            if (psst) {
-                this.showPsst = this.singleFlight.STND + '(' + psst + ')';
-            } else {
-                this.showPsst = this.singleFlight.STND
-            }
-            this.btnClickDisabled = true;
-        } else if (!this.lines.preFlight && this.lines.reaFlight) {
+        if (!this.lines.preFlight && this.lines.reaFlight) {
             this.singleFlight = this.lines.renderFlight;
             let psst = this.psstFormatter(this.lines.reaFlight);
             if (psst) {
-                this.showPsst = this.singleFlight.STND + '(' + psst + ')';
+                this.showPsst = (this.singleFlight.STND || '') + '(' + psst + ')';
             } else {
-                this.showPsst = this.singleFlight.STND
+                this.showPsst = (this.singleFlight.STND || '')
             }
             this.btnClickDisabled = true;
         } else {
-            this.singleFlight = this.lines.renderPreFlight;
-            let psst = this.psstFormatter(this.lines.preFlight);
+            this.singleFlight = this.lines.renderReaFlight;
+            let psst = this.psstFormatter(this.lines.reaFlight);
             if (psst) {
-                this.showPsst = this.singleFlight.STND + '(' + psst + ')';
+                this.showPsst = (this.singleFlight.STND || '') + '(' + psst + ')';
             } else {
-                this.showPsst = this.singleFlight.STND
+                this.showPsst = (this.singleFlight.STND || '')
             }
             this.btnClickDisabled = false;
         };
diff --git a/src/app/pages/main/main.component.ts b/src/app/pages/main/main.component.ts
index 56086f8..250349d 100644
--- a/src/app/pages/main/main.component.ts
+++ b/src/app/pages/main/main.component.ts
@@ -462,10 +462,8 @@ export class MainComponent implements OnInit {
         }
         this.promise.postMessage(dynamicData);
         this.promise.onmessage = function (e) {
-            // console.log('=====')
             this.combined_data = e.data;
             this.selectChange('dynamic');
-            // this.promise.terminate();
         }.bind(this);
         // const promise = this.webWorkerService.run(webWorkerHandle, dynamicData);
         // promise.then(function (response) {