主航班添加共享航班号

This commit is contained in:
zhouyuejun
2019-01-15 15:11:01 +08:00
parent a20a8536db
commit a92770f3a0
6 changed files with 103 additions and 476 deletions
+5 -34
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 {
@@ -432,28 +432,6 @@ export class MainComponent implements OnInit {
this.raw_data.push(message);
}
//查找链接航班并将其组合成一条数据
// let combined_linked_data = this.dataHandle.findLinkFlights(this.raw_data);
// let combined_data = [];
// this.combined_data = [];
// combined_linked_data.forEach(element => {
// let flights_item = this.dataHandle.flightsRenderTransfer(element, this.col_lists);
// this.combined_data.push(flights_item);
// });
// this.combined_data.forEach(item => {
// combined_data.push(this.dataHandle.basicDataTransHandle(item, this.airports, this.citys, this.airlines, this.flightStatus, this.flightTypes));
// })
// this.combined_data = combined_data;
// this.combined_data.forEach(element => {
// element['ORDER'] = this.orderHandle.sequence(element);
// })
// this.combined_data = this.combined_data.sort(function (a, b) {
// return (a['ORDER'] - b['ORDER']);
// })
// this.selectChange('dynamic');
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]);
@@ -471,7 +449,7 @@ export class MainComponent implements OnInit {
/**
* 创建线程并执行
*/
public promise: Worker = new Worker('/adminweb/assets/web-worker-handle.js');
public promise: Worker = new Worker('/assets/web-worker-handle.js');
creatWorkers() {
let dynamicData = {
raw_data: this.raw_data,
@@ -484,7 +462,7 @@ export class MainComponent implements OnInit {
}
this.promise.postMessage(dynamicData);
this.promise.onmessage = function (e) {
// console.log('=====')
console.log('=====')
this.combined_data = e.data;
this.selectChange('dynamic');
// this.promise.terminate();
@@ -878,7 +856,7 @@ export class MainComponent implements OnInit {
})
}, 500)
// this.render_data = filterData;
this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} };
// this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} };
this.operateSpinServiceService.hideSpin();
}
@@ -1228,11 +1206,4 @@ export class MainComponent implements OnInit {
}, 10)
}
}
/**
* tab项切换事件
*/
nzClick() {
}
}