windy/airport-chengdu-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

航线变更通知内容修改

Browse Source
This commit is contained in:
zhouyuejun
2019-01-21 12:04:21 +08:00
parent 81b360d52b
commit 40892850f3
4 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/main/detail-tab/detail-tab.component.html
+10 -7
View File
@@ -5,7 +5,8 @@
<div class="tab-container">
<div class="hr-line">描述类 -----------------------------------------</div>
<div class="message-container">
<p class="mt-2"><label>航班号：</label>{{singleFlight.FLNO}}</p>
<p><label>航班号：</label>{{singleFlight.FLNO}}</p>
<p><label>所属航站楼：</label>{{singleFlight.TRML}}</p>
<p><label>航空公司：</label>{{singleFlight.ALCD}}</p>
<p><label>航线类别：</label>{{singleFlight.FLIN}}</p>
<p><label>航班类别：</label>{{singleFlight.FLTY}}</p>
@@ -14,20 +15,22 @@
<p><label>航班机型：</label>{{singleFlight.ACFT}}</p>
<p><label>到达/出发：</label>{{singleFlight.MVIN}}</p>
<p><label>飞机号：</label>{{singleFlight.RENO}}</p>
<p><label>当前状态：</label>{{singleFlight.FTSS}}</p>
<p><label>运营状态：</label>{{singleFlight.FTSS}}</p>
<p><label>备注说明：</label>{{showRemc}}</p>
</div>
<div class="hr-line">资源类 -----------------------------------------</div>
<div class="message-container">
<p class="mt-2"><label>停机位：</label>{{showPsst}}</p>
<p><label>停机位：</label>{{showPsst}}</p>
<p><label>登机门：</label>{{singleFlight.GTDT}}</p>
<p><label>值机柜台：</label>{{singleFlight.CHKC}}</p>
<p><label>行李传送带：</label>{{singleFlight.CHUT}}</p>
</div>
<div class="hr-line">时间类 -----------------------------------------</div>
<div class="message-container">
<p class="mt-2"><label>计划到达/出发：</label>{{singleFlight.SODT}}</p>
<p><label>预计到达/出发：</label>{{singleFlight.ESTT}}</p>
<p><label>实际到达/出发：</label>{{singleFlight.ACTT}}</p>
<p><label>运营日期：</label>{{singleFlight.FLDT}}</p>
<p><label>计划时间：</label>{{singleFlight.SODT}}</p>
<p><label>预计时间：</label>{{singleFlight.ESTT}}</p>
<p><label>实际时间：</label>{{singleFlight.ACTT}}</p>
<p><label>上轮档：</label>{{singleFlight.CHTM_ON}}</p>
<p><label>下轮档：</label>{{singleFlight.CHTM_OFF}}</p>
<p><label>值机开始：</label>{{singleFlight.COTM}}</p>
@@ -35,4 +38,4 @@
<p><label>开始登机：</label>{{singleFlight.BOTM}}</p>
<p><label>登机结束：</label>{{singleFlight.GCTM}}</p>
</div>
</div>
</div>
src/app/pages/main/detail-tab/detail-tab.component.ts
+8
View File
@@ -11,11 +11,13 @@ export class DetailTabComponent implements OnInit {
public btnClickDisabled: boolean = true;
public showPsst: string;
public showRemc:string;
@Input() set flight(flight) {
this.lines = Object.assign({}, flight);
if (this.lines.preFlight && !this.lines.reaFlight) {
this.singleFlight = this.lines.renderFlight;
this.showRemc = this.lines.preFlight.REMC;
let psst = this.psstFormatter(this.lines.preFlight);
if (psst) {
this.showPsst = (this.singleFlight.STND || '') + '(' + psst + ')';
@@ -25,6 +27,7 @@ export class DetailTabComponent implements OnInit {
this.btnClickDisabled = true;
} else if (!this.lines.preFlight && this.lines.reaFlight) {
this.singleFlight = this.lines.renderFlight;
this.showRemc = this.lines.reaFlight.REMC;
let psst = this.psstFormatter(this.lines.reaFlight);
if (psst) {
this.showPsst = (this.singleFlight.STND || '') + '(' + psst + ')';
@@ -34,6 +37,7 @@ export class DetailTabComponent implements OnInit {
this.btnClickDisabled = true;
} else {
this.singleFlight = this.lines.renderPreFlight;
this.showRemc = this.lines.preFlight.REMC;
let psst = this.psstFormatter(this.lines.preFlight);
if (psst) {
this.showPsst = (this.singleFlight.STND || '') + '(' + psst + ')';
@@ -51,6 +55,7 @@ export class DetailTabComponent implements OnInit {
showPreFlight() {
if (this.lines.preFlight && !this.lines.reaFlight) {
this.singleFlight = this.lines.renderFlight;
this.showRemc = this.lines.preFlight.REMC;
let psst = this.psstFormatter(this.lines.preFlight);
if (psst) {
this.showPsst = (this.singleFlight.STND || '') + '(' + psst + ')';
@@ -60,6 +65,7 @@ export class DetailTabComponent implements OnInit {
this.btnClickDisabled = true;
} else {
this.singleFlight = this.lines.renderPreFlight;
this.showRemc = this.lines.preFlight.REMC;
let psst = this.psstFormatter(this.lines.preFlight);
if (psst) {
this.showPsst = (this.singleFlight.STND || '') + '(' + psst + ')';
@@ -72,6 +78,7 @@ export class DetailTabComponent implements OnInit {
showReaFlight() {
if (!this.lines.preFlight && this.lines.reaFlight) {
this.singleFlight = this.lines.renderFlight;
this.showRemc = this.lines.reaFlight.REMC;
let psst = this.psstFormatter(this.lines.reaFlight);
if (psst) {
this.showPsst = (this.singleFlight.STND || '') + '(' + psst + ')';
@@ -81,6 +88,7 @@ export class DetailTabComponent implements OnInit {
this.btnClickDisabled = true;
} else {
this.singleFlight = this.lines.renderReaFlight;
this.showRemc = this.lines.reaFlight.REMC;
let psst = this.psstFormatter(this.lines.reaFlight);
if (psst) {
this.showPsst = (this.singleFlight.STND || '') + '(' + psst + ')';
src/app/pages/main/main.component.ts
+10 -2
View File
@@ -141,7 +141,7 @@ export class MainComponent implements OnInit {
let data = JSON.parse(event as string);
if (data.topic === 'schd') {
let message = JSON.parse(data.message);
// console.log(message);
console.log(message);
//是否可以开始处理动态消息
if (this.canHandleDynamicMessage) {
this.dynamicMessageHandle(message);
@@ -150,7 +150,7 @@ export class MainComponent implements OnInit {
}
} else if (data.topic === 'msg') {
let message = JSON.parse(data.message);
// console.log(message);
console.log(message);
if (this.canHandleDynamicAlert) {
this.dynamicAlertHandle(message);
} else {
@@ -290,10 +290,12 @@ export class MainComponent implements OnInit {
this.dynamicMessageArray.forEach(message => {
this.dynamicMessageHandle(message);
})
this.dynamicMessageArray = [];
this.canHandleDynamicAlert = true;
this.dynamicAlertArray.forEach(message => {
this.dynamicAlertHandle(message);
})
this.dynamicAlertArray = [];
}
/**
@@ -879,8 +881,14 @@ export class MainComponent implements OnInit {
if (col_CODE === 'SODT' || col_CODE === 'ESTT' || col_CODE === 'ACTT') {
if (!flight['renderPreFlight'][col_CODE] && flight['renderReaFlight'][col_CODE]) {
return 'text-right';
} else if (flight['renderPreFlight'][col_CODE] && !flight['renderReaFlight'][col_CODE]) {
return 'text-left';
}
}
} else {
if (col_CODE === 'FLNO' || col_CODE === 'SODT' || col_CODE === 'ESTT' || col_CODE === 'ACTT') {
return 'text-left';
}
}
}
src/app/utils/alert-message-handle.ts
+17 -7
View File
@@ -134,21 +134,31 @@ export class AlertMessageHandle {
let mvin = message.FLOP.FFID.split('-')[2];
let rout = [];
if (Array.isArray(message.FLOP['ROUT']) && message.FLOP['ROUT'] > 0) {
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']);
let cityIndex = citys.findIndex(val => airports[airportIndex].cityId === val.cityId);
rout.push(citys[cityIndex].cityNameChn);
if(airportIndex>-1){
if (airports[airportIndex].briefNameChn) {
rout.push(airports[airportIndex].briefNameChn);
} else {
rout.push(airports[airportIndex].airportNameChn);
}
}
}
} else if (Object.prototype.toString.call(message.FLOP['ROUT']) === '[object Object]') {
let airportIndex = airports.findIndex(val => val.airportCodeIata === message.FLOP['ROUT']['APCD']);
let cityIndex = citys.findIndex(val => airports[airportIndex].cityId === val.cityId);
rout.push(citys[cityIndex].cityNameChn);
if(airportIndex>-1){
if (airports[airportIndex].briefNameChn) {
rout.push(airports[airportIndex].briefNameChn);
} else {
rout.push(airports[airportIndex].airportNameChn);
}
}
}
if (mvin === 'A') {
rout.push('成都');
rout.push('蓉');
} else if (mvin === 'D') {
rout.unshift('成都');
rout.unshift('蓉');
}
return message.FLOP.FFID + '航线更改为：' + rout.join(' - ');
}