From 70891c1640b9654fc25800bbb7d96ae403937947 Mon Sep 17 00:00:00 2001 From: zhouyuejun <505127606@qq.com> Date: Tue, 29 Jan 2019 10:26:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=88=AA=E7=8F=AD=E5=85=B3=E8=81=94=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=BB=B6=E8=AF=AF=E7=8A=B6=E6=80=81=E5=BB=B6=E8=AF=AF?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E6=B2=A1=E8=BD=AC=E6=88=90=E4=B8=AD=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/pages/main/main.component.html | 2 +- src/app/pages/main/main.component.scss | 1 + .../related-tab/related-tab.component.html | 4 +-- .../main/related-tab/related-tab.component.ts | 32 ++++++++++++++++++- src/app/utils/alert-message-handle.ts | 2 +- 5 files changed, 36 insertions(+), 5 deletions(-) diff --git a/src/app/pages/main/main.component.html b/src/app/pages/main/main.component.html index 53ef721..88d9de5 100644 --- a/src/app/pages/main/main.component.html +++ b/src/app/pages/main/main.component.html @@ -210,7 +210,7 @@
- + diff --git a/src/app/pages/main/main.component.scss b/src/app/pages/main/main.component.scss index 3b30d4a..4954e36 100644 --- a/src/app/pages/main/main.component.scss +++ b/src/app/pages/main/main.component.scss @@ -60,6 +60,7 @@ margin: 0; width: max-content; th { + border-bottom: none; background-color: #ddd; color: rgb(0, 0, 255); text-align: center; 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 af9b49a..2cdd5c5 100644 --- a/src/app/pages/main/related-tab/related-tab.component.html +++ b/src/app/pages/main/related-tab/related-tab.component.html @@ -41,7 +41,7 @@

到达航班：{{lines['preFlight']['FLNO']}}

-

延误类别：{{predelay.CODE}}

+

延误类别：{{predelay.TYPE}}

延误信息：{{predelay.VALUE}}

原定时间：{{predelay.STRT|date:'yyyy-MM-dd HH:mm'}}

延误时间：{{predelay.DURA==predelay.STRT?'待定':predelay.DURA|date:'yyyy-MM-dd HH:mm'}}

@@ -64,7 +64,7 @@

出发航班：{{lines['reaFlight']['FLNO']}}

-

延误类别：{{readelay.CODE||''}}

+

延误类别：{{readelay.TYPE}}

延误信息：{{readelay.VALUE}}

原定时间：{{readelay.STRT|date:'yyyy-MM-dd HH:mm'}}

延误时间：{{readelay.DURA==readelay.STRT?'待定':readelay.DURA|date:'yyyy-MM-dd HH:mm'}}

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 2f4cb48..ed7a87d 100644 --- a/src/app/pages/main/related-tab/related-tab.component.ts +++ b/src/app/pages/main/related-tab/related-tab.component.ts @@ -21,6 +21,7 @@ export class RelatedTabComponent implements OnInit { public reafret; @Input() allAirports; + @Input() flightDefinitions; @Input() set flight(flight) { this.predelay = ''; this.precancle = ''; @@ -61,7 +62,21 @@ export class RelatedTabComponent implements OnInit { if (delyIndex > -1) { let delyMessage = this.lines.preFlight['ABN'][delyIndex].BODY - this.predelay = delyMessage[delyMessage.length - 1]; + this.predelay = delyMessage[delyMessage.length - 1]; + + let fimsFlightstatusDefinition = null; + if (this.flightDefinitions && this.flightDefinitions.length > 0) { + for (let i = 0; i < this.flightDefinitions.length; i++) { + let temp = this.flightDefinitions[i]; + if (temp.flightStatus && temp.flightStatus === this.predelay['CODE'] && temp.flightStatusType && temp.flightStatusType === "DLY") { + fimsFlightstatusDefinition = temp; + break; + } + } + } + if (fimsFlightstatusDefinition) { + this.predelay['TYPE'] = fimsFlightstatusDefinition.ddsc; + } 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'] } @@ -95,6 +110,21 @@ export class RelatedTabComponent implements OnInit { if (delyIndex > -1) { let delyMessage = this.lines.reaFlight['ABN'][delyIndex].BODY this.readelay = delyMessage[delyMessage.length - 1]; + + let fimsFlightstatusDefinition = null; + if (this.flightDefinitions && this.flightDefinitions.length > 0) { + for (let i = 0; i < this.flightDefinitions.length; i++) { + let temp = this.flightDefinitions[i]; + if (temp.flightStatus && temp.flightStatus === this.readelay['CODE'] && temp.flightStatusType && temp.flightStatusType === "DLY") { + fimsFlightstatusDefinition = temp; + break; + } + } + } + if (fimsFlightstatusDefinition) { + this.readelay['TYPE'] = fimsFlightstatusDefinition.ddsc; + } + this.readelay['STRT'] = new Date(dateFormatter(this.readelay['STRT'])).getTime(); this.readelay['DURA'] = parseInt(this.readelay['DURA'].substr(0, 2)) * 3600000 + parseInt(this.readelay['DURA'].substr(2, 3)) * 60000 + this.readelay['STRT']; } diff --git a/src/app/utils/alert-message-handle.ts b/src/app/utils/alert-message-handle.ts index 4a1b356..69f60be 100644 --- a/src/app/utils/alert-message-handle.ts +++ b/src/app/utils/alert-message-handle.ts @@ -44,7 +44,7 @@ export class AlertMessageHandle { let alertText = ""; if (delyArray && delyArray.length > 0) { let delyMessage = delyArray[delyArray.length - 1]; - if (delyMessage && delyMessage.CODE && delyMessage.VALUE) { + if (delyMessage && delyMessage.CODE) { let code = delyMessage.CODE; let reason = delyMessage.VALUE; let dura = delyMessage.DURA;