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-12 13:56:57 +08:00
parent 9205f984a5
commit 1852eb7b04
3 changed files with 106 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/main/main.component.html
+4 -4
View File
@@ -101,7 +101,7 @@
<option *ngFor="let anget of flightAgents" [value]="anget.oGId">{{anget.flightAgentName}}</option> <option *ngFor="let anget of flightAgents" [value]="anget.oGId">{{anget.flightAgentName}}</option>
</select> </select>
</div> </div>
<div class="input-container mr-4"> <!-- <div class="input-container mr-4">
<label for="">前时间段：&nbsp;&nbsp;</label> <label for="">前时间段：&nbsp;&nbsp;</label>
<select [(ngModel)]="filterItems.Start_time" (ngModelChange)="selectChange('filter')" class="form-control"> <select [(ngModel)]="filterItems.Start_time" (ngModelChange)="selectChange('filter')" class="form-control">
<option value=""></option> <option value=""></option>
@@ -118,8 +118,8 @@
<option value="11">前11小时</option> <option value="11">前11小时</option>
<option value="12">前12小时</option> <option value="12">前12小时</option>
</select> </select>
</div> </div> -->
<div class="input-container mr-4"> <!-- <div class="input-container mr-4">
<label for="">后时间段：&nbsp;&nbsp;</label> <label for="">后时间段：&nbsp;&nbsp;</label>
<select [(ngModel)]="filterItems.End_time" (ngModelChange)="selectChange('filter')" class="form-control"> <select [(ngModel)]="filterItems.End_time" (ngModelChange)="selectChange('filter')" class="form-control">
<option value=""></option> <option value=""></option>
@@ -136,7 +136,7 @@
<option value="11">后11小时</option> <option value="11">后11小时</option>
<option value="12">后12小时</option> <option value="12">后12小时</option>
</select> </select>
</div> </div> -->
</div> </div>
<div [ngClass]="{'filterClose-c':filterClose,'filterClose-o':!filterClose}" class="third-condition row"> <div [ngClass]="{'filterClose-c':filterClose,'filterClose-o':!filterClose}" class="third-condition row">
src/app/pages/main/main.component.ts
+97 -85
View File
@@ -142,6 +142,7 @@ export class MainComponent implements OnInit {
let data = JSON.parse(event as string); let data = JSON.parse(event as string);
if (data.topic === 'schd') { if (data.topic === 'schd') {
let message = JSON.parse(data.message); let message = JSON.parse(data.message);
console.log(message);
//是否可以开始处理动态消息 //是否可以开始处理动态消息
if (this.canHandleDynamicMessage) { if (this.canHandleDynamicMessage) {
this.dynamicMessageHandle(message); this.dynamicMessageHandle(message);
@@ -150,6 +151,7 @@ export class MainComponent implements OnInit {
} }
} else if (data.topic === 'msg') { } else if (data.topic === 'msg') {
let message = JSON.parse(data.message); let message = JSON.parse(data.message);
console.log(message);
if (this.canHandleDynamicAlert) { if (this.canHandleDynamicAlert) {
this.dynamicAlertHandle(message); this.dynamicAlertHandle(message);
} else { } else {
@@ -318,6 +320,8 @@ export class MainComponent implements OnInit {
*/ */
calcVisibleCount() { calcVisibleCount() {
this.renderer2.setStyle(this.tableContainer.nativeElement, 'height', this.pageContent.nativeElement.offsetHeight - this.searchFilter.nativeElement.offsetHeight - 35 + 'px'); 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'); this.renderer2.setStyle(this.tableBody.nativeElement, 'height', this.tableContainer.nativeElement.offsetHeight - this.tableHead.nativeElement.offsetHeight + 'px');
if (!this.tabClose) { if (!this.tabClose) {
this.renderer2.setStyle(this.tabContainer.nativeElement, 'height', this.pageContent.nativeElement.offsetHeight - this.searchFilter.nativeElement.offsetHeight - 35 + 'px'); 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() { creatWorkers() {
let dynamicData = { let dynamicData = {
raw_data: this.raw_data, raw_data: this.raw_data,
@@ -622,27 +626,29 @@ export class MainComponent implements OnInit {
is_satis = false; is_satis = false;
break; break;
} }
} else if (key === 'Start_time') { }
let planTime = new Date(dateFormatter(item['preFlight']['SODT'])).getTime(); // else if (key === 'Start_time') {
let nowTime = new Date().getTime(); // let planTime = new Date(dateFormatter(item['preFlight']['SODT'])).getTime();
if (nowTime - planTime >= +filterItems[key] * 60 * 60 * 1000 || nowTime - planTime < 0) { // let nowTime = new Date().getTime();
is_satis = false; // if (nowTime - planTime >= +filterItems[key] * 60 * 60 * 1000 || nowTime - planTime < 0) {
break; // is_satis = false;
} else { // break;
is_satis = true; // } else {
continue; // is_satis = true;
} // continue;
} else if (key === 'End_time') { // }
let planTime = new Date(dateFormatter(item['preFlight']['SODT'])).getTime(); // } else if (key === 'End_time') {
let nowTime = new Date().getTime(); // let planTime = new Date(dateFormatter(item['preFlight']['SODT'])).getTime();
if (planTime - nowTime > +filterItems[key] * 60 * 60 * 1000 || planTime - nowTime < 0) { // let nowTime = new Date().getTime();
is_satis = false; // if (planTime - nowTime > +filterItems[key] * 60 * 60 * 1000 || planTime - nowTime < 0) {
break; // is_satis = false;
} else { // break;
is_satis = true; // } else {
continue; // is_satis = true;
} // continue;
} else { // }
// }
else {
if (item['preFlight'][key] == filterItems[key]) { if (item['preFlight'][key] == filterItems[key]) {
is_satis = true; is_satis = true;
continue; continue;
@@ -666,27 +672,29 @@ export class MainComponent implements OnInit {
is_satis = false; is_satis = false;
break; break;
} }
} else if (key === 'Start_time') { }
let planTime = new Date(dateFormatter(item['reaFlight']['SODT'])).getTime(); // else if (key === 'Start_time') {
let nowTime = new Date().getTime(); // let planTime = new Date(dateFormatter(item['reaFlight']['SODT'])).getTime();
if (nowTime - planTime > +filterItems[key] * 60 * 60 * 1000 || nowTime - planTime < 0) { // let nowTime = new Date().getTime();
is_satis = false; // if (nowTime - planTime > +filterItems[key] * 60 * 60 * 1000 || nowTime - planTime < 0) {
break; // is_satis = false;
} else { // break;
is_satis = true; // } else {
continue; // is_satis = true;
} // continue;
} else if (key === 'End_time') { // }
let planTime = new Date(dateFormatter(item['reaFlight']['SODT'])).getTime(); // } else if (key === 'End_time') {
let nowTime = new Date().getTime(); // let planTime = new Date(dateFormatter(item['reaFlight']['SODT'])).getTime();
if (planTime - nowTime > +filterItems[key] * 60 * 60 * 1000 || planTime - nowTime < 0) { // let nowTime = new Date().getTime();
is_satis = false; // if (planTime - nowTime > +filterItems[key] * 60 * 60 * 1000 || planTime - nowTime < 0) {
break; // is_satis = false;
} else { // break;
is_satis = true; // } else {
continue; // is_satis = true;
} // continue;
} else { // }
// }
else {
if (item['reaFlight'][key] == filterItems[key]) { if (item['reaFlight'][key] == filterItems[key]) {
is_satis = true; is_satis = true;
continue; continue;
@@ -711,27 +719,29 @@ export class MainComponent implements OnInit {
pre_satis = false; pre_satis = false;
break; break;
} }
} else if (key === 'Start_time') { }
let planTime = new Date(dateFormatter(item['preFlight']['SODT'])).getTime(); // else if (key === 'Start_time') {
let nowTime = new Date().getTime(); // let planTime = new Date(dateFormatter(item['preFlight']['SODT'])).getTime();
if (nowTime - planTime > +filterItems[key] * 60 * 60 * 1000 || nowTime - planTime < 0) { // let nowTime = new Date().getTime();
pre_satis = false; // if (nowTime - planTime > +filterItems[key] * 60 * 60 * 1000 || nowTime - planTime < 0) {
break; // pre_satis = false;
} else { // break;
pre_satis = true; // } else {
continue; // pre_satis = true;
} // continue;
} else if (key === 'End_time') { // }
let planTime = new Date(dateFormatter(item['preFlight']['SODT'])).getTime(); // } else if (key === 'End_time') {
let nowTime = new Date().getTime(); // let planTime = new Date(dateFormatter(item['preFlight']['SODT'])).getTime();
if (planTime - nowTime > +filterItems[key] * 60 * 60 * 1000 || planTime - nowTime < 0) { // let nowTime = new Date().getTime();
pre_satis = false; // if (planTime - nowTime > +filterItems[key] * 60 * 60 * 1000 || planTime - nowTime < 0) {
break; // pre_satis = false;
} else { // break;
pre_satis = true; // } else {
continue; // pre_satis = true;
} // continue;
} else { // }
// }
else {
if (item['preFlight'][key] == filterItems[key]) { if (item['preFlight'][key] == filterItems[key]) {
pre_satis = true; pre_satis = true;
continue; continue;
@@ -752,27 +762,29 @@ export class MainComponent implements OnInit {
rea_satis = false; rea_satis = false;
break; break;
} }
} else if (key === 'Start_time') { }
let planTime = new Date(dateFormatter(item['reaFlight']['SODT'])).getTime(); // else if (key === 'Start_time') {
let nowTime = new Date().getTime(); // let planTime = new Date(dateFormatter(item['reaFlight']['SODT'])).getTime();
if (nowTime - planTime > +filterItems[key] * 60 * 60 * 1000 || nowTime - planTime < 0) { // let nowTime = new Date().getTime();
rea_satis = false; // if (nowTime - planTime > +filterItems[key] * 60 * 60 * 1000 || nowTime - planTime < 0) {
break; // rea_satis = false;
} else { // break;
rea_satis = true; // } else {
continue; // rea_satis = true;
} // continue;
} else if (key === 'End_time') { // }
let planTime = new Date(dateFormatter(item['reaFlight']['SODT'])).getTime(); // } else if (key === 'End_time') {
let nowTime = new Date().getTime(); // let planTime = new Date(dateFormatter(item['reaFlight']['SODT'])).getTime();
if (planTime - nowTime > +filterItems[key] * 60 * 60 * 1000 || planTime - nowTime < 0) { // let nowTime = new Date().getTime();
rea_satis = false; // if (planTime - nowTime > +filterItems[key] * 60 * 60 * 1000 || planTime - nowTime < 0) {
break; // rea_satis = false;
} else { // break;
rea_satis = true; // } else {
continue; // rea_satis = true;
} // continue;
} else { // }
// }
else {
if (item['reaFlight'][key] == filterItems[key]) { if (item['reaFlight'][key] == filterItems[key]) {
rea_satis = true; rea_satis = true;
continue; continue;
src/app/utils/alert-message-handle.ts
+5 -1
View File
@@ -25,7 +25,11 @@ export class AlertMessageHandle {
// } // }
public flopCncl(message, airports) { 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) { public flopFret(message, airports) {
if (message.FLOP.FRET.REID === 'G') { if (message.FLOP.FRET.REID === 'G') {