windy/airport-chengdu-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

去除航班ID列

Browse Source
This commit is contained in:
zhouyuejun
2019-03-26 17:15:50 +08:00
parent d7bb19635a
commit 766724b1c2
4 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/main/main.component.html
+1 -1
View File
@@ -200,7 +200,7 @@
<img class="mr-2" *ngIf="getStopoverNotes(airline_row)" src="/adminweb/assets/images/important-notes/stopover.png" <img class="mr-2" *ngIf="getStopoverNotes(airline_row)" src="/adminweb/assets/images/important-notes/stopover.png"
alt=""> alt="">
</td> </td>
<td style="min-width:165px">{{airline_row['renderFlight']['FLID']}}</td> <!-- <td style="min-width:165px">{{airline_row['renderFlight']['FLID']}}</td> -->
<td *ngFor="let airline_col of render_col_lists" [ngClass]="getPosition(airline_col.COL_CODE,airline_row)" <td *ngFor="let airline_col of render_col_lists" [ngClass]="getPosition(airline_col.COL_CODE,airline_row)"
[ngStyle]="getColor(airline_col.COL_CODE,airline_row,airline_col.COL_WIDTH)">{{airline_row['renderFlight'][airline_col.COL_CODE]}}</td> [ngStyle]="getColor(airline_col.COL_CODE,airline_row,airline_col.COL_WIDTH)">{{airline_row['renderFlight'][airline_col.COL_CODE]}}</td>
</tr> </tr>
src/app/pages/main/main.component.ts
+1 -1
View File
@@ -156,7 +156,7 @@ export class MainComponent implements OnInit {
this.commonCol = [ this.commonCol = [
{ "COL_CODE": "NO", "COL_CN": "序号", "COL_WIDTH": "55px" }, { "COL_CODE": "NO", "COL_CN": "序号", "COL_WIDTH": "55px" },
{ "COL_CODE": "IMPT", "COL_CN": "重要提示", "COL_WIDTH": "120px" }, { "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 => { data.body.forEach(element => {
if (element.groupCode === 'userSettingCol') { if (element.groupCode === 'userSettingCol') {
src/app/utils/flights-data-handle.ts
+5 -5
View File
@@ -144,23 +144,23 @@ export class FlightsDataHandle {
try { try {
if (flights_item['preFlight'] && !flights_item['reaFlight']) { 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++) { for (let i = 0; i < col_lists.length; i++) {
let key = col_lists[i]['COL_CODE']; let key = col_lists[i]['COL_CODE'];
render_flight[key] = this.formatter.hasOwnProperty(key) ? this.formatter[key](flights_item['preFlight']) : flights_item['preFlight'][key]; render_flight[key] = this.formatter.hasOwnProperty(key) ? this.formatter[key](flights_item['preFlight']) : flights_item['preFlight'][key];
} }
flights_item['renderFlight'] = render_flight; flights_item['renderFlight'] = render_flight;
} else if (!flights_item['preFlight'] && flights_item['reaFlight']) { } 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++) { for (let i = 0; i < col_lists.length; i++) {
let key = col_lists[i]['COL_CODE'] let key = col_lists[i]['COL_CODE']
render_flight[key] = this.formatter.hasOwnProperty(key) ? this.formatter[key](flights_item['reaFlight']) : flights_item['reaFlight'][key]; render_flight[key] = this.formatter.hasOwnProperty(key) ? this.formatter[key](flights_item['reaFlight']) : flights_item['reaFlight'][key];
} }
flights_item['renderFlight'] = render_flight; flights_item['renderFlight'] = render_flight;
} else { } else {
render_flight['FLID'] = flights_item['preFlight']['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_pre_flight['FLID'] = flights_item['preFlight']['FLID'];
render_rea_flight['FLID'] = flights_item['reaFlight']['FLID']; // render_rea_flight['FLID'] = flights_item['reaFlight']['FLID'];
for (let i = 0; i < col_lists.length; i++) { for (let i = 0; i < col_lists.length; i++) {
let preHasValue, reaHasValue; let preHasValue, reaHasValue;
let key = col_lists[i]['COL_CODE']; let key = col_lists[i]['COL_CODE'];
src/assets/web-worker-handle.js
+10 -21
View File
@@ -247,7 +247,7 @@ onmessage = function (dynamicData) {
gctmArray.push(gctmTime) gctmArray.push(gctmTime)
} }
}); });
if (gctmArray.length > 0) { if (gctmArray.length > 0) {
let laterTime = Math.max.apply(null, gctmArray); let laterTime = Math.max.apply(null, gctmArray);
return add0(new Date(laterTime).getHours()) + ':' + add0(new Date(laterTime).getMinutes()) return add0(new Date(laterTime).getHours()) + ':' + add0(new Date(laterTime).getMinutes())
@@ -271,19 +271,8 @@ onmessage = function (dynamicData) {
} }
}, },
'ABDG': function abdgFormatter(flight) { 'ABDG': function abdgFormatter(flight) {
if (flight['ABTM']) { if (flight['ABDG']) {
if (Array.isArray(flight['ABTM']) && flight['ABTM'].length > 0) { return flight['ABDG'];
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 '';
}
} else { } else {
return ''; return '';
} }
@@ -382,7 +371,7 @@ onmessage = function (dynamicData) {
cctmArray.push(cctmTime) cctmArray.push(cctmTime)
} }
}); });
if (cctmArray.length > 0) { if (cctmArray.length > 0) {
let laterTime = Math.max.apply(null, cctmArray); let laterTime = Math.max.apply(null, cctmArray);
return add0(new Date(laterTime).getHours()) + ':' + add0(new Date(laterTime).getMinutes()) return add0(new Date(laterTime).getHours()) + ':' + add0(new Date(laterTime).getMinutes())
@@ -412,7 +401,7 @@ onmessage = function (dynamicData) {
cotmArray.push(cctmTime) cotmArray.push(cctmTime)
} }
}); });
if (cotmArray.length > 0) { if (cotmArray.length > 0) {
let laterTime = Math.min.apply(null, cotmArray); let laterTime = Math.min.apply(null, cotmArray);
return add0(new Date(laterTime).getHours()) + ':' + add0(new Date(laterTime).getMinutes()) return add0(new Date(laterTime).getHours()) + ':' + add0(new Date(laterTime).getMinutes())
@@ -1029,23 +1018,23 @@ onmessage = function (dynamicData) {
try { try {
if (flights_item['preFlight'] && !flights_item['reaFlight']) { 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++) { for (let i = 0; i < col_lists.length; i++) {
let key = col_lists[i]['COL_CODE']; let key = col_lists[i]['COL_CODE'];
render_flight[key] = formatter.hasOwnProperty(key) ? formatter[key](flights_item['preFlight']) : flights_item['preFlight'][key]; render_flight[key] = formatter.hasOwnProperty(key) ? formatter[key](flights_item['preFlight']) : flights_item['preFlight'][key];
} }
flights_item['renderFlight'] = render_flight; flights_item['renderFlight'] = render_flight;
} else if (!flights_item['preFlight'] && flights_item['reaFlight']) { } 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++) { for (let i = 0; i < col_lists.length; i++) {
let key = col_lists[i]['COL_CODE'] let key = col_lists[i]['COL_CODE']
render_flight[key] = formatter.hasOwnProperty(key) ? formatter[key](flights_item['reaFlight']) : flights_item['reaFlight'][key]; render_flight[key] = formatter.hasOwnProperty(key) ? formatter[key](flights_item['reaFlight']) : flights_item['reaFlight'][key];
} }
flights_item['renderFlight'] = render_flight; flights_item['renderFlight'] = render_flight;
} else { } else {
render_flight['FLID'] = flights_item['preFlight']['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_pre_flight['FLID'] = flights_item['preFlight']['FLID'];
render_rea_flight['FLID'] = flights_item['reaFlight']['FLID']; // render_rea_flight['FLID'] = flights_item['reaFlight']['FLID'];
for (let i = 0; i < col_lists.length; i++) { for (let i = 0; i < col_lists.length; i++) {
let preHasValue, reaHasValue; let preHasValue, reaHasValue;
let key = col_lists[i]['COL_CODE']; let key = col_lists[i]['COL_CODE'];