diff --git a/src/app/pages/basic-data/aircraft/aircraft.component.html b/src/app/pages/basic-data/aircraft/aircraft.component.html index 27d8d67..2ba21cd 100644 --- a/src/app/pages/basic-data/aircraft/aircraft.component.html +++ b/src/app/pages/basic-data/aircraft/aircraft.component.html @@ -37,7 +37,7 @@ 航空公司: - {{item.airlineCode}} + {{item.airlineName}} diff --git a/src/app/pages/basic-data/aircraft/aircraft.component.ts b/src/app/pages/basic-data/aircraft/aircraft.component.ts index 9e51ee5..812e516 100644 --- a/src/app/pages/basic-data/aircraft/aircraft.component.ts +++ b/src/app/pages/basic-data/aircraft/aircraft.component.ts @@ -25,7 +25,7 @@ public filterItems = { airlineCode:'', aircraftTypeCode:'', } - +airlines : Array; //航空公司 aircrafts : Array; public row_state: any = { renderFlight: {} }; public render_data: Array = []; //显示数据,即需要显示的数据 @@ -39,6 +39,14 @@ ngOnInit() { this.render_data = this.aircrafts; } ) + //航空公司 + this.airlines = this.basicDataService.airline; + this.basicDataService.airline_subject.subscribe( + data=>{ + this.airlines = data; + } + ) + /** * 固定表头 */ diff --git a/src/app/pages/basic-data/carousel/carousel.component.html b/src/app/pages/basic-data/carousel/carousel.component.html index 29fbfe6..53e9005 100644 --- a/src/app/pages/basic-data/carousel/carousel.component.html +++ b/src/app/pages/basic-data/carousel/carousel.component.html @@ -32,7 +32,7 @@ 所属航站楼区域: - {{item.terminalAreaCode}} + {{item.terminalAreaName}} diff --git a/src/app/pages/basic-data/carousel/carousel.component.ts b/src/app/pages/basic-data/carousel/carousel.component.ts index 26692d2..6e2057c 100644 --- a/src/app/pages/basic-data/carousel/carousel.component.ts +++ b/src/app/pages/basic-data/carousel/carousel.component.ts @@ -25,6 +25,7 @@ public filterItems = { terminalAreaCode:'', carouselStatus:'', } +terminalAreas:Array; //所属航站楼区域 carousels:Array; public row_state: any = { renderFlight: {} }; public render_data: Array = []; //显示数据,即需要显示的数据 @@ -37,6 +38,13 @@ ngOnInit() { this.render_data = this.carousels; } ) + //所属航站楼区域 + this.terminalAreas = this.basicDataService.terminal_area; + this.basicDataService.terminal_area_subject.subscribe( + data=>{ + this.terminalAreas = data; + } + ) /** * 固定表头 */ diff --git a/src/app/pages/basic-data/checkin-desk/checkin-desk.component.html b/src/app/pages/basic-data/checkin-desk/checkin-desk.component.html index e7931fc..6aa559a 100644 --- a/src/app/pages/basic-data/checkin-desk/checkin-desk.component.html +++ b/src/app/pages/basic-data/checkin-desk/checkin-desk.component.html @@ -33,7 +33,7 @@ 所属航站楼区域: - {{items.terminalAreaCode}} + {{items.terminalAreaName}} @@ -43,7 +43,7 @@ 值机岛: - {{items.checkinGroupCode}} + {{items.checkinGroupName}} @@ -53,7 +53,7 @@ 行李传送带: - {{items.chutCode}} + {{items.chutName}} diff --git a/src/app/pages/basic-data/checkin-desk/checkin-desk.component.ts b/src/app/pages/basic-data/checkin-desk/checkin-desk.component.ts index a97cee0..6c352c7 100644 --- a/src/app/pages/basic-data/checkin-desk/checkin-desk.component.ts +++ b/src/app/pages/basic-data/checkin-desk/checkin-desk.component.ts @@ -27,6 +27,9 @@ public filterItems = { chutCode:'', } +checkinGroups : Array; //值机岛 +terminalAreas : Array; //所属航站楼区域 +chuts : Array; //行李传送带 checkinDesks : Array; public row_state: any = { renderFlight: {} }; public render_data: Array = []; //显示数据,即需要显示的数据 @@ -39,6 +42,27 @@ ngOnInit() { this.render_data = this.checkinDesks; } ) + //所属航站楼区域 + this.terminalAreas = this.basicDataService.terminal_area; + this.basicDataService.terminal_area_subject.subscribe( + data=>{ + this.terminalAreas = data; + } + ) + //值机岛 + this.checkinGroups = this.basicDataService.checkin_group; + this.basicDataService.checkin_group_subject.subscribe( + data=>{ + this.checkinGroups = data; + } + ) + //行李传送带 + this.chuts = this.basicDataService.chut; + this.basicDataService.chut_subject.subscribe( + data=>{ + this.chuts = data; + } + ) /** * 固定表头 */ diff --git a/src/app/pages/basic-data/city/city.component.html b/src/app/pages/basic-data/city/city.component.html index fd6b3a3..0d6507a 100644 --- a/src/app/pages/basic-data/city/city.component.html +++ b/src/app/pages/basic-data/city/city.component.html @@ -35,15 +35,13 @@ 洲/地区: - 非洲 - 亚洲 国家: - {{item.countryId}} + {{item.countryId}} diff --git a/src/app/pages/basic-data/gate/gate.component.html b/src/app/pages/basic-data/gate/gate.component.html index f56ef3d..49ec522 100644 --- a/src/app/pages/basic-data/gate/gate.component.html +++ b/src/app/pages/basic-data/gate/gate.component.html @@ -33,7 +33,7 @@ 所属航站楼区域: - {{items.terminalAreaCode}} + {{items.terminalAreaName}} diff --git a/src/app/pages/basic-data/gate/gate.component.ts b/src/app/pages/basic-data/gate/gate.component.ts index de12d10..91d95f1 100644 --- a/src/app/pages/basic-data/gate/gate.component.ts +++ b/src/app/pages/basic-data/gate/gate.component.ts @@ -25,7 +25,7 @@ public filterItems = { terminalAreaCode:'', gateStatus:'', } - +terminalAreas : Array; //所属航站楼区域 gates : Array; public row_state: any = { renderFlight: {} }; public render_data: Array = []; //显示数据,即需要显示的数据 @@ -38,6 +38,13 @@ ngOnInit() { this.render_data = this.gates; } ) + //所属航站楼区域 + this.terminalAreas = this.basicDataService.terminal_area; + this.basicDataService.terminal_area_subject.subscribe( + data=>{ + this.terminalAreas = data; + } + ) /** * 固定表头 */ diff --git a/src/app/pages/basic-data/stand/stand.component.html b/src/app/pages/basic-data/stand/stand.component.html index ba4541c..b960ece 100644 --- a/src/app/pages/basic-data/stand/stand.component.html +++ b/src/app/pages/basic-data/stand/stand.component.html @@ -33,7 +33,7 @@ 所属航站楼区域: - {{items.terminalAreaCode}} + {{items.terminalAreaName}} diff --git a/src/app/pages/basic-data/stand/stand.component.ts b/src/app/pages/basic-data/stand/stand.component.ts index b751891..df7cd4e 100644 --- a/src/app/pages/basic-data/stand/stand.component.ts +++ b/src/app/pages/basic-data/stand/stand.component.ts @@ -27,6 +27,7 @@ public filterItems = { standStatus:'', } +terminalAreas : Array; //所属航站楼区域 stands : Array; public row_state: any = { renderFlight: {} }; public render_data: Array = []; //显示数据,即需要显示的数据 @@ -39,6 +40,13 @@ ngOnInit() { this.render_data = this.stands; } ) + //所属航站楼区域 + this.terminalAreas = this.basicDataService.terminal_area; + this.basicDataService.terminal_area_subject.subscribe( + data=>{ + this.terminalAreas = data; + } + ) /** * 固定表头 */