diff --git a/src/app/pages/basic-data/airport/airport.component.html b/src/app/pages/basic-data/airport/airport.component.html index c5339e9..6cd49cc 100644 --- a/src/app/pages/basic-data/airport/airport.component.html +++ b/src/app/pages/basic-data/airport/airport.component.html @@ -14,7 +14,7 @@ CAA码 ICAO码 机场集团 - 所在城市 + 所在城市 @@ -31,7 +31,7 @@ 机场管理 机场集团管理 定制查询 --> - 刷新 + @@ -52,7 +52,7 @@ - {{item.cityNameChn}} + {{item.cityNameChn}} @@ -90,7 +90,7 @@ {{airport.airportCodeCaa}} {{airport.airportCodeIcao}} {{airport.airportGroupId}} - {{airport.cityId}} + {{airport.cityName}} diff --git a/src/app/pages/basic-data/airport/airport.component.ts b/src/app/pages/basic-data/airport/airport.component.ts index 6978f42..d3ddbb9 100644 --- a/src/app/pages/basic-data/airport/airport.component.ts +++ b/src/app/pages/basic-data/airport/airport.component.ts @@ -64,7 +64,7 @@ ngOnInit() { basicDataTransHandle() { this.render_data.forEach(item => { let citysLinkIndex = this.citys.findIndex(val => val.cityId === item['cityId']); - item['cityId'] = this.citys[citysLinkIndex].cityNameChn; + item['cityName'] = this.citys[citysLinkIndex].cityNameChn; }) } @@ -92,7 +92,7 @@ selectChange() { let is_satis = true; for (const key in this.filterItems) { if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) { - if (item[key] === this.filterItems[key]) { + if (item[key] === +this.filterItems[key] || item[key] === this.filterItems[key]) { is_satis = true; continue; } else {