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-05-09 11:31:45 +08:00
parent 833108cd0d
commit 7e2d84c443
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/main/main.component.html
+1 -1
View File
@@ -5,7 +5,7 @@
<div class="line-operator-left input-container mb-2"> <div class="line-operator-left input-container mb-2">
<select [(ngModel)]="SEL_COL" class="mr-4 form-control" (ngModelChange)="resetPositionArray()"> <select [(ngModel)]="SEL_COL" class="mr-4 form-control" (ngModelChange)="resetPositionArray()">
<option value="">选择列名</option> <option value="">选择列名</option>
<option *ngFor="let airline_col of render_col_lists" [value]="airline_col.COL_CODE">{{airline_col.COL_CN}}</option> <option *ngFor="let airline_col of select_col_lists" [value]="airline_col.COL_CODE">{{airline_col.COL_CN}}</option>
</select> </select>
<label class="radio-inline custom-radio nowrap mr-4"> <label class="radio-inline custom-radio nowrap mr-4">
<input type="radio" [(ngModel)]="FLT_POS" [value]="1" name="filter-position"> <input type="radio" [(ngModel)]="FLT_POS" [value]="1" name="filter-position">
src/app/pages/main/main.component.ts
+16 -11
View File
@@ -96,6 +96,7 @@ export class MainComponent implements OnInit {
public commonCol: Array<object>; public commonCol: Array<object>;
public col_lists: Array<object>; //列数据 public col_lists: Array<object>; //列数据
public render_col_lists: Array<object>; public render_col_lists: Array<object>;
public select_col_lists: Array<object>;
public airline_color: Array<object> = []; public airline_color: Array<object> = [];
public airline_message_alert: Array<object> = []; public airline_message_alert: Array<object> = [];
@@ -163,6 +164,8 @@ export class MainComponent implements OnInit {
if (element.groupCode === 'userSettingCol') { if (element.groupCode === 'userSettingCol') {
this.col_lists = JSON.parse(element.settingContent).defaultData; this.col_lists = JSON.parse(element.settingContent).defaultData;
this.render_col_lists = JSON.parse(element.settingContent).targetList; this.render_col_lists = JSON.parse(element.settingContent).targetList;
this.select_col_lists = JSON.parse(element.settingContent).targetList;
this.select_col_lists.unshift({ "COL_CODE": "FLNO", "COL_CN": "航班号", "COL_ORDER": "0", "COL_WIDTH": "140px" })
} else if (element.groupCode === 'userSettingColor') { } else if (element.groupCode === 'userSettingColor') {
this.airline_color = JSON.parse(element.settingContent); this.airline_color = JSON.parse(element.settingContent);
} else if (element.groupCode === 'userSettingMsgAlert') { } else if (element.groupCode === 'userSettingMsgAlert') {
@@ -386,6 +389,8 @@ export class MainComponent implements OnInit {
if (element.groupCode === 'userSettingCol') { if (element.groupCode === 'userSettingCol') {
this.col_lists = JSON.parse(element.settingContent).defaultData; this.col_lists = JSON.parse(element.settingContent).defaultData;
this.render_col_lists = JSON.parse(element.settingContent).targetList; this.render_col_lists = JSON.parse(element.settingContent).targetList;
this.select_col_lists = JSON.parse(element.settingContent).targetList;
this.select_col_lists.unshift({ "COL_CODE": "FLNO", "COL_CN": "航班号", "COL_ORDER": "0", "COL_WIDTH": "140px" })
} else if (element.groupCode === 'userSettingColor') { } else if (element.groupCode === 'userSettingColor') {
this.airline_color = JSON.parse(element.settingContent); this.airline_color = JSON.parse(element.settingContent);
} else if (element.groupCode === 'userSettingMsgAlert') { } else if (element.groupCode === 'userSettingMsgAlert') {
@@ -438,7 +443,7 @@ export class MainComponent implements OnInit {
}) })
let colArray = []; let colArray = [];
this.render_col_lists.forEach(element => { this.select_col_lists.forEach(element => {
let column = { 'key': element['COL_CODE'], "name": element['COL_CN'] } let column = { 'key': element['COL_CODE'], "name": element['COL_CN'] }
colArray.push(column); colArray.push(column);
}) })
@@ -631,7 +636,7 @@ export class MainComponent implements OnInit {
groupCode: 'userSettingSelected', groupCode: 'userSettingSelected',
settingContent: settingContent, settingContent: settingContent,
}).subscribe(() => { }).subscribe(() => {
}) })
} else if (type === 'time') { } else if (type === 'time') {
this.positionedArray = []; this.positionedArray = [];
@@ -652,7 +657,7 @@ export class MainComponent implements OnInit {
for (const key in filterItems) { for (const key in filterItems) {
if (filterItems.hasOwnProperty(key) && filterItems[key]) { if (filterItems.hasOwnProperty(key) && filterItems[key]) {
if (key === 'Abnormal_state') { if (key === 'Abnormal_state') {
if(item['preFlight']['ABN'].findIndex((val)=>val['TYPE']===filterItems[key])>-1){ if (item['preFlight']['ABN'].findIndex((val) => val['TYPE'] === filterItems[key]) > -1) {
is_satis = true; is_satis = true;
continue; continue;
} else { } else {
@@ -688,7 +693,7 @@ export class MainComponent implements OnInit {
for (const key in filterItems) { for (const key in filterItems) {
if (filterItems.hasOwnProperty(key) && filterItems[key]) { if (filterItems.hasOwnProperty(key) && filterItems[key]) {
if (key === 'Abnormal_state') { if (key === 'Abnormal_state') {
if (item['reaFlight']['ABN'].findIndex((val)=>val['TYPE']===filterItems[key])>-1) { if (item['reaFlight']['ABN'].findIndex((val) => val['TYPE'] === filterItems[key]) > -1) {
is_satis = true; is_satis = true;
continue; continue;
} else { } else {
@@ -725,7 +730,7 @@ export class MainComponent implements OnInit {
for (const key in filterItems) { for (const key in filterItems) {
if (filterItems.hasOwnProperty(key) && filterItems[key]) { if (filterItems.hasOwnProperty(key) && filterItems[key]) {
if (key === 'Abnormal_state') { if (key === 'Abnormal_state') {
if (item['preFlight']['ABN'].findIndex((val)=>val['TYPE']===filterItems[key])>-1) { if (item['preFlight']['ABN'].findIndex((val) => val['TYPE'] === filterItems[key]) > -1) {
pre_satis = true; pre_satis = true;
continue; continue;
} else { } else {
@@ -758,7 +763,7 @@ export class MainComponent implements OnInit {
for (const key in filterItems) { for (const key in filterItems) {
if (filterItems.hasOwnProperty(key) && filterItems[key]) { if (filterItems.hasOwnProperty(key) && filterItems[key]) {
if (key === 'Abnormal_state') { if (key === 'Abnormal_state') {
if (item['reaFlight']['ABN'].findIndex((val)=>val['TYPE']===filterItems[key])>-1) { if (item['reaFlight']['ABN'].findIndex((val) => val['TYPE'] === filterItems[key]) > -1) {
rea_satis = true; rea_satis = true;
continue; continue;
} else { } else {
@@ -813,7 +818,7 @@ export class MainComponent implements OnInit {
for (const key in filterItems) { for (const key in filterItems) {
if (filterItems.hasOwnProperty(key) && filterItems[key]) { if (filterItems.hasOwnProperty(key) && filterItems[key]) {
if (key === 'Abnormal_state') { if (key === 'Abnormal_state') {
if (item['preFlight']['ABN'].findIndex((val)=>val['TYPE']===filterItems[key])>-1) { if (item['preFlight']['ABN'].findIndex((val) => val['TYPE'] === filterItems[key]) > -1) {
is_satis = true; is_satis = true;
continue; continue;
} else { } else {
@@ -838,7 +843,7 @@ export class MainComponent implements OnInit {
for (const key in filterItems) { for (const key in filterItems) {
if (filterItems.hasOwnProperty(key) && filterItems[key]) { if (filterItems.hasOwnProperty(key) && filterItems[key]) {
if (key === 'Abnormal_state') { if (key === 'Abnormal_state') {
if (item['reaFlight']['ABN'].findIndex((val)=>val['TYPE']===filterItems[key])>-1) { if (item['reaFlight']['ABN'].findIndex((val) => val['TYPE'] === filterItems[key]) > -1) {
is_satis = true; is_satis = true;
continue; continue;
} else { } else {
@@ -864,7 +869,7 @@ export class MainComponent implements OnInit {
for (const key in filterItems) { for (const key in filterItems) {
if (filterItems.hasOwnProperty(key) && filterItems[key]) { if (filterItems.hasOwnProperty(key) && filterItems[key]) {
if (key === 'Abnormal_state') { if (key === 'Abnormal_state') {
if (item['preFlight']['ABN'].findIndex((val)=>val['TYPE']===filterItems[key])>-1) { if (item['preFlight']['ABN'].findIndex((val) => val['TYPE'] === filterItems[key]) > -1) {
pre_satis = true; pre_satis = true;
continue; continue;
} else { } else {
@@ -886,7 +891,7 @@ export class MainComponent implements OnInit {
for (const key in filterItems) { for (const key in filterItems) {
if (filterItems.hasOwnProperty(key) && filterItems[key]) { if (filterItems.hasOwnProperty(key) && filterItems[key]) {
if (key === 'Abnormal_state') { if (key === 'Abnormal_state') {
if (item['reaFlight']['ABN'].findIndex((val)=>val['TYPE']===filterItems[key])>-1) { if (item['reaFlight']['ABN'].findIndex((val) => val['TYPE'] === filterItems[key]) > -1) {
rea_satis = true; rea_satis = true;
continue; continue;
} else { } else {
@@ -1120,7 +1125,7 @@ export class MainComponent implements OnInit {
} }
} }
} else { } else {
let cols = this.render_col_lists; let cols = this.select_col_lists;
for (let i = 0; i < filterData.length; i++) { for (let i = 0; i < filterData.length; i++) {
if (i === filterData.length - 1) { if (i === filterData.length - 1) {
this.positionedArray = []; this.positionedArray = [];