diff --git a/src/app/pages/main/main.component.html b/src/app/pages/main/main.component.html index b34be1a..a99a08b 100644 --- a/src/app/pages/main/main.component.html +++ b/src/app/pages/main/main.component.html @@ -101,6 +101,42 @@ +
+ + +
+
+ + +
diff --git a/src/app/pages/main/main.component.ts b/src/app/pages/main/main.component.ts index e27c850..9aa7096 100644 --- a/src/app/pages/main/main.component.ts +++ b/src/app/pages/main/main.component.ts @@ -398,6 +398,8 @@ export class MainComponent implements OnInit { FTSS: '', //运营状态 TRML: '', //航站楼 Abnormal_state: '', //异常状态 + Start_time: '', + End_time: '', FHAG: '', //机坪代理 MHAG: '', //维护代理 PHAG: '', //旅客代理 @@ -462,6 +464,8 @@ export class MainComponent implements OnInit { FTSS: '', //运营状态 TRML: '', //航站楼 Abnormal_state: '', //异常状态 + Start_time: '', + End_time: '', FHAG: '', //机坪代理 MHAG: '', //维护代理 PHAG: '', //旅客代理 @@ -503,6 +507,26 @@ 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) { + 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) { + is_satis = false; + break; + } else { + is_satis = true; + continue; + } } else { if (item['preFlight'][key] === filterItems[key]) { is_satis = true; @@ -527,6 +551,26 @@ 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) { + 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) { + is_satis = false; + break; + } else { + is_satis = true; + continue; + } } else { if (item['reaFlight'][key] === filterItems[key]) { is_satis = true; @@ -552,6 +596,26 @@ 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) { + 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) { + pre_satis = false; + break; + } else { + pre_satis = true; + continue; + } } else { if (item['preFlight'][key] === filterItems[key]) { pre_satis = true; @@ -573,6 +637,26 @@ 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) { + 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) { + rea_satis = false; + break; + } else { + rea_satis = true; + continue; + } } else { if (item['reaFlight'][key] === filterItems[key]) { rea_satis = true;