diff --git a/src/app/pages/basic-data/carousel/carousel.component.html b/src/app/pages/basic-data/carousel/carousel.component.html index 00a4c67..758ccfc 100644 --- a/src/app/pages/basic-data/carousel/carousel.component.html +++ b/src/app/pages/basic-data/carousel/carousel.component.html @@ -60,7 +60,7 @@ {{i+1}} {{carousel.carouselCode}} {{carousel.carouselName}} - {{carousel.terminalAreaCode|terminalArea}} + {{carousel.terminalAreaName}} {{carousel.carouselStatus}} diff --git a/src/app/pages/basic-data/carousel/carousel.component.ts b/src/app/pages/basic-data/carousel/carousel.component.ts index 8304321..8a5e1cb 100644 --- a/src/app/pages/basic-data/carousel/carousel.component.ts +++ b/src/app/pages/basic-data/carousel/carousel.component.ts @@ -16,7 +16,7 @@ export class CarouselComponent implements OnInit { public col_lists = [ { col_code: 'carouselCode', col_chn: '行李转盘代码' }, { col_code: 'carouselName', col_chn: '行李转盘名称' }, - { col_code: 'terminalAreaCode', col_chn: '航站楼区域' }, + { col_code: 'terminalAreaName', col_chn: '航站楼区域' }, { col_code: 'carouselStatus', col_chn: '资源状态' }, ] @@ -49,8 +49,16 @@ export class CarouselComponent implements OnInit { this.basicDataService.terminal_area_subject.subscribe( data => { this.terminalAreas = data; + //航站楼区域数据转换处理 + if(this.terminalAreas && this.terminalAreas.length > 0){ + this.basicDataTransHandle(); + } } ); + //航站楼区域数据转换处理 + if(this.render_data){ + this.basicDataTransHandle(); + } /** * 固定表头 */ @@ -62,6 +70,16 @@ export class CarouselComponent implements OnInit { tableCont.addEventListener('scroll', scrollHandle); } + //航站楼区域数据转换处理 + basicDataTransHandle() { + this.render_data.forEach(item => { + let terminalAreasLinkIndex = this.terminalAreas.findIndex(val => val.terminalAreaCode === item['terminalAreaCode']); + if(this.terminalAreas[terminalAreasLinkIndex]){ + item['terminalAreaName'] = this.terminalAreas[terminalAreasLinkIndex].terminalAreaName; + } + }) + } + /** * 选中某行 * @param i @@ -118,7 +136,6 @@ export class CarouselComponent implements OnInit { return false; } }) - } else { this.render_data = filterData.filter(item => { let is_satis = false; @@ -185,7 +202,6 @@ export class CarouselComponent implements OnInit { } }); } - if (transArray.length > 0) { if (transArray.toString() == this.positionArray.toString()) { this.positionArrayIndex++; 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 4d02c13..c08f2c9 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 @@ -65,7 +65,7 @@ {{checkinDesk.checkindeskName}} {{checkinDesk.checkinGroupName}} {{checkinDesk.chutName}} - {{checkinDesk.terminalAreaCode|terminalArea}} + {{checkinDesk.terminalAreaName}} 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 32d2125..147f3e3 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 @@ -17,7 +17,7 @@ export class CheckinDeskComponent implements OnInit { { col_code: 'checkindeskName', col_chn: '值机柜台名称' }, { col_code: 'checkinGroupName', col_chn: '值机岛' }, { col_code: 'chutName', col_chn: '行李传送带' }, - { col_code: 'terminalAreaCode', col_chn: '航站楼区域' }, + { col_code: 'terminalAreaName', col_chn: '航站楼区域' }, ] // 搜索条件 @@ -61,6 +61,10 @@ export class CheckinDeskComponent implements OnInit { this.basicDataService.terminal_area_subject.subscribe( data => { this.terminalAreas = data; + //航站楼区域数据转换处理 + if(this.terminalAreas && this.terminalAreas.length > 0){ + this.terminalAreasHandle(); + } } ) this.basicDataService.checkin_group_subject.subscribe( @@ -78,6 +82,8 @@ export class CheckinDeskComponent implements OnInit { this.basicDataTransHandle(); //行李传送带数据转换处理 this.chutsHandle(); + //航站楼区域数据转换处理 + this.terminalAreasHandle(); } /** @@ -111,6 +117,16 @@ export class CheckinDeskComponent implements OnInit { }) } + //航站楼区域数据转换处理 + terminalAreasHandle() { + this.render_data.forEach(item => { + let terminalAreasLinkIndex = this.terminalAreas.findIndex(val => val.terminalAreaCode === item['terminalAreaCode']); + if(this.terminalAreas[terminalAreasLinkIndex]){ + item['terminalAreaName'] = this.terminalAreas[terminalAreasLinkIndex].terminalAreaName; + } + }) + } + /** * 选中某行 * @param i diff --git a/src/app/pages/basic-data/gate/gate.component.html b/src/app/pages/basic-data/gate/gate.component.html index df1d7ea..509a73d 100644 --- a/src/app/pages/basic-data/gate/gate.component.html +++ b/src/app/pages/basic-data/gate/gate.component.html @@ -61,7 +61,7 @@ {{i+1}} {{gate.gateCode}} {{gate.gateName}} - {{gate.terminalAreaCode|terminalArea}} + {{gate.terminalAreaName}} {{gate.gateStatus}} diff --git a/src/app/pages/basic-data/gate/gate.component.ts b/src/app/pages/basic-data/gate/gate.component.ts index 135f82c..1ba7494 100644 --- a/src/app/pages/basic-data/gate/gate.component.ts +++ b/src/app/pages/basic-data/gate/gate.component.ts @@ -15,7 +15,7 @@ export class GateComponent implements OnInit { public col_lists = [ { col_code: 'gateCode', col_chn: '登机门代码' }, { col_code: 'gateName', col_chn: '登机门名称' }, - { col_code: 'terminalAreaCode', col_chn: '航站楼区域' }, + { col_code: 'terminalAreaName', col_chn: '航站楼区域' }, { col_code: 'gateStatus', col_chn: '资源状态' }, ] @@ -46,8 +46,18 @@ export class GateComponent implements OnInit { } ) this.basicDataService.terminal_area_subject.subscribe( - data => this.terminalAreas = data + data => { + this.terminalAreas = data; + //航站楼区域数据转换处理 + if(this.terminalAreas && this.terminalAreas.length > 0){ + this.basicDataTransHandle(); + } + } ) + //航站楼区域数据转换处理 + if(this.render_data){ + this.basicDataTransHandle(); + } /** * 固定表头 */ @@ -59,6 +69,15 @@ export class GateComponent implements OnInit { tableCont.addEventListener('scroll', scrollHandle); } + //航站楼区域数据转换处理 + basicDataTransHandle() { + this.render_data.forEach(item => { + let terminalAreasLinkIndex = this.terminalAreas.findIndex(val => val.terminalAreaCode === item['terminalAreaCode']); + if(this.terminalAreas[terminalAreasLinkIndex]){ + item['terminalAreaName'] = this.terminalAreas[terminalAreasLinkIndex].terminalAreaName; + } + }) + } /** * 选中某行 diff --git a/src/app/pages/basic-data/stand/stand.component.html b/src/app/pages/basic-data/stand/stand.component.html index aaac99d..e89561e 100644 --- a/src/app/pages/basic-data/stand/stand.component.html +++ b/src/app/pages/basic-data/stand/stand.component.html @@ -75,7 +75,7 @@ {{stand.standName}} {{stand.standType}} {{stand.standStatus}} - {{stand.terminalAreaCode|terminalArea}} + {{stand.terminalAreaName}} diff --git a/src/app/pages/basic-data/stand/stand.component.ts b/src/app/pages/basic-data/stand/stand.component.ts index c477319..7febd74 100644 --- a/src/app/pages/basic-data/stand/stand.component.ts +++ b/src/app/pages/basic-data/stand/stand.component.ts @@ -18,7 +18,7 @@ export class StandComponent implements OnInit { { col_code: 'standName', col_chn: '机位名称' }, { col_code: 'standType', col_chn: '机位类型' }, { col_code: 'standStatus', col_chn: '资源状态' }, - { col_code: 'terminalAreaCode', col_chn: '航站楼区域' }, + { col_code: 'terminalAreaName', col_chn: '航站楼区域' }, ] // 搜索条件 @@ -51,8 +51,16 @@ export class StandComponent implements OnInit { this.basicDataService.terminal_area_subject.subscribe( data => { this.terminalAreas = data; + //航站楼区域数据转换处理 + if(this.terminalAreas && this.terminalAreas.length > 0){ + this.basicDataTransHandle(); + } } ) + //航站楼区域数据转换处理 + if(this.render_data){ + this.basicDataTransHandle(); + } /** * 固定表头 */ @@ -64,6 +72,16 @@ export class StandComponent implements OnInit { tableCont.addEventListener('scroll', scrollHandle); } + //航站楼区域数据转换处理 + basicDataTransHandle() { + this.render_data.forEach(item => { + let terminalAreasLinkIndex = this.terminalAreas.findIndex(val => val.terminalAreaCode === item['terminalAreaCode']); + if(this.terminalAreas[terminalAreasLinkIndex]){ + item['terminalAreaName'] = this.terminalAreas[terminalAreasLinkIndex].terminalAreaName; + } + }) + } + //输入框回车事件 inputEnter() { if (this.FLT_POS === 1) { @@ -119,7 +137,6 @@ export class StandComponent implements OnInit { return false; } }) - } else { this.render_data = filterData.filter(item => { let is_satis = false; @@ -186,7 +203,6 @@ export class StandComponent implements OnInit { } }); } - if (transArray.length > 0) { if (transArray.toString() == this.positionArray.toString()) { this.positionArrayIndex++;