cdia/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-15 19:17:52 +08:00
parent a92770f3a0
commit ba238b9416
4 changed files with 74 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/main/main.component.ts
+2 -3
View File
@@ -873,11 +873,11 @@ export class MainComponent implements OnInit {
filterData.forEach(element => { filterData.forEach(element => {
if (element['renderFlight'][sel_col]) { if (element['renderFlight'][sel_col]) {
if (element['renderFlight'][sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) { if (element['renderFlight'][sel_col].toString().match(new RegExp(this.SEARCH, 'i'))) {
transArray.push(element) transArray.push(element);
} }
} else { } else {
if (!this.SEARCH) { if (!this.SEARCH) {
transArray.push(element) transArray.push(element);
} }
} }
}); });
@@ -925,7 +925,6 @@ export class MainComponent implements OnInit {
if (objTr) { if (objTr) {
$("#table-container").animate({ scrollTop: objTr.offsetTop - 42 }, "slow"); $("#table-container").animate({ scrollTop: objTr.offsetTop - 42 }, "slow");
} }
} }
/** /**
src/app/utils/transfer-render-handle.ts
+36 -22
View File
@@ -1,17 +1,21 @@
import timeFormatter from './time-formatter'; import timeFormatter from './time-formatter';
import dateWithNotimeFormatter from './date-with-notime-formatter'; import dateWithNotimeFormatter from './date-with-notime-formatter';
export class TransferRenderHandle { export class TransferRenderHandle {
public renoFormatter(flight){ public renoFormatter(flight) {
if(flight['RENO']){ if (flight['RENO']) {
if(flight['LRENO']){ if (flight['LRENO']) {
return flight['RENO'] + '(' + flight['LRENO'] + ')'; if (flight['RENO'] == flight['LRENO']) {
}else{ return flight['RENO'];
} else {
return flight['RENO'] + '(' + flight['LRENO'] + ')';
}
} else {
return flight['RENO']; return flight['RENO'];
} }
}else{ } else {
if(flight['LRENO']){ if (flight['LRENO']) {
return '(' + flight['LRENO'] + ')'; return '(' + flight['LRENO'] + ')';
}else{ } else {
return ''; return '';
} }
} }
@@ -242,29 +246,39 @@ export class TransferRenderHandle {
psst.push(flight['PSDT'][i]['PSST']); psst.push(flight['PSDT'][i]['PSST']);
} }
let set = new Set(psst); let set = new Set(psst);
if(flight['LPSDT']){ let joinedPsst = Array.from(set).join(',')
return Array.from(set).join(',') + '(' + flight['LPSDT'] + ')'; if (flight['LPSDT']) {
}else{ if (joinedPsst == flight['LPSDT']) {
return Array.from(set).join(','); return joinedPsst;
} else {
return joinedPsst + '(' + flight['LPSDT'] + ')';
}
} else {
return joinedPsst;
} }
} else if (Object.prototype.toString.call(flight['PSDT']) === '[object Object]') { } else if (Object.prototype.toString.call(flight['PSDT']) === '[object Object]') {
if(flight['LPSDT']){ if (flight['LPSDT']) {
return flight['PSDT']['PSST'] + '(' + flight['LPSDT'] + ')'; if (flight['PSDT']['PSST'] == flight['LPSDT']) {
}else{ return flight['PSDT']['PSST'];
return flight['PSDT']['PSST']; } else {
return flight['PSDT']['PSST'] + '(' + flight['LPSDT'] + ')';
}
} else {
return flight['PSDT']['PSST'];
} }
} else { } else {
if(flight['LPSDT']){ if (flight['LPSDT']) {
return '(' + flight['LPSDT'] + ')'; return '(' + flight['LPSDT'] + ')';
}else{ } else {
return ''; return '';
} }
} }
} else { } else {
if(flight['LPSDT']){ if (flight['LPSDT']) {
return '(' + flight['LPSDT'] + ')'; return '(' + flight['LPSDT'] + ')';
}else{ } else {
return ''; return '';
} }
} }
} }
src/app/utils/web-worker-handle.ts
+18 -4
View File
@@ -155,7 +155,11 @@ export default function (dynamicData) {
'RENO': function renoFormatter(flight) { 'RENO': function renoFormatter(flight) {
if (flight['RENO']) { if (flight['RENO']) {
if (flight['LRENO']) { if (flight['LRENO']) {
return flight['RENO'] + '(' + flight['LRENO'] + ')'; if (flight['RENO'] == flight['LRENO']) {
return flight['RENO'];
} else {
return flight['RENO'] + '(' + flight['LRENO'] + ')';
}
} else { } else {
return flight['RENO']; return flight['RENO'];
} }
@@ -393,14 +397,24 @@ export default function (dynamicData) {
psst.push(flight['PSDT'][i]['PSST']); psst.push(flight['PSDT'][i]['PSST']);
} }
let set = new Set(psst); let set = new Set(psst);
let joinedPsst = Array.from(set).join(',')
if (flight['LPSDT']) { if (flight['LPSDT']) {
return Array.from(set).join(',') + '(' + flight['LPSDT'] + ')'; if (joinedPsst == flight['LPSDT']) {
return joinedPsst;
} else {
return joinedPsst + '(' + flight['LPSDT'] + ')';
}
} else { } else {
return Array.from(set).join(','); return joinedPsst;
} }
} else if (Object.prototype.toString.call(flight['PSDT']) === '[object Object]') { } else if (Object.prototype.toString.call(flight['PSDT']) === '[object Object]') {
if (flight['LPSDT']) { if (flight['LPSDT']) {
return flight['PSDT']['PSST'] + '(' + flight['LPSDT'] + ')'; if (flight['PSDT']['PSST'] == flight['LPSDT']) {
return flight['PSDT']['PSST'];
} else {
return flight['PSDT']['PSST'] + '(' + flight['LPSDT'] + ')';
}
} else { } else {
return flight['PSDT']['PSST']; return flight['PSDT']['PSST'];
} }
src/assets/web-worker-handle.js
+18 -4
View File
@@ -155,7 +155,11 @@ onmessage = function (dynamicData) {
'RENO': function renoFormatter(flight) { 'RENO': function renoFormatter(flight) {
if (flight['RENO']) { if (flight['RENO']) {
if (flight['LRENO']) { if (flight['LRENO']) {
return flight['RENO'] + '(' + flight['LRENO'] + ')'; if (flight['RENO'] == flight['LRENO']) {
return flight['RENO'];
} else {
return flight['RENO'] + '(' + flight['LRENO'] + ')';
}
} else { } else {
return flight['RENO']; return flight['RENO'];
} }
@@ -393,14 +397,24 @@ onmessage = function (dynamicData) {
psst.push(flight['PSDT'][i]['PSST']); psst.push(flight['PSDT'][i]['PSST']);
} }
let set = new Set(psst); let set = new Set(psst);
let joinedPsst = Array.from(set).join(',')
if (flight['LPSDT']) { if (flight['LPSDT']) {
return Array.from(set).join(',') + '(' + flight['LPSDT'] + ')'; if (joinedPsst == flight['LPSDT']) {
return joinedPsst;
} else {
return joinedPsst + '(' + flight['LPSDT'] + ')';
}
} else { } else {
return Array.from(set).join(','); return joinedPsst;
} }
} else if (Object.prototype.toString.call(flight['PSDT']) === '[object Object]') { } else if (Object.prototype.toString.call(flight['PSDT']) === '[object Object]') {
if (flight['LPSDT']) { if (flight['LPSDT']) {
return flight['PSDT']['PSST'] + '(' + flight['LPSDT'] + ')'; if (flight['PSDT']['PSST'] == flight['LPSDT']) {
return flight['PSDT']['PSST'];
} else {
return flight['PSDT']['PSST'] + '(' + flight['LPSDT'] + ')';
}
} else { } else {
return flight['PSDT']['PSST']; return flight['PSDT']['PSST'];
} }