From 48d6da220901cb062306e1f09e7a75a83db503e9 Mon Sep 17 00:00:00 2001
From: zhouyuejun <505127606@qq.com>
Date: Sun, 30 Dec 2018 19:36:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4=E6=AE=B5?=
=?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/pages/main/main.component.html | 36 +++++++++++
src/app/pages/main/main.component.ts | 84 ++++++++++++++++++++++++++
2 files changed, 120 insertions(+)
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;