diff --git a/src/app/pages/basic-data/airline/airline.component.ts b/src/app/pages/basic-data/airline/airline.component.ts index 94146e8..ddd136b 100644 --- a/src/app/pages/basic-data/airline/airline.component.ts +++ b/src/app/pages/basic-data/airline/airline.component.ts @@ -37,8 +37,7 @@ export class AirlineComponent implements OnInit { //下拉框 public filterItems = { - airlineName: '', - briefNameChn: '', + airlineGroupId: '', } public airlinegroups: Array; //航空集团 diff --git a/src/app/pages/basic-data/airport/airport.component.ts b/src/app/pages/basic-data/airport/airport.component.ts index 3184bf7..aa05250 100644 --- a/src/app/pages/basic-data/airport/airport.component.ts +++ b/src/app/pages/basic-data/airport/airport.component.ts @@ -222,7 +222,7 @@ export class AirportComponent implements OnInit { 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]) { is_satis = true; continue; } else { diff --git a/src/app/pages/basic-data/basic-data-routing.module.ts b/src/app/pages/basic-data/basic-data-routing.module.ts index 4597cfe..88eedd6 100644 --- a/src/app/pages/basic-data/basic-data-routing.module.ts +++ b/src/app/pages/basic-data/basic-data-routing.module.ts @@ -29,67 +29,67 @@ const basicDataRoutes: Routes = [ { path: 'checkingroup', component: CheckinGroupComponent, - data: { preload: true, reuse: true } + data: { preload: true, reuse: false } }, { path: 'gate', component: GateComponent, - data: { preload: true, reuse: true } + data: { preload: true, reuse: false } }, { path: 'terminal', component: TerminalComponent, - data: { preload: true, reuse: true } + data: { preload: true, reuse: false } }, { path: 'chut', component: ChutComponent, - data: { preload: true, reuse: true } + data: { preload: true, reuse: false } }, { path: 'stand', component: StandComponent, - data: { preload: true, reuse: true } + data: { preload: true, reuse: false } }, { path: 'carousel', component: CarouselComponent, - data: { preload: true, reuse: true } + data: { preload: true, reuse: false } }, { path: 'checkindesk', component: CheckinDeskComponent, - data: { preload: true, reuse: true } + data: { preload: true, reuse: false } }, { path: 'airport', component: AirportComponent, - data: { preload: true, reuse: true } + data: { preload: true, reuse: false } }, { path: 'city', component: CityComponent, - data: { preload: true, reuse: true } + data: { preload: true, reuse: false } }, { path: 'aircrafttype', component: AircraftTypeComponent, - data: { preload: true, reuse: true } + data: { preload: true, reuse: false } }, { path: 'aircraft', component: AircraftComponent, - data: { preload: true, reuse: true } + data: { preload: true, reuse: false } }, { path: 'terminalarea', component: TerminalAreaComponent, - data: { preload: true, reuse: true } + data: { preload: true, reuse: false } }, { path: 'airline', component: AirlineComponent, - data: { preload: true, reuse: true } + data: { preload: true, reuse: false } } ], // data: { preload: false, reuse: true } diff --git a/src/app/pages/basic-data/carousel/carousel.component.scss b/src/app/pages/basic-data/carousel/carousel.component.scss deleted file mode 100644 index 2804efa..0000000 --- a/src/app/pages/basic-data/carousel/carousel.component.scss +++ /dev/null @@ -1,59 +0,0 @@ -.main-page { - width: 100%; - height: 100%; - overflow-y: scroll; - padding: 15px 10px; - background-color: #fff; - .page-content { - border: 1px solid #ccc; - padding: 10px 20px; - .search-filter { - padding: 0 15px; - .input-container { - padding: 0; - > .form-control { - width: 180px; - display: inline-block; - } - } - } - .airline-table{ - .table-container{ - // border: 1px solid #ccc; - width: 100%; - height: 700px; - overflow: auto; - box-shadow: 0 0 1px .5px #ddd; - table{ - width: max-content; - tr{ - cursor: pointer; - &.selected{ - background: rgb(181, 215, 255); - } - } - th{ - background-color: #ddd; - color: rgb(0, 0, 255); - } - th,td{ - // border: none; - text-align: center; - } - } - } - } - } -} - -@media screen and (max-width: 991px) { - .line-operator-right { - text-align: left !important; - } -} - -// @media screen and (min-width: 1200px){ -// .line-operator-right{ -// text-align: left; -// } -// } diff --git a/src/app/pages/basic-data/carousel/carousel.component.ts b/src/app/pages/basic-data/carousel/carousel.component.ts index e56cf0a..a222230 100644 --- a/src/app/pages/basic-data/carousel/carousel.component.ts +++ b/src/app/pages/basic-data/carousel/carousel.component.ts @@ -22,7 +22,7 @@ export class CarouselComponent implements OnInit { { COL_CODE: 'carouselCode', COL_CN: '行李转盘代码', COL_WIDTH: "125px" }, { COL_CODE: 'carouselName', COL_CN: '行李转盘名称', COL_WIDTH: "125px" }, { COL_CODE: 'terminalAreaName', COL_CN: '航站楼区域', COL_WIDTH: "120px" }, - { COL_CODE: 'carouselStatus', COL_CN: '资源状态', COL_WIDTH: "120px" }, + { COL_CODE: 'carouselStatusChn', COL_CN: '资源状态', COL_WIDTH: "120px" }, ] // 搜索条件 @@ -94,17 +94,19 @@ export class CarouselComponent implements OnInit { } //资源状态列表显示数据转换 - initGateStatus(element) { - if (element['gateStatus'] == '0') { - element['gateStatus'] = '可用' - } else if (element['gateStatus'] == '1') { - element['gateStatus'] = '在用' - } else if (element['gateStatus'] == '2') { - element['gateStatus'] = '锁定' - } else if (element['gateStatus'] == '3') { - element['gateStatus'] = '禁用' - } else if (element['gateStatus'] == '4') { - element['gateStatus'] = '预分' + carouselStatusTransHandle(item) { + if (item['carouselStatus'] === '0') { + item['carouselStatusChn'] = '可用'; + } else if (item['carouselStatus'] === '1') { + item['carouselStatusChn'] = '在用'; + } else if (item['carouselStatus'] === '2') { + item['carouselStatusChn'] = '锁定'; + } else if (item['carouselStatus'] === '3') { + item['carouselStatusChn'] = '禁用'; + } else if (item['carouselStatus'] === '4') { + item['carouselStatusChn'] = '预分'; + } else { + item['carouselStatusChn'] = item['carouselStatus']; } } @@ -114,6 +116,7 @@ export class CarouselComponent implements OnInit { dataTransfer() { this.carousels.forEach(item => { this.terminalAreaTransHandle(item); + this.carouselStatusTransHandle(item); }) this.wait_render_data = this.carousels; diff --git a/src/app/pages/basic-data/gate/gate.component.ts b/src/app/pages/basic-data/gate/gate.component.ts index 513a047..738365c 100644 --- a/src/app/pages/basic-data/gate/gate.component.ts +++ b/src/app/pages/basic-data/gate/gate.component.ts @@ -21,7 +21,7 @@ export class GateComponent implements OnInit { { COL_CODE: 'gateCode', COL_CN: '登机门代码', COL_WIDTH: "120px" }, { COL_CODE: 'gateName', COL_CN: '登机门名称', COL_WIDTH: "120px" }, { COL_CODE: 'terminalAreaName', COL_CN: '航站楼区域', COL_WIDTH: "120px" }, - { COL_CODE: 'gateStatus', COL_CN: '资源状态', COL_WIDTH: "120px" }, + { COL_CODE: 'gateStatusChn', COL_CN: '资源状态', COL_WIDTH: "120px" }, ] // 搜索条件 @@ -93,17 +93,19 @@ export class GateComponent implements OnInit { } //资源状态列表显示数据转换 - initGateStatus(element) { - if (element['gateStatus'] == '0') { - element['gateStatus'] = '可用' - } else if (element['gateStatus'] == '1') { - element['gateStatus'] = '在用' - } else if (element['gateStatus'] == '2') { - element['gateStatus'] = '锁定' - } else if (element['gateStatus'] == '3') { - element['gateStatus'] = '禁用' - } else if (element['gateStatus'] == '4') { - element['gateStatus'] = '预分' + gateStatusTransHandle(item) { + if (item['gateStatus'] === 0) { + item['gateStatusChn'] = '可用'; + } else if (item['gateStatus'] === 1) { + item['gateStatusChn'] = '在用'; + } else if (item['gateStatus'] === 2) { + item['gateStatusChn'] = '锁定'; + } else if (item['gateStatus'] === 3) { + item['gateStatusChn'] = '禁用'; + } else if (item['gateStatus'] === 4) { + item['gateStatusChn'] = '预分'; + } else { + item['gateStatusChn'] = item['gateStatus']; } } @@ -113,6 +115,7 @@ export class GateComponent implements OnInit { dataTransfer() { this.gates.forEach(item => { this.terminalAreaTransHandle(item); + this.gateStatusTransHandle(item) }) this.wait_render_data = this.gates; @@ -214,7 +217,7 @@ export class GateComponent implements OnInit { 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]) { is_satis = true; continue; } else { diff --git a/src/app/pages/basic-data/stand/stand.component.ts b/src/app/pages/basic-data/stand/stand.component.ts index ea3ae74..9f3341d 100644 --- a/src/app/pages/basic-data/stand/stand.component.ts +++ b/src/app/pages/basic-data/stand/stand.component.ts @@ -21,7 +21,7 @@ export class StandComponent implements OnInit { { COL_CODE: 'standCode', COL_CN: '机位代码', COL_WIDTH: "120px" }, { COL_CODE: 'standName', COL_CN: '机位名称', COL_WIDTH: "150px" }, { COL_CODE: 'standTypeDesc', COL_CN: '机位类型', COL_WIDTH: "130px" }, - { COL_CODE: 'standStatus', COL_CN: '资源状态', COL_WIDTH: "120px" }, + { COL_CODE: 'standStatusChn', COL_CN: '资源状态', COL_WIDTH: "120px" }, { COL_CODE: 'terminalAreaName', COL_CN: '航站楼区域', COL_WIDTH: "120px" }, ] @@ -108,6 +108,22 @@ export class StandComponent implements OnInit { item['standTypeDesc'] = this.standTypes[standTypesLinkIndex].standTypeDesc; } } + //资源状态列表显示数据转换 + standStatusTransHandle(item) { + if (item['standStatus'] === 0) { + item['standStatusChn'] = '可用'; + } else if (item['standStatus'] === 1) { + item['standStatusChn'] = '在用'; + } else if (item['standStatus'] === 2) { + item['standStatusChn'] = '锁定'; + } else if (item['standStatus'] === 3) { + item['standStatusChn'] = '禁用'; + } else if (item['standStatus'] === 4) { + item['standStatusChn'] = '预分'; + } else { + item['standStatusChn'] = item['standStatus']; + } + } /** * 数据转换显示统一处理 @@ -116,6 +132,7 @@ export class StandComponent implements OnInit { this.stands.forEach(item => { this.terminalAreaTransHandle(item); this.standTypesHandle(item); + this.standStatusTransHandle(item); }) this.wait_render_data = this.stands; @@ -219,7 +236,7 @@ export class StandComponent implements OnInit { 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]) { is_satis = true; continue; } else { diff --git a/src/app/pages/historical-data/historical-data-routing.module.ts b/src/app/pages/historical-data/historical-data-routing.module.ts index 341bf3c..4014ea0 100644 --- a/src/app/pages/historical-data/historical-data-routing.module.ts +++ b/src/app/pages/historical-data/historical-data-routing.module.ts @@ -7,7 +7,7 @@ const historicalDataRoutes: Routes = [ { path: '', component: HistoricalDataComponent, - data: { preload: true, reuse: true } + data: { preload: true, reuse: false } } ] diff --git a/src/app/pages/main/main-routing.module.ts b/src/app/pages/main/main-routing.module.ts index 1fa5d67..43a0890 100644 --- a/src/app/pages/main/main-routing.module.ts +++ b/src/app/pages/main/main-routing.module.ts @@ -6,7 +6,7 @@ const mainRoutes: Routes = [ { path: '', component: MainComponent, - data: { preload: true, reuse: true } + data: { preload: true, reuse: false } } ] diff --git a/src/app/pages/pages-routing.module.ts b/src/app/pages/pages-routing.module.ts index e23edee..4a7b808 100644 --- a/src/app/pages/pages-routing.module.ts +++ b/src/app/pages/pages-routing.module.ts @@ -17,17 +17,17 @@ const pagesRoutes: Routes = [ { path:'main', loadChildren:'./main/main.module#MainModule', - data: { preload: true, reuse: true } + data: { preload: true, reuse: false } }, { path:'season', loadChildren:'./seasonal-plan/seasonal-plan.module#SeasonalPlanModule', - data: { preload: true, reuse: true } + data: { preload: true, reuse: false } }, { path:'history', loadChildren:'./historical-data/historical-data.module#HistoricalDataModule', - data: { preload: true, reuse: true } + data: { preload: true, reuse: false } }, { path:'basic', diff --git a/src/app/pages/seasonal-plan/seasonal-plan-routing.module.ts b/src/app/pages/seasonal-plan/seasonal-plan-routing.module.ts index 088d105..f415337 100644 --- a/src/app/pages/seasonal-plan/seasonal-plan-routing.module.ts +++ b/src/app/pages/seasonal-plan/seasonal-plan-routing.module.ts @@ -7,7 +7,7 @@ const seasonalPlanRoutes: Routes = [ { path: '', component: SeasonalPlanComponent, - data: { preload: true, reuse: true } + data: { preload: true, reuse: false } } ]