From 766724b1c2c9c985f0d638b1f5110b7cc5d3fb17 Mon Sep 17 00:00:00 2001
From: zhouyuejun <505127606@qq.com>
Date: Tue, 26 Mar 2019 17:15:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E8=88=AA=E7=8F=ADID=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/pages/main/main.component.html | 2 +-
src/app/pages/main/main.component.ts | 2 +-
src/app/utils/flights-data-handle.ts | 10 ++++-----
src/assets/web-worker-handle.js | 31 +++++++++-----------------
4 files changed, 17 insertions(+), 28 deletions(-)
diff --git a/src/app/pages/main/main.component.html b/src/app/pages/main/main.component.html
index 41feccc..8939725 100644
--- a/src/app/pages/main/main.component.html
+++ b/src/app/pages/main/main.component.html
@@ -200,7 +200,7 @@
- {{airline_row['renderFlight']['FLID']}} |
+
{{airline_row['renderFlight'][airline_col.COL_CODE]}} |
diff --git a/src/app/pages/main/main.component.ts b/src/app/pages/main/main.component.ts
index e95041f..9f6880d 100644
--- a/src/app/pages/main/main.component.ts
+++ b/src/app/pages/main/main.component.ts
@@ -156,7 +156,7 @@ export class MainComponent implements OnInit {
this.commonCol = [
{ "COL_CODE": "NO", "COL_CN": "序号", "COL_WIDTH": "55px" },
{ "COL_CODE": "IMPT", "COL_CN": "重要提示", "COL_WIDTH": "120px" },
- { "COL_CODE": "FLID", "COL_CN": "航班ID", "COL_WIDTH": "165px" }
+ // { "COL_CODE": "FLID", "COL_CN": "航班ID", "COL_WIDTH": "165px" }
]
data.body.forEach(element => {
if (element.groupCode === 'userSettingCol') {
diff --git a/src/app/utils/flights-data-handle.ts b/src/app/utils/flights-data-handle.ts
index 03cda96..1496ae3 100644
--- a/src/app/utils/flights-data-handle.ts
+++ b/src/app/utils/flights-data-handle.ts
@@ -144,23 +144,23 @@ export class FlightsDataHandle {
try {
if (flights_item['preFlight'] && !flights_item['reaFlight']) {
- render_flight['FLID'] = flights_item['preFlight']['FLID']
+ // render_flight['FLID'] = flights_item['preFlight']['FLID']
for (let i = 0; i < col_lists.length; i++) {
let key = col_lists[i]['COL_CODE'];
render_flight[key] = this.formatter.hasOwnProperty(key) ? this.formatter[key](flights_item['preFlight']) : flights_item['preFlight'][key];
}
flights_item['renderFlight'] = render_flight;
} else if (!flights_item['preFlight'] && flights_item['reaFlight']) {
- render_flight['FLID'] = flights_item['reaFlight']['FLID']
+ // render_flight['FLID'] = flights_item['reaFlight']['FLID']
for (let i = 0; i < col_lists.length; i++) {
let key = col_lists[i]['COL_CODE']
render_flight[key] = this.formatter.hasOwnProperty(key) ? this.formatter[key](flights_item['reaFlight']) : flights_item['reaFlight'][key];
}
flights_item['renderFlight'] = render_flight;
} else {
- render_flight['FLID'] = flights_item['preFlight']['FLID'] + ' / ' + flights_item['reaFlight']['FLID'];
- render_pre_flight['FLID'] = flights_item['preFlight']['FLID'];
- render_rea_flight['FLID'] = flights_item['reaFlight']['FLID'];
+ // render_flight['FLID'] = flights_item['preFlight']['FLID'] + ' / ' + flights_item['reaFlight']['FLID'];
+ // render_pre_flight['FLID'] = flights_item['preFlight']['FLID'];
+ // render_rea_flight['FLID'] = flights_item['reaFlight']['FLID'];
for (let i = 0; i < col_lists.length; i++) {
let preHasValue, reaHasValue;
let key = col_lists[i]['COL_CODE'];
diff --git a/src/assets/web-worker-handle.js b/src/assets/web-worker-handle.js
index 86acfa7..cb53ef3 100644
--- a/src/assets/web-worker-handle.js
+++ b/src/assets/web-worker-handle.js
@@ -247,7 +247,7 @@ onmessage = function (dynamicData) {
gctmArray.push(gctmTime)
}
});
-
+
if (gctmArray.length > 0) {
let laterTime = Math.max.apply(null, gctmArray);
return add0(new Date(laterTime).getHours()) + ':' + add0(new Date(laterTime).getMinutes())
@@ -271,19 +271,8 @@ onmessage = function (dynamicData) {
}
},
'ABDG': function abdgFormatter(flight) {
- if (flight['ABTM']) {
- if (Array.isArray(flight['ABTM']) && flight['ABTM'].length > 0) {
- let abdg = [];
- for (let i = 0; i < flight['ABTM'].length; i++) {
- abdg.push(flight['ABTM'][i]['ABDG']);
- }
- let set = new Set(abdg);
- return Array.from(set).join(',');
- } else if (Object.prototype.toString.call(flight['ABTM']) === '[object Object]') {
- return flight['ABTM']['ABDG'];
- } else {
- return '';
- }
+ if (flight['ABDG']) {
+ return flight['ABDG'];
} else {
return '';
}
@@ -382,7 +371,7 @@ onmessage = function (dynamicData) {
cctmArray.push(cctmTime)
}
});
-
+
if (cctmArray.length > 0) {
let laterTime = Math.max.apply(null, cctmArray);
return add0(new Date(laterTime).getHours()) + ':' + add0(new Date(laterTime).getMinutes())
@@ -412,7 +401,7 @@ onmessage = function (dynamicData) {
cotmArray.push(cctmTime)
}
});
-
+
if (cotmArray.length > 0) {
let laterTime = Math.min.apply(null, cotmArray);
return add0(new Date(laterTime).getHours()) + ':' + add0(new Date(laterTime).getMinutes())
@@ -1029,23 +1018,23 @@ onmessage = function (dynamicData) {
try {
if (flights_item['preFlight'] && !flights_item['reaFlight']) {
- render_flight['FLID'] = flights_item['preFlight']['FLID']
+ // render_flight['FLID'] = flights_item['preFlight']['FLID']
for (let i = 0; i < col_lists.length; i++) {
let key = col_lists[i]['COL_CODE'];
render_flight[key] = formatter.hasOwnProperty(key) ? formatter[key](flights_item['preFlight']) : flights_item['preFlight'][key];
}
flights_item['renderFlight'] = render_flight;
} else if (!flights_item['preFlight'] && flights_item['reaFlight']) {
- render_flight['FLID'] = flights_item['reaFlight']['FLID']
+ // render_flight['FLID'] = flights_item['reaFlight']['FLID']
for (let i = 0; i < col_lists.length; i++) {
let key = col_lists[i]['COL_CODE']
render_flight[key] = formatter.hasOwnProperty(key) ? formatter[key](flights_item['reaFlight']) : flights_item['reaFlight'][key];
}
flights_item['renderFlight'] = render_flight;
} else {
- render_flight['FLID'] = flights_item['preFlight']['FLID'] + ' / ' + flights_item['reaFlight']['FLID'];
- render_pre_flight['FLID'] = flights_item['preFlight']['FLID'];
- render_rea_flight['FLID'] = flights_item['reaFlight']['FLID'];
+ // render_flight['FLID'] = flights_item['preFlight']['FLID'] + ' / ' + flights_item['reaFlight']['FLID'];
+ // render_pre_flight['FLID'] = flights_item['preFlight']['FLID'];
+ // render_rea_flight['FLID'] = flights_item['reaFlight']['FLID'];
for (let i = 0; i < col_lists.length; i++) {
let preHasValue, reaHasValue;
let key = col_lists[i]['COL_CODE'];