diff --git a/src/app/pages/basic-data/aircraft/aircraft.component.ts b/src/app/pages/basic-data/aircraft/aircraft.component.ts index 3416432..e5a17c0 100644 --- a/src/app/pages/basic-data/aircraft/aircraft.component.ts +++ b/src/app/pages/basic-data/aircraft/aircraft.component.ts @@ -20,8 +20,8 @@ export class AircraftComponent implements OnInit { { col_code: 'maxTakeoffWeight', col_chn: '最大起飞重量' }, { col_code: 'maxAirbridges', col_chn: '最大廊桥数' }, { col_code: 'aircraftOwnerCode', col_chn: '机主航空公司' }, - { col_code: 'airlineCode', col_chn: '航空公司' }, - { col_code: 'aircraftTypeCode', col_chn: '机型' } + { col_code: 'airlineName', col_chn: '航空公司' }, + { col_code: 'aircraftTypeName', col_chn: '机型' } ] // 搜索条件 diff --git a/src/app/pages/basic-data/airport/airport.component.ts b/src/app/pages/basic-data/airport/airport.component.ts index ace6bbf..012025d 100644 --- a/src/app/pages/basic-data/airport/airport.component.ts +++ b/src/app/pages/basic-data/airport/airport.component.ts @@ -23,7 +23,7 @@ export class AirportComponent implements OnInit { { col_code: 'airportCodeCaa', col_chn: 'CAA码' }, { col_code: 'airportCodeIcao', col_chn: 'ICAO码' }, { col_code: 'airportGroupId', col_chn: '机场集团' }, - { col_code: 'cityId', col_chn: '所在城市' }, + { col_code: 'cityNameChn', col_chn: '所在城市' }, ] // 搜索条件 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 404abb0..32d2125 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 @@ -15,8 +15,8 @@ export class CheckinDeskComponent implements OnInit { public col_lists = [ { col_code: 'checkindeskCode', col_chn: '值机柜台代码' }, { col_code: 'checkindeskName', col_chn: '值机柜台名称' }, - { col_code: 'checkinGroupCode', col_chn: '值机岛' }, - { col_code: 'chutCode', col_chn: '行李传送带' }, + { col_code: 'checkinGroupName', col_chn: '值机岛' }, + { col_code: 'chutName', col_chn: '行李传送带' }, { col_code: 'terminalAreaCode', col_chn: '航站楼区域' }, ] diff --git a/src/app/pages/basic-data/city/city.component.ts b/src/app/pages/basic-data/city/city.component.ts index b6dab34..9a0b8b3 100644 --- a/src/app/pages/basic-data/city/city.component.ts +++ b/src/app/pages/basic-data/city/city.component.ts @@ -17,7 +17,7 @@ export class CityComponent implements OnInit { { col_code: 'cityCode', col_chn: '城市代码' }, { col_code: 'cityNameChn', col_chn: '城市中文名' }, { col_code: 'cityNameEng', col_chn: '城市英文名' }, - { col_code: 'countryId', col_chn: '所在国家' }, + { col_code: 'countryNameChn', col_chn: '所在国家' }, ]; // 搜索条件 diff --git a/src/app/pages/seasonal-plan/related-tab/related-tab.component.ts b/src/app/pages/seasonal-plan/related-tab/related-tab.component.ts index f183d9f..e629656 100644 --- a/src/app/pages/seasonal-plan/related-tab/related-tab.component.ts +++ b/src/app/pages/seasonal-plan/related-tab/related-tab.component.ts @@ -25,10 +25,13 @@ export class RelatedTabComponent implements OnInit { // this.lines[this.lines.length - 1] = this.lines[0]; // let concatArray = this.lines.arrivalTime.slice(1); // let linkAirport = this.lines.arrivalTime.concat(concatArray) - this.airports = this.lines.startAirport.split(' - '); - for (let i = 0; i < this.airports.length; i++) { - this.airports[i] = { airport: this.airports[i], scdt: timeFormatter(this.lines.departureTime), scat: timeFormatter(this.lines.arrivalTime) } + if(this.lines.startAirport){ + this.airports = this.lines.startAirport.split(' - '); + for (let i = 0; i < this.airports.length; i++) { + this.airports[i] = { airport: this.airports[i], scdt: timeFormatter(this.lines.departureTime), scat: timeFormatter(this.lines.arrivalTime) } + } } + } };