diff --git a/src/app/pages/basic-data/carousel/carousel.component.html b/src/app/pages/basic-data/carousel/carousel.component.html index 53e9005..3014171 100644 --- a/src/app/pages/basic-data/carousel/carousel.component.html +++ b/src/app/pages/basic-data/carousel/carousel.component.html @@ -7,7 +7,7 @@ 选择列名 行李转盘代码 行李转盘名称 - 航站楼区域 + 航站楼区域 资源状态 @@ -23,7 +23,7 @@ - 刷新 + @@ -32,7 +32,7 @@ 所属航站楼区域: - {{item.terminalAreaName}} + {{item.terminalAreaName}} @@ -69,7 +69,7 @@ {{i+1}} {{carousel.carouselCode}} {{carousel.carouselName}} - {{carousel.terminalAreaCode}} + {{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 6e2057c..7c793e1 100644 --- a/src/app/pages/basic-data/carousel/carousel.component.ts +++ b/src/app/pages/basic-data/carousel/carousel.component.ts @@ -36,6 +36,9 @@ ngOnInit() { data=>{ this.carousels = data; this.render_data = this.carousels; + if(this.terminalAreas && this.terminalAreas.length > 0){//所属航站楼区域数据显示处理 + this.terminalAreasHandle(); + } } ) //所属航站楼区域 @@ -56,6 +59,14 @@ ngOnInit() { tableCont.addEventListener('scroll',scrollHandle); } +//所属航站楼区域数据转换处理 +terminalAreasHandle() { + this.render_data.forEach(item => { + let terminalAreasLinkIndex = this.terminalAreas.findIndex(val => val.terminalAreaCode === item['terminalAreaCode']); + item['terminalAreaName'] = this.terminalAreas[terminalAreasLinkIndex].terminalAreaName; + }) +} + /** * 选中某行 * @param i