diff --git a/src/app/pages/main/main.component.html b/src/app/pages/main/main.component.html
index 7f64275..692ae13 100644
--- a/src/app/pages/main/main.component.html
+++ b/src/app/pages/main/main.component.html
@@ -101,7 +101,7 @@
-
+
+
diff --git a/src/app/pages/main/main.component.ts b/src/app/pages/main/main.component.ts
index 69c318b..0092210 100644
--- a/src/app/pages/main/main.component.ts
+++ b/src/app/pages/main/main.component.ts
@@ -142,6 +142,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);
//是否可以开始处理动态消息
if (this.canHandleDynamicMessage) {
this.dynamicMessageHandle(message);
@@ -150,6 +151,7 @@ export class MainComponent implements OnInit {
}
} else if (data.topic === 'msg') {
let message = JSON.parse(data.message);
+ console.log(message);
if (this.canHandleDynamicAlert) {
this.dynamicAlertHandle(message);
} else {
@@ -318,6 +320,8 @@ 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');
@@ -468,7 +472,7 @@ export class MainComponent implements OnInit {
/**
* 创建线程并执行
*/
- public promise:Worker = new Worker('/adminweb/assets/web-worker-handle.js');
+ public promise: Worker = new Worker('/adminweb/assets/web-worker-handle.js');
creatWorkers() {
let dynamicData = {
raw_data: this.raw_data,
@@ -622,27 +626,29 @@ 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 {
+ }
+ // 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;
continue;
@@ -666,27 +672,29 @@ export class MainComponent implements OnInit {
is_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) {
- 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 (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 {
if (item['reaFlight'][key] == filterItems[key]) {
is_satis = true;
continue;
@@ -711,27 +719,29 @@ 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 {
+ }
+ // 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;
continue;
@@ -752,27 +762,29 @@ 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 {
+ }
+ // 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;
continue;
diff --git a/src/app/utils/alert-message-handle.ts b/src/app/utils/alert-message-handle.ts
index 1950e8a..3ad6f98 100644
--- a/src/app/utils/alert-message-handle.ts
+++ b/src/app/utils/alert-message-handle.ts
@@ -25,7 +25,11 @@ export class AlertMessageHandle {
// }
public flopCncl(message, airports) {
- return message.FLOP.FFID + '航班取消';
+ if(message.FLOP.CNCL){
+ return message.FLOP.FFID + '航班取消';
+ }else{
+ return message.FLOP.FFID + '航班恢复';
+ }
}
public flopFret(message, airports) {
if (message.FLOP.FRET.REID === 'G') {