cdia/airport-chengdu-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

基础数据整体调整修改优化

Browse Source
This commit is contained in:
zhouyuejun
2019-02-21 14:02:33 +08:00
parent 90ea25a0e5
commit fef8e19595
11 changed files with 71 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/basic-data/airline/airline.component.ts
+1 -2
View File
@@ -37,8 +37,7 @@ export class AirlineComponent implements OnInit {
//下拉框 //下拉框
public filterItems = { public filterItems = {
airlineName: '', airlineGroupId: '',
briefNameChn: '',
} }
public airlinegroups: Array<any>; //航空集团 public airlinegroups: Array<any>; //航空集团
src/app/pages/basic-data/airport/airport.component.ts
+1 -1
View File
@@ -222,7 +222,7 @@ export class AirportComponent implements OnInit {
let is_satis = true; let is_satis = true;
for (const key in this.filterItems) { for (const key in this.filterItems) {
if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) { if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) {
if (item[key] === this.filterItems[key]) { if (item[key] === +this.filterItems[key]) {
is_satis = true; is_satis = true;
continue; continue;
} else { } else {
src/app/pages/basic-data/basic-data-routing.module.ts
+13 -13
View File
@@ -29,67 +29,67 @@ const basicDataRoutes: Routes = [
{ {
path: 'checkingroup', path: 'checkingroup',
component: CheckinGroupComponent, component: CheckinGroupComponent,
data: { preload: true, reuse: true } data: { preload: true, reuse: false }
}, },
{ {
path: 'gate', path: 'gate',
component: GateComponent, component: GateComponent,
data: { preload: true, reuse: true } data: { preload: true, reuse: false }
}, },
{ {
path: 'terminal', path: 'terminal',
component: TerminalComponent, component: TerminalComponent,
data: { preload: true, reuse: true } data: { preload: true, reuse: false }
}, },
{ {
path: 'chut', path: 'chut',
component: ChutComponent, component: ChutComponent,
data: { preload: true, reuse: true } data: { preload: true, reuse: false }
}, },
{ {
path: 'stand', path: 'stand',
component: StandComponent, component: StandComponent,
data: { preload: true, reuse: true } data: { preload: true, reuse: false }
}, },
{ {
path: 'carousel', path: 'carousel',
component: CarouselComponent, component: CarouselComponent,
data: { preload: true, reuse: true } data: { preload: true, reuse: false }
}, },
{ {
path: 'checkindesk', path: 'checkindesk',
component: CheckinDeskComponent, component: CheckinDeskComponent,
data: { preload: true, reuse: true } data: { preload: true, reuse: false }
}, },
{ {
path: 'airport', path: 'airport',
component: AirportComponent, component: AirportComponent,
data: { preload: true, reuse: true } data: { preload: true, reuse: false }
}, },
{ {
path: 'city', path: 'city',
component: CityComponent, component: CityComponent,
data: { preload: true, reuse: true } data: { preload: true, reuse: false }
}, },
{ {
path: 'aircrafttype', path: 'aircrafttype',
component: AircraftTypeComponent, component: AircraftTypeComponent,
data: { preload: true, reuse: true } data: { preload: true, reuse: false }
}, },
{ {
path: 'aircraft', path: 'aircraft',
component: AircraftComponent, component: AircraftComponent,
data: { preload: true, reuse: true } data: { preload: true, reuse: false }
}, },
{ {
path: 'terminalarea', path: 'terminalarea',
component: TerminalAreaComponent, component: TerminalAreaComponent,
data: { preload: true, reuse: true } data: { preload: true, reuse: false }
}, },
{ {
path: 'airline', path: 'airline',
component: AirlineComponent, component: AirlineComponent,
data: { preload: true, reuse: true } data: { preload: true, reuse: false }
} }
], ],
// data: { preload: false, reuse: true } // data: { preload: false, reuse: true }
src/app/pages/basic-data/carousel/carousel.component.scss
-59
View File
@@ -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;
// }
// }
src/app/pages/basic-data/carousel/carousel.component.ts
+15 -12
View File
@@ -22,7 +22,7 @@ export class CarouselComponent implements OnInit {
{ COL_CODE: 'carouselCode', COL_CN: '行李转盘代码', COL_WIDTH: "125px" }, { COL_CODE: 'carouselCode', COL_CN: '行李转盘代码', COL_WIDTH: "125px" },
{ COL_CODE: 'carouselName', COL_CN: '行李转盘名称', COL_WIDTH: "125px" }, { COL_CODE: 'carouselName', COL_CN: '行李转盘名称', COL_WIDTH: "125px" },
{ COL_CODE: 'terminalAreaName', COL_CN: '航站楼区域', COL_WIDTH: "120px" }, { 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) { carouselStatusTransHandle(item) {
if (element['gateStatus'] == '0') { if (item['carouselStatus'] === '0') {
element['gateStatus'] = '可用' item['carouselStatusChn'] = '可用';
} else if (element['gateStatus'] == '1') { } else if (item['carouselStatus'] === '1') {
element['gateStatus'] = '在用' item['carouselStatusChn'] = '在用';
} else if (element['gateStatus'] == '2') { } else if (item['carouselStatus'] === '2') {
element['gateStatus'] = '锁定' item['carouselStatusChn'] = '锁定';
} else if (element['gateStatus'] == '3') { } else if (item['carouselStatus'] === '3') {
element['gateStatus'] = '禁用' item['carouselStatusChn'] = '禁用';
} else if (element['gateStatus'] == '4') { } else if (item['carouselStatus'] === '4') {
element['gateStatus'] = '预分' item['carouselStatusChn'] = '预分';
} else {
item['carouselStatusChn'] = item['carouselStatus'];
} }
} }
@@ -114,6 +116,7 @@ export class CarouselComponent implements OnInit {
dataTransfer() { dataTransfer() {
this.carousels.forEach(item => { this.carousels.forEach(item => {
this.terminalAreaTransHandle(item); this.terminalAreaTransHandle(item);
this.carouselStatusTransHandle(item);
}) })
this.wait_render_data = this.carousels; this.wait_render_data = this.carousels;
src/app/pages/basic-data/gate/gate.component.ts
+16 -13
View File
@@ -21,7 +21,7 @@ export class GateComponent implements OnInit {
{ COL_CODE: 'gateCode', COL_CN: '登机门代码', COL_WIDTH: "120px" }, { COL_CODE: 'gateCode', COL_CN: '登机门代码', COL_WIDTH: "120px" },
{ COL_CODE: 'gateName', COL_CN: '登机门名称', COL_WIDTH: "120px" }, { COL_CODE: 'gateName', COL_CN: '登机门名称', COL_WIDTH: "120px" },
{ COL_CODE: 'terminalAreaName', 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) { gateStatusTransHandle(item) {
if (element['gateStatus'] == '0') { if (item['gateStatus'] === 0) {
element['gateStatus'] = '可用' item['gateStatusChn'] = '可用';
} else if (element['gateStatus'] == '1') { } else if (item['gateStatus'] === 1) {
element['gateStatus'] = '在用' item['gateStatusChn'] = '在用';
} else if (element['gateStatus'] == '2') { } else if (item['gateStatus'] === 2) {
element['gateStatus'] = '锁定' item['gateStatusChn'] = '锁定';
} else if (element['gateStatus'] == '3') { } else if (item['gateStatus'] === 3) {
element['gateStatus'] = '禁用' item['gateStatusChn'] = '禁用';
} else if (element['gateStatus'] == '4') { } else if (item['gateStatus'] === 4) {
element['gateStatus'] = '预分' item['gateStatusChn'] = '预分';
} else {
item['gateStatusChn'] = item['gateStatus'];
} }
} }
@@ -113,6 +115,7 @@ export class GateComponent implements OnInit {
dataTransfer() { dataTransfer() {
this.gates.forEach(item => { this.gates.forEach(item => {
this.terminalAreaTransHandle(item); this.terminalAreaTransHandle(item);
this.gateStatusTransHandle(item)
}) })
this.wait_render_data = this.gates; this.wait_render_data = this.gates;
@@ -214,7 +217,7 @@ export class GateComponent implements OnInit {
let is_satis = true; let is_satis = true;
for (const key in this.filterItems) { for (const key in this.filterItems) {
if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) { if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) {
if (item[key] === this.filterItems[key]) { if (item[key] == this.filterItems[key]) {
is_satis = true; is_satis = true;
continue; continue;
} else { } else {
src/app/pages/basic-data/stand/stand.component.ts
+19 -2
View File
@@ -21,7 +21,7 @@ export class StandComponent implements OnInit {
{ COL_CODE: 'standCode', COL_CN: '机位代码', COL_WIDTH: "120px" }, { COL_CODE: 'standCode', COL_CN: '机位代码', COL_WIDTH: "120px" },
{ COL_CODE: 'standName', COL_CN: '机位名称', COL_WIDTH: "150px" }, { COL_CODE: 'standName', COL_CN: '机位名称', COL_WIDTH: "150px" },
{ COL_CODE: 'standTypeDesc', COL_CN: '机位类型', COL_WIDTH: "130px" }, { 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" }, { COL_CODE: 'terminalAreaName', COL_CN: '航站楼区域', COL_WIDTH: "120px" },
] ]
@@ -108,6 +108,22 @@ export class StandComponent implements OnInit {
item['standTypeDesc'] = this.standTypes[standTypesLinkIndex].standTypeDesc; 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.stands.forEach(item => {
this.terminalAreaTransHandle(item); this.terminalAreaTransHandle(item);
this.standTypesHandle(item); this.standTypesHandle(item);
this.standStatusTransHandle(item);
}) })
this.wait_render_data = this.stands; this.wait_render_data = this.stands;
@@ -219,7 +236,7 @@ export class StandComponent implements OnInit {
let is_satis = true; let is_satis = true;
for (const key in this.filterItems) { for (const key in this.filterItems) {
if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) { if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) {
if (item[key] === this.filterItems[key]) { if (item[key] == this.filterItems[key]) {
is_satis = true; is_satis = true;
continue; continue;
} else { } else {
src/app/pages/historical-data/historical-data-routing.module.ts
+1 -1
View File
@@ -7,7 +7,7 @@ const historicalDataRoutes: Routes = [
{ {
path: '', path: '',
component: HistoricalDataComponent, component: HistoricalDataComponent,
data: { preload: true, reuse: true } data: { preload: true, reuse: false }
} }
] ]
src/app/pages/main/main-routing.module.ts
+1 -1
View File
@@ -6,7 +6,7 @@ const mainRoutes: Routes = [
{ {
path: '', path: '',
component: MainComponent, component: MainComponent,
data: { preload: true, reuse: true } data: { preload: true, reuse: false }
} }
] ]
src/app/pages/pages-routing.module.ts
+3 -3
View File
@@ -17,17 +17,17 @@ const pagesRoutes: Routes = [
{ {
path:'main', path:'main',
loadChildren:'./main/main.module#MainModule', loadChildren:'./main/main.module#MainModule',
data: { preload: true, reuse: true } data: { preload: true, reuse: false }
}, },
{ {
path:'season', path:'season',
loadChildren:'./seasonal-plan/seasonal-plan.module#SeasonalPlanModule', loadChildren:'./seasonal-plan/seasonal-plan.module#SeasonalPlanModule',
data: { preload: true, reuse: true } data: { preload: true, reuse: false }
}, },
{ {
path:'history', path:'history',
loadChildren:'./historical-data/historical-data.module#HistoricalDataModule', loadChildren:'./historical-data/historical-data.module#HistoricalDataModule',
data: { preload: true, reuse: true } data: { preload: true, reuse: false }
}, },
{ {
path:'basic', path:'basic',
src/app/pages/seasonal-plan/seasonal-plan-routing.module.ts
+1 -1
View File
@@ -7,7 +7,7 @@ const seasonalPlanRoutes: Routes = [
{ {
path: '', path: '',
component: SeasonalPlanComponent, component: SeasonalPlanComponent,
data: { preload: true, reuse: true } data: { preload: true, reuse: false }
} }
] ]