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-18 10:58:44 +08:00
parent 4bfc263fa3
commit 81b360d52b
6 changed files with 127 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/main/main.component.ts
+20 -114
View File
@@ -319,8 +319,6 @@ export class MainComponent implements OnInit {
*/
calcVisibleCount() {
this.renderer2.setStyle(this.tableContainer.nativeElement, 'height', this.pageContent.nativeElement.offsetHeight - this.searchFilter.nativeElement.offsetHeight - 35 + 'px');
// console.log(this.tableContainer.nativeElement.offsetHeight);
// console.log(this.tableHead.nativeElement.offsetHeight);
this.renderer2.setStyle(this.tableBody.nativeElement, 'height', this.tableContainer.nativeElement.offsetHeight - this.tableHead.nativeElement.offsetHeight + 'px');
if (!this.tabClose) {
this.renderer2.setStyle(this.tabContainer.nativeElement, 'height', this.pageContent.nativeElement.offsetHeight - this.searchFilter.nativeElement.offsetHeight - 35 + 'px');
@@ -425,33 +423,18 @@ export class MainComponent implements OnInit {
* @param message
*/
dynamicMessageHandle(message) {
let index = this.raw_data.findIndex(element => element['FLID'] === message.FLID);
if (index > -1) {
this.raw_data[index] = message;
} else {
this.raw_data.push(message);
}
if (this.airlinesSelections.findIndex(airline => airline.airlineCodeIata === message['ALCD']) === -1) {
let index = this.airlines.findIndex(val => val.airlineCodeIata === message['ALCD']);
this.airlinesSelections.push(this.airlines[index]);
}
if (this.flightTypeSelections.findIndex(flightType => flightType.flightTypeCode === message['FLTY']) === -1) {
let index = this.flightTypes.findIndex(val => val.flightTypeCode === message['FLTY']);
this.flightTypeSelections.push(this.flightTypes[index]);
}
this.creatWorkers();
this.creatWorkers(message);
}
/**
* 创建线程并执行
*/
public promise: Worker = new Worker('/adminweb/assets/web-worker-handle.js');
creatWorkers() {
creatWorkers(message?) {
let dynamicData = {
message: message,
airlinesSelections: this.airlinesSelections,
flightTypeSelections: this.flightTypeSelections,
raw_data: this.raw_data,
col_lists: this.col_lists,
airports: this.airports,
@@ -462,12 +445,18 @@ export class MainComponent implements OnInit {
}
this.promise.postMessage(dynamicData);
this.promise.onmessage = function (e) {
this.combined_data = e.data;
this.combined_data = e.data.combined_data;
this.raw_data = e.data.raw_data;
this.airlinesSelections = e.data.airlinesSelections;
this.flightTypeSelections = e.data.flightTypeSelections;
this.selectChange('dynamic');
}.bind(this);
// const promise = this.webWorkerService.run(webWorkerHandle, dynamicData);
// promise.then(function (response) {
// this.combined_data = response;
// this.combined_data = response.combined_data;
// this.raw_data = response.raw_data;
// this.airlinesSelections = response.airlinesSelections;
// this.flightTypeSelections = response.flightTypeSelections;
// this.selectChange('dynamic');
// this.webWorkerService.terminate(promise);
// }.bind(this));
@@ -602,28 +591,7 @@ export class MainComponent implements OnInit {
is_satis = false;
break;
}
}
// else if (key === 'Start_time') {
// let planTime = new Date(dateFormatter(item['preFlight']['SODT'])).getTime();
// let nowTime = new Date().getTime();
// if (nowTime - planTime >= +filterItems[key] * 60 * 60 * 1000 || nowTime - planTime < 0) {
// is_satis = false;
// break;
// } else {
// is_satis = true;
// continue;
// }
// } else if (key === 'End_time') {
// let planTime = new Date(dateFormatter(item['preFlight']['SODT'])).getTime();
// let nowTime = new Date().getTime();
// if (planTime - nowTime > +filterItems[key] * 60 * 60 * 1000 || planTime - nowTime < 0) {
// is_satis = false;
// break;
// } else {
// is_satis = true;
// continue;
// }
// }
}
else {
if (item['preFlight'][key] == filterItems[key]) {
is_satis = true;
@@ -649,28 +617,7 @@ export class MainComponent implements OnInit {
break;
}
}
// else if (key === 'Start_time') {
// let planTime = new Date(dateFormatter(item['reaFlight']['SODT'])).getTime();
// let nowTime = new Date().getTime();
// if (nowTime - planTime > +filterItems[key] * 60 * 60 * 1000 || nowTime - planTime < 0) {
// is_satis = false;
// break;
// } else {
// is_satis = true;
// continue;
// }
// } else if (key === 'End_time') {
// let planTime = new Date(dateFormatter(item['reaFlight']['SODT'])).getTime();
// let nowTime = new Date().getTime();
// if (planTime - nowTime > +filterItems[key] * 60 * 60 * 1000 || planTime - nowTime < 0) {
// is_satis = false;
// break;
// } else {
// is_satis = true;
// continue;
// }
// }
else {
else {
if (item['reaFlight'][key] == filterItems[key]) {
is_satis = true;
continue;
@@ -695,28 +642,7 @@ export class MainComponent implements OnInit {
pre_satis = false;
break;
}
}
// else if (key === 'Start_time') {
// let planTime = new Date(dateFormatter(item['preFlight']['SODT'])).getTime();
// let nowTime = new Date().getTime();
// if (nowTime - planTime > +filterItems[key] * 60 * 60 * 1000 || nowTime - planTime < 0) {
// pre_satis = false;
// break;
// } else {
// pre_satis = true;
// continue;
// }
// } else if (key === 'End_time') {
// let planTime = new Date(dateFormatter(item['preFlight']['SODT'])).getTime();
// let nowTime = new Date().getTime();
// if (planTime - nowTime > +filterItems[key] * 60 * 60 * 1000 || planTime - nowTime < 0) {
// pre_satis = false;
// break;
// } else {
// pre_satis = true;
// continue;
// }
// }
}
else {
if (item['preFlight'][key] == filterItems[key]) {
pre_satis = true;
@@ -738,28 +664,7 @@ export class MainComponent implements OnInit {
rea_satis = false;
break;
}
}
// else if (key === 'Start_time') {
// let planTime = new Date(dateFormatter(item['reaFlight']['SODT'])).getTime();
// let nowTime = new Date().getTime();
// if (nowTime - planTime > +filterItems[key] * 60 * 60 * 1000 || nowTime - planTime < 0) {
// rea_satis = false;
// break;
// } else {
// rea_satis = true;
// continue;
// }
// } else if (key === 'End_time') {
// let planTime = new Date(dateFormatter(item['reaFlight']['SODT'])).getTime();
// let nowTime = new Date().getTime();
// if (planTime - nowTime > +filterItems[key] * 60 * 60 * 1000 || planTime - nowTime < 0) {
// rea_satis = false;
// break;
// } else {
// rea_satis = true;
// continue;
// }
// }
}
else {
if (item['reaFlight'][key] == filterItems[key]) {
rea_satis = true;
@@ -1051,9 +956,10 @@ export class MainComponent implements OnInit {
if (this.orderHandle.isArriFlight(flight)) {
return false;
} else {
let reaDelay = flight['reaFlight']['DELY'];
try {
if (flight['reaFlight']['DELY'] && Array.isArray(flight['reaFlight']['DELY']) && flight['reaFlight']['DELY'].length > 0) {
if (parseInt(flight['preFlight']['DELY'][0]['DURA']) - 30 > 0) {
if (reaDelay && Array.isArray(reaDelay) && reaDelay.length > 0) {
if (parseInt(reaDelay[reaDelay.length - 1]['DURA']) - 30 > 0) {
return true;
} else {
return false;