diff --git a/src/app/pages/basic-data/aircraft-type/aircraft-type.component.html b/src/app/pages/basic-data/aircraft-type/aircraft-type.component.html index 056bb52..df95f75 100644 --- a/src/app/pages/basic-data/aircraft-type/aircraft-type.component.html +++ b/src/app/pages/basic-data/aircraft-type/aircraft-type.component.html @@ -1,15 +1,5 @@ -
-
- - - 机型 - - - 列表 - - -
-
+
+
diff --git a/src/app/pages/basic-data/aircraft-type/aircraft-type.component.scss b/src/app/pages/basic-data/aircraft-type/aircraft-type.component.scss index 86a6e49..2804efa 100644 --- a/src/app/pages/basic-data/aircraft-type/aircraft-type.component.scss +++ b/src/app/pages/basic-data/aircraft-type/aircraft-type.component.scss @@ -2,13 +2,11 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 10px 20px 20px; - background-color: #f0f0f0; + padding: 15px 10px; + background-color: #fff; .page-content { border: 1px solid #ccc; - // padding: 10px 20px; - // overflow-y: scroll; - // height: 100%; + padding: 10px 20px; .search-filter { padding: 0 15px; .input-container { @@ -46,19 +44,6 @@ } } } - .navigation{ - padding-bottom: 10px; - } - .breadcrumb-main-container { - padding: 20px 20px; - background-color: #f0f0f0; - } - .card{ - background: #fff; - padding: 20px; - box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15); - border-radius: 0; - } } @media screen and (max-width: 991px) { diff --git a/src/app/pages/basic-data/aircraft/aircraft.component.html b/src/app/pages/basic-data/aircraft/aircraft.component.html index 8cb5f27..848dfc7 100644 --- a/src/app/pages/basic-data/aircraft/aircraft.component.html +++ b/src/app/pages/basic-data/aircraft/aircraft.component.html @@ -1,15 +1,5 @@ -
-
- - - 飞机 - - - 列表 - - -
-
+
+
diff --git a/src/app/pages/basic-data/aircraft/aircraft.component.scss b/src/app/pages/basic-data/aircraft/aircraft.component.scss index 86a6e49..2804efa 100644 --- a/src/app/pages/basic-data/aircraft/aircraft.component.scss +++ b/src/app/pages/basic-data/aircraft/aircraft.component.scss @@ -2,13 +2,11 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 10px 20px 20px; - background-color: #f0f0f0; + padding: 15px 10px; + background-color: #fff; .page-content { border: 1px solid #ccc; - // padding: 10px 20px; - // overflow-y: scroll; - // height: 100%; + padding: 10px 20px; .search-filter { padding: 0 15px; .input-container { @@ -46,19 +44,6 @@ } } } - .navigation{ - padding-bottom: 10px; - } - .breadcrumb-main-container { - padding: 20px 20px; - background-color: #f0f0f0; - } - .card{ - background: #fff; - padding: 20px; - box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15); - border-radius: 0; - } } @media screen and (max-width: 991px) { diff --git a/src/app/pages/basic-data/airline/airline.component.html b/src/app/pages/basic-data/airline/airline.component.html index ca7f2d7..5e3b9c6 100644 --- a/src/app/pages/basic-data/airline/airline.component.html +++ b/src/app/pages/basic-data/airline/airline.component.html @@ -1,15 +1,5 @@ -
-
- - - 航空公司 - - - 列表 - - -
-
+
+
diff --git a/src/app/pages/basic-data/airline/airline.component.scss b/src/app/pages/basic-data/airline/airline.component.scss index 86a6e49..2804efa 100644 --- a/src/app/pages/basic-data/airline/airline.component.scss +++ b/src/app/pages/basic-data/airline/airline.component.scss @@ -2,13 +2,11 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 10px 20px 20px; - background-color: #f0f0f0; + padding: 15px 10px; + background-color: #fff; .page-content { border: 1px solid #ccc; - // padding: 10px 20px; - // overflow-y: scroll; - // height: 100%; + padding: 10px 20px; .search-filter { padding: 0 15px; .input-container { @@ -46,19 +44,6 @@ } } } - .navigation{ - padding-bottom: 10px; - } - .breadcrumb-main-container { - padding: 20px 20px; - background-color: #f0f0f0; - } - .card{ - background: #fff; - padding: 20px; - box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15); - border-radius: 0; - } } @media screen and (max-width: 991px) { diff --git a/src/app/pages/basic-data/airport/airport.component.html b/src/app/pages/basic-data/airport/airport.component.html index 364bbc4..d69f1b4 100644 --- a/src/app/pages/basic-data/airport/airport.component.html +++ b/src/app/pages/basic-data/airport/airport.component.html @@ -1,15 +1,5 @@ -
-
- - - 机场 - - - 列表 - - -
-
+
+
diff --git a/src/app/pages/basic-data/airport/airport.component.scss b/src/app/pages/basic-data/airport/airport.component.scss index 86a6e49..2804efa 100644 --- a/src/app/pages/basic-data/airport/airport.component.scss +++ b/src/app/pages/basic-data/airport/airport.component.scss @@ -2,13 +2,11 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 10px 20px 20px; - background-color: #f0f0f0; + padding: 15px 10px; + background-color: #fff; .page-content { border: 1px solid #ccc; - // padding: 10px 20px; - // overflow-y: scroll; - // height: 100%; + padding: 10px 20px; .search-filter { padding: 0 15px; .input-container { @@ -46,19 +44,6 @@ } } } - .navigation{ - padding-bottom: 10px; - } - .breadcrumb-main-container { - padding: 20px 20px; - background-color: #f0f0f0; - } - .card{ - background: #fff; - padding: 20px; - box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15); - border-radius: 0; - } } @media screen and (max-width: 991px) { diff --git a/src/app/pages/basic-data/carousel/carousel.component.html b/src/app/pages/basic-data/carousel/carousel.component.html index 289ce0e..d7235fa 100644 --- a/src/app/pages/basic-data/carousel/carousel.component.html +++ b/src/app/pages/basic-data/carousel/carousel.component.html @@ -1,15 +1,5 @@ -
-
- - - 行李转盘 - - - 列表 - - -
-
+
+
diff --git a/src/app/pages/basic-data/carousel/carousel.component.scss b/src/app/pages/basic-data/carousel/carousel.component.scss index 86a6e49..2804efa 100644 --- a/src/app/pages/basic-data/carousel/carousel.component.scss +++ b/src/app/pages/basic-data/carousel/carousel.component.scss @@ -2,13 +2,11 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 10px 20px 20px; - background-color: #f0f0f0; + padding: 15px 10px; + background-color: #fff; .page-content { border: 1px solid #ccc; - // padding: 10px 20px; - // overflow-y: scroll; - // height: 100%; + padding: 10px 20px; .search-filter { padding: 0 15px; .input-container { @@ -46,19 +44,6 @@ } } } - .navigation{ - padding-bottom: 10px; - } - .breadcrumb-main-container { - padding: 20px 20px; - background-color: #f0f0f0; - } - .card{ - background: #fff; - padding: 20px; - box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15); - border-radius: 0; - } } @media screen and (max-width: 991px) { diff --git a/src/app/pages/basic-data/checkin-desk/checkin-desk.component.html b/src/app/pages/basic-data/checkin-desk/checkin-desk.component.html index 683d45f..c08f2c9 100644 --- a/src/app/pages/basic-data/checkin-desk/checkin-desk.component.html +++ b/src/app/pages/basic-data/checkin-desk/checkin-desk.component.html @@ -1,15 +1,5 @@ -
-
- - - 值机柜台 - - - 列表 - - -
-
+
+
diff --git a/src/app/pages/basic-data/checkin-desk/checkin-desk.component.scss b/src/app/pages/basic-data/checkin-desk/checkin-desk.component.scss index 86a6e49..2804efa 100644 --- a/src/app/pages/basic-data/checkin-desk/checkin-desk.component.scss +++ b/src/app/pages/basic-data/checkin-desk/checkin-desk.component.scss @@ -2,13 +2,11 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 10px 20px 20px; - background-color: #f0f0f0; + padding: 15px 10px; + background-color: #fff; .page-content { border: 1px solid #ccc; - // padding: 10px 20px; - // overflow-y: scroll; - // height: 100%; + padding: 10px 20px; .search-filter { padding: 0 15px; .input-container { @@ -46,19 +44,6 @@ } } } - .navigation{ - padding-bottom: 10px; - } - .breadcrumb-main-container { - padding: 20px 20px; - background-color: #f0f0f0; - } - .card{ - background: #fff; - padding: 20px; - box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15); - border-radius: 0; - } } @media screen and (max-width: 991px) { diff --git a/src/app/pages/basic-data/checkin-group/checkin-group.component.html b/src/app/pages/basic-data/checkin-group/checkin-group.component.html index 5160ba0..3361d2e 100644 --- a/src/app/pages/basic-data/checkin-group/checkin-group.component.html +++ b/src/app/pages/basic-data/checkin-group/checkin-group.component.html @@ -1,15 +1,5 @@ -
-
- - - 值机岛 - - - 列表 - - -
-
+
+
diff --git a/src/app/pages/basic-data/checkin-group/checkin-group.component.scss b/src/app/pages/basic-data/checkin-group/checkin-group.component.scss index 86a6e49..2804efa 100644 --- a/src/app/pages/basic-data/checkin-group/checkin-group.component.scss +++ b/src/app/pages/basic-data/checkin-group/checkin-group.component.scss @@ -2,13 +2,11 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 10px 20px 20px; - background-color: #f0f0f0; + padding: 15px 10px; + background-color: #fff; .page-content { border: 1px solid #ccc; - // padding: 10px 20px; - // overflow-y: scroll; - // height: 100%; + padding: 10px 20px; .search-filter { padding: 0 15px; .input-container { @@ -46,19 +44,6 @@ } } } - .navigation{ - padding-bottom: 10px; - } - .breadcrumb-main-container { - padding: 20px 20px; - background-color: #f0f0f0; - } - .card{ - background: #fff; - padding: 20px; - box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15); - border-radius: 0; - } } @media screen and (max-width: 991px) { diff --git a/src/app/pages/basic-data/chut/chut.component.html b/src/app/pages/basic-data/chut/chut.component.html index ec80b46..173f29e 100644 --- a/src/app/pages/basic-data/chut/chut.component.html +++ b/src/app/pages/basic-data/chut/chut.component.html @@ -1,15 +1,5 @@ -
-
- - - 行李传送带 - - - 列表 - - -
-
+
+
diff --git a/src/app/pages/basic-data/chut/chut.component.scss b/src/app/pages/basic-data/chut/chut.component.scss index 86a6e49..2804efa 100644 --- a/src/app/pages/basic-data/chut/chut.component.scss +++ b/src/app/pages/basic-data/chut/chut.component.scss @@ -2,13 +2,11 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 10px 20px 20px; - background-color: #f0f0f0; + padding: 15px 10px; + background-color: #fff; .page-content { border: 1px solid #ccc; - // padding: 10px 20px; - // overflow-y: scroll; - // height: 100%; + padding: 10px 20px; .search-filter { padding: 0 15px; .input-container { @@ -46,19 +44,6 @@ } } } - .navigation{ - padding-bottom: 10px; - } - .breadcrumb-main-container { - padding: 20px 20px; - background-color: #f0f0f0; - } - .card{ - background: #fff; - padding: 20px; - box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15); - border-radius: 0; - } } @media screen and (max-width: 991px) { diff --git a/src/app/pages/basic-data/city/city.component.html b/src/app/pages/basic-data/city/city.component.html index 145deb4..f5b7e0e 100644 --- a/src/app/pages/basic-data/city/city.component.html +++ b/src/app/pages/basic-data/city/city.component.html @@ -1,15 +1,5 @@ -
-
- - - 城市 - - - 列表 - - -
-
+
+
diff --git a/src/app/pages/basic-data/city/city.component.scss b/src/app/pages/basic-data/city/city.component.scss index 86a6e49..2804efa 100644 --- a/src/app/pages/basic-data/city/city.component.scss +++ b/src/app/pages/basic-data/city/city.component.scss @@ -2,13 +2,11 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 10px 20px 20px; - background-color: #f0f0f0; + padding: 15px 10px; + background-color: #fff; .page-content { border: 1px solid #ccc; - // padding: 10px 20px; - // overflow-y: scroll; - // height: 100%; + padding: 10px 20px; .search-filter { padding: 0 15px; .input-container { @@ -46,19 +44,6 @@ } } } - .navigation{ - padding-bottom: 10px; - } - .breadcrumb-main-container { - padding: 20px 20px; - background-color: #f0f0f0; - } - .card{ - background: #fff; - padding: 20px; - box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15); - border-radius: 0; - } } @media screen and (max-width: 991px) { diff --git a/src/app/pages/basic-data/gate/gate.component.html b/src/app/pages/basic-data/gate/gate.component.html index 8d8d146..509a73d 100644 --- a/src/app/pages/basic-data/gate/gate.component.html +++ b/src/app/pages/basic-data/gate/gate.component.html @@ -1,15 +1,5 @@ -
-
- - - 登机门 - - - 列表 - - -
-
+
+
diff --git a/src/app/pages/basic-data/gate/gate.component.scss b/src/app/pages/basic-data/gate/gate.component.scss index 86a6e49..2804efa 100644 --- a/src/app/pages/basic-data/gate/gate.component.scss +++ b/src/app/pages/basic-data/gate/gate.component.scss @@ -2,13 +2,11 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 10px 20px 20px; - background-color: #f0f0f0; + padding: 15px 10px; + background-color: #fff; .page-content { border: 1px solid #ccc; - // padding: 10px 20px; - // overflow-y: scroll; - // height: 100%; + padding: 10px 20px; .search-filter { padding: 0 15px; .input-container { @@ -46,19 +44,6 @@ } } } - .navigation{ - padding-bottom: 10px; - } - .breadcrumb-main-container { - padding: 20px 20px; - background-color: #f0f0f0; - } - .card{ - background: #fff; - padding: 20px; - box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15); - border-radius: 0; - } } @media screen and (max-width: 991px) { diff --git a/src/app/pages/basic-data/stand/stand.component.html b/src/app/pages/basic-data/stand/stand.component.html index fb4e0db..d2fea81 100644 --- a/src/app/pages/basic-data/stand/stand.component.html +++ b/src/app/pages/basic-data/stand/stand.component.html @@ -1,15 +1,5 @@ -
-
- - - 机位 - - - 列表 - - -
-
+
+
@@ -25,43 +15,38 @@ 查找定位 - +
- - -
-
- - - - - - - - - -
-
- - +
+
+ + +
+
+ + +
-
@@ -83,7 +68,7 @@ {{i+1}} {{stand.standCode}} {{stand.standName}} - {{stand.standType}} + {{stand.standTypeDesc}} {{stand.standStatus}} {{stand.terminalAreaName}} diff --git a/src/app/pages/basic-data/stand/stand.component.scss b/src/app/pages/basic-data/stand/stand.component.scss index 86a6e49..2804efa 100644 --- a/src/app/pages/basic-data/stand/stand.component.scss +++ b/src/app/pages/basic-data/stand/stand.component.scss @@ -2,13 +2,11 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 10px 20px 20px; - background-color: #f0f0f0; + padding: 15px 10px; + background-color: #fff; .page-content { border: 1px solid #ccc; - // padding: 10px 20px; - // overflow-y: scroll; - // height: 100%; + padding: 10px 20px; .search-filter { padding: 0 15px; .input-container { @@ -46,19 +44,6 @@ } } } - .navigation{ - padding-bottom: 10px; - } - .breadcrumb-main-container { - padding: 20px 20px; - background-color: #f0f0f0; - } - .card{ - background: #fff; - padding: 20px; - box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15); - border-radius: 0; - } } @media screen and (max-width: 991px) { diff --git a/src/app/pages/basic-data/stand/stand.component.ts b/src/app/pages/basic-data/stand/stand.component.ts index 0f05c12..0968a01 100644 --- a/src/app/pages/basic-data/stand/stand.component.ts +++ b/src/app/pages/basic-data/stand/stand.component.ts @@ -17,7 +17,7 @@ export class StandComponent implements OnInit { public col_lists = [ { col_code: 'standCode', col_chn: '机位代码' }, { col_code: 'standName', col_chn: '机位名称' }, - { col_code: 'standType', col_chn: '机位类型' }, + { col_code: 'standTypeDesc', col_chn: '机位类型' }, { col_code: 'standStatus', col_chn: '资源状态' }, { col_code: 'terminalAreaName', col_chn: '航站楼区域' }, ] @@ -35,6 +35,7 @@ export class StandComponent implements OnInit { } terminalAreas: Array; //所属航站楼区域 + standTypes: Array; //停机位类别 stands: Array; public row_state: any = { renderFlight: {} }; public render_data: Array = []; //显示数据，即需要显示的数据 @@ -42,6 +43,7 @@ export class StandComponent implements OnInit { ngOnInit() { this.terminalAreas = this.basicDataService.terminal_area; this.stands = this.basicDataService.stand; + this.standTypes = this.basicDataService.standType; this.render_data = this.basicDataService.stand; this.basicDataService.stand_subject.subscribe( data => { @@ -54,13 +56,24 @@ export class StandComponent implements OnInit { this.terminalAreas = data; //航站楼区域数据转换处理 if(this.terminalAreas && this.terminalAreas.length > 0){ - this.basicDataTransHandle(); + this.terminalAreasHandle(); + } + } + ) + this.basicDataService.standType_subject.subscribe( + data => { + this.standTypes = data; + //停机位类别 + if(this.standTypes && this.standTypes.length > 0){ + this.standTypesHandle(); } } ) - //航站楼区域数据转换处理 if(this.render_data){ - this.basicDataTransHandle(); + //航站楼区域数据转换处理 + this.terminalAreasHandle(); + //停机位类别数据转换处理 + this.standTypesHandle(); } /** * 固定表头 @@ -74,7 +87,7 @@ export class StandComponent implements OnInit { } //航站楼区域数据转换处理 - basicDataTransHandle() { + terminalAreasHandle() { this.render_data.forEach(item => { let terminalAreasLinkIndex = this.terminalAreas.findIndex(val => val.terminalAreaCode === item['terminalAreaCode']); if(this.terminalAreas[terminalAreasLinkIndex]){ @@ -82,6 +95,15 @@ export class StandComponent implements OnInit { } }) } + //停机位类别数据转换处理 + standTypesHandle() { + this.render_data.forEach(item => { + let standTypesLinkIndex = this.standTypes.findIndex(val => val.standType === item['standType']); + if(this.standTypes[standTypesLinkIndex]){ + item['standTypeDesc'] = this.standTypes[standTypesLinkIndex].standTypeDesc; + } + }) + } //输入框回车事件 inputEnter() { diff --git a/src/app/pages/basic-data/terminal-area/terminal-area.component.html b/src/app/pages/basic-data/terminal-area/terminal-area.component.html index 279e638..bc88a3f 100644 --- a/src/app/pages/basic-data/terminal-area/terminal-area.component.html +++ b/src/app/pages/basic-data/terminal-area/terminal-area.component.html @@ -1,15 +1,5 @@ -
-
- - - 航站楼区域 - - - 列表 - - -
-
+
+
diff --git a/src/app/pages/basic-data/terminal-area/terminal-area.component.scss b/src/app/pages/basic-data/terminal-area/terminal-area.component.scss index 86a6e49..2804efa 100644 --- a/src/app/pages/basic-data/terminal-area/terminal-area.component.scss +++ b/src/app/pages/basic-data/terminal-area/terminal-area.component.scss @@ -2,13 +2,11 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 10px 20px 20px; - background-color: #f0f0f0; + padding: 15px 10px; + background-color: #fff; .page-content { border: 1px solid #ccc; - // padding: 10px 20px; - // overflow-y: scroll; - // height: 100%; + padding: 10px 20px; .search-filter { padding: 0 15px; .input-container { @@ -46,19 +44,6 @@ } } } - .navigation{ - padding-bottom: 10px; - } - .breadcrumb-main-container { - padding: 20px 20px; - background-color: #f0f0f0; - } - .card{ - background: #fff; - padding: 20px; - box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15); - border-radius: 0; - } } @media screen and (max-width: 991px) { diff --git a/src/app/pages/basic-data/terminal/terminal.component.html b/src/app/pages/basic-data/terminal/terminal.component.html index 17d4403..ea59d66 100644 --- a/src/app/pages/basic-data/terminal/terminal.component.html +++ b/src/app/pages/basic-data/terminal/terminal.component.html @@ -1,15 +1,5 @@ -
-
- - - 航站楼 - - - 列表 - - -
-
+
+
diff --git a/src/app/pages/basic-data/terminal/terminal.component.scss b/src/app/pages/basic-data/terminal/terminal.component.scss index 86a6e49..2804efa 100644 --- a/src/app/pages/basic-data/terminal/terminal.component.scss +++ b/src/app/pages/basic-data/terminal/terminal.component.scss @@ -2,13 +2,11 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 10px 20px 20px; - background-color: #f0f0f0; + padding: 15px 10px; + background-color: #fff; .page-content { border: 1px solid #ccc; - // padding: 10px 20px; - // overflow-y: scroll; - // height: 100%; + padding: 10px 20px; .search-filter { padding: 0 15px; .input-container { @@ -46,19 +44,6 @@ } } } - .navigation{ - padding-bottom: 10px; - } - .breadcrumb-main-container { - padding: 20px 20px; - background-color: #f0f0f0; - } - .card{ - background: #fff; - padding: 20px; - box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15); - border-radius: 0; - } } @media screen and (max-width: 991px) { diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.html b/src/app/pages/seasonal-plan/seasonal-plan.component.html index 53bc224..9a6efea 100644 --- a/src/app/pages/seasonal-plan/seasonal-plan.component.html +++ b/src/app/pages/seasonal-plan/seasonal-plan.component.html @@ -1,11 +1,11 @@ -
+
-
+
-
+
-
-
- - -
+
+
+ + +
-
-
- - -
-
- - -
-
- - +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
-
- - +
+ +
- -
-
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
序号航班号航班季度国际代码航空公司航线类别航班类别运营日开始日期结束日期航线进/出港到达时间出发时间机型飞行距离(千米)飞行时间(分钟)
{{i+1}}{{seasonal.flightNumber}}{{seasonal.seasonRecId}}{{seasonal.internationalCode}}{{seasonal.airlineChnName}}{{seasonal.routeType}}{{seasonal.flightTypeNameCn}}{{seasonal.operationDays}}{{seasonal.startDate}}{{seasonal.endDate}}{{seasonal.startAirport}}{{seasonal.arriOrDept}}{{seasonal.arrivalTime}}{{seasonal.departureTime}}{{seasonal.aircraftTypeName}}{{seasonal.flyingDistance}}{{seasonal.flyingTime}}
-
-
- - - - - - - - -
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
序号航班号航班季度国际代码航空公司航线类别航班类别运营日开始日期结束日期航线进/出港到达时间出发时间机型飞行距离(千米)飞行时间(分钟)
{{i+1}}{{seasonal.flightNumber}}{{seasonal.seasonRecId}}{{seasonal.internationalCode}}{{seasonal.airlineChnName}}{{seasonal.routeType}}{{seasonal.flightTypeNameCn}}{{seasonal.operationDays}}{{seasonal.startDate}}{{seasonal.endDate}}{{seasonal.startAirport}}{{seasonal.arriOrDept}}{{seasonal.arrivalTime}}{{seasonal.departureTime}}{{seasonal.aircraftTypeName}}{{seasonal.flyingDistance}}{{seasonal.flyingTime}}
+
+
+ + + + + + + + +
\ No newline at end of file diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.scss b/src/app/pages/seasonal-plan/seasonal-plan.component.scss index ae76ea7..8111a88 100644 --- a/src/app/pages/seasonal-plan/seasonal-plan.component.scss +++ b/src/app/pages/seasonal-plan/seasonal-plan.component.scss @@ -20,6 +20,9 @@ } } } + .second-condition,.third-condition{ + display: none; + } .input-container { padding: 0; > .form-control { @@ -27,6 +30,12 @@ display: inline-block; } } + .filterClose-c{ + display: none; + } + .filterClose-o{ + display: flex; + } } .airline-table{ .table-container{ @@ -48,10 +57,10 @@ background-color: #ddd; color: rgb(0, 0, 255); } - /* th,td{ + th,td{ // border: none; text-align: center; - } */ + } } &::-webkit-scrollbar { width: 15px; diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.ts b/src/app/pages/seasonal-plan/seasonal-plan.component.ts index c2d0524..1180096 100644 --- a/src/app/pages/seasonal-plan/seasonal-plan.component.ts +++ b/src/app/pages/seasonal-plan/seasonal-plan.component.ts @@ -1,10 +1,12 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit ,ViewChild,Renderer2 } from '@angular/core'; import { HttpClientService } from '../../services/http-client.service'; import { BasicDataService } from '../../services/basic-data-service'; import { ChangeDetectorRef } from '@angular/core'; import { ToastService } from '../../components/toast/toast.service'; import { ToastConfig, ToastType } from '../../components/toast/toast-model'; import * as $ from 'jquery'; +import { format } from 'util'; +declare var laydate: any; @Component({ selector: 'app-seasonal-plan', templateUrl: './seasonal-plan.component.html', @@ -13,6 +15,7 @@ import * as $ from 'jquery'; export class SeasonalPlanComponent implements OnInit { constructor( + private renderer2: Renderer2, private httpCilent: HttpClientService, private basicDataService: BasicDataService, private toastService: ToastService, @@ -41,7 +44,7 @@ export class SeasonalPlanComponent implements OnInit { { col_code: 'arriOrDept', col_chn: '进/出港' }, { col_code: 'arrivalTime', col_chn: '到达时间' }, { col_code: 'departureTime', col_chn: '出发时间' }, - { col_code: 'aircraftTypeCode', col_chn: '机型' }, + { col_code: 'aircraftTypeName', col_chn: '机型' }, { col_code: 'flyingDistance', col_chn: '飞行距离(千米)' }, { col_code: 'flyingTime', col_chn: '飞行时间(分钟)' }, ] @@ -67,21 +70,27 @@ export class SeasonalPlanComponent implements OnInit { public row_state: any = { renderFlight: {} }; public render_data: Array = []; //显示数据，即需要显示的数据 public return_data: Array = []; //下拉框显示数据 + + @ViewChild('mainPage') mainPage; + @ViewChild('searchFilter') searchFilter; + @ViewChild('tableContainer') tableContainer; ngOnInit() { + //选择年份 + this.laydateYear(); + this.renderer2.setStyle(this.tableContainer.nativeElement, 'height', this.mainPage.nativeElement.offsetHeight - this.searchFilter.nativeElement.offsetHeight - 55 + 'px'); + window.onresize = function () { + this.renderer2.setStyle(this.tableContainer.nativeElement, 'height', this.mainPage.nativeElement.offsetHeight - this.searchFilter.nativeElement.offsetHeight - 55 + 'px'); + }.bind(this) /* 获取季度计划信息 */ - this.httpCilent.get('/adminapi/schedule/flightSchdSeasons').subscribe( + var value = new Date(new Date().getTime()); + var subValue = format(value).substring(11,15); //时间截取到年份 + this.httpCilent.get('/adminapi/schedule/flightSchdSeasons',{startDate: subValue}).subscribe( data => { this.seasonals = data.body; this.render_data = this.seasonals; - if(this.airlines && this.airlines.length > 0){//航空公司列表数据转换 - this.basicDataTransHandle(); - } - if(this.aircraftTypes && this.aircraftTypes.length > 0){//机型列表数据转换 - this.aircraftTypesHandle(); - } - if(this.flightTypes && this.flightTypes.length > 0){//航班类别列表数据转换 - this.flightTypesHandle(); - } + this.airlinesHandle(); //航空公司 + this.aircraftTypesHandle(); //机型 + this.flightTypesHandle(); //航班类别 this.render_data.forEach(element => {//航线类别列表显示数据转换 if (element['routeType'] == 'D') { element['routeType'] = '国内' @@ -117,6 +126,9 @@ export class SeasonalPlanComponent implements OnInit { this.basicDataService.airline_subject.subscribe( data=>{ this.airlines = data; + if(this.airlines && this.airlines.length > 0){//航空公司列表数据转换 + this.airlinesHandle(); + } } ) //机型 @@ -124,6 +136,9 @@ export class SeasonalPlanComponent implements OnInit { this.basicDataService.aircraft_type_subject.subscribe( data => { this.aircraftTypes = data; + if(this.aircraftTypes && this.aircraftTypes.length > 0){//机型列表数据转换 + this.aircraftTypesHandle(); + } } ) //航班类别 @@ -131,6 +146,9 @@ export class SeasonalPlanComponent implements OnInit { this.basicDataService.flightTypes_subject.subscribe( data=> { this.flightTypes = data; + if(this.flightTypes && this.flightTypes.length > 0){//航班类别列表数据转换 + this.flightTypesHandle(); + } } ) /** @@ -144,7 +162,7 @@ export class SeasonalPlanComponent implements OnInit { tableCont.addEventListener('scroll',scrollHandle); } //航空公司名称数据转换处理 - basicDataTransHandle() { + airlinesHandle() { this.render_data.forEach(item => { let airlineLinkIndex = this.airlines.findIndex(val => val.airlineId === item['airlineId']); if(this.airlines[airlineLinkIndex]){ @@ -173,6 +191,89 @@ export class SeasonalPlanComponent implements OnInit { }) } + //选择年份 + laydateYear(){ + laydate.render({ + elem: '#startDate', + showBottom: true, + value: new Date(new Date().getTime()), + type: 'year', + // format: 'yyyy', + done: (value) => { + this.httpCilent.get('/adminapi/schedule/flightSchdSeasons', { startDate: value }).subscribe( + data => { + this.seasonals = data.body; + this.render_data = this.seasonals; + if(this.airlines && this.airlines.length > 0){//航空公司列表数据转换 + this.airlinesHandle(); + } + if(this.aircraftTypes && this.aircraftTypes.length > 0){//机型列表数据转换 + this.aircraftTypesHandle(); + } + if(this.flightTypes && this.flightTypes.length > 0){//航班类别列表数据转换 + this.flightTypesHandle(); + } + this.render_data.forEach(element => {//航线类别列表显示数据转换 + if (element['routeType'] == 'D') { + element['routeType'] = '国内' + return element['routeType']; + } + if(element['routeType'] == 'I'){ + element['routeType'] = '国际' + return element['routeType']; + } + if(element['routeType'] == 'M'){ + element['routeType'] = '混合' + return element['routeType']; + } + if(element['routeType'] = 'R'){ + element['routeType'] = '地区' + return element['routeType']; + } + }); + this.render_data.forEach(item => {//到达/出发列表显示数据转换 + if(item['arriOrDept'] == 'A'){ + item['arriOrDept'] = '到达' + return item['arriOrDept'] + } + if(item['arriOrDept'] == 'D'){ + item['arriOrDept'] = '出发' + return item['arriOrDept'] + } + }); + }) + //航空公司 + this.airlines = this.basicDataService.airline; + this.basicDataService.airline_subject.subscribe( + data=>{ + this.airlines = data; + } + ) + //机型 + this.aircraftTypes = this.basicDataService.aircraft_type; + this.basicDataService.aircraft_type_subject.subscribe( + data => { + this.aircraftTypes = data; + } + ) + //航班类别 + this.flightTypes = this.basicDataService.flightTypes; + this.basicDataService.flightTypes_subject.subscribe( + data=> { + this.flightTypes = data; + } + ) + } + }); + } + + public filterClose: boolean = true; + //点击展开切换操作 + toggleFilter() { + this.filterClose = !this.filterClose; + this.changeDetectorRef.detectChanges(); + } + /** * 复选框勾选事件 */ diff --git a/src/app/services/basic-data-service.ts b/src/app/services/basic-data-service.ts index f8f7a74..81fcc46 100644 --- a/src/app/services/basic-data-service.ts +++ b/src/app/services/basic-data-service.ts @@ -20,6 +20,8 @@ export class BasicDataService { public chut_subject = new Subject(); public stand: Array = []; public stand_subject = new Subject(); + public standType: Array = []; + public standType_subject = new Subject(); public carousel: Array = []; public carousel_subject = new Subject(); public checkin_desk: Array = []; @@ -58,6 +60,7 @@ export class BasicDataService { let terminalHttp = this.httpClient.get('/adminapi/basicdata/ormsTerminals'); let chutHttp = this.httpClient.get('/adminapi/basicdata/ormsChuts'); let standHttp = this.httpClient.get('/adminapi/basicdata/ormsStands'); + let standTypeHttp = this.httpClient.get('/adminapi/basicdata/ormsStandTypes'); let carouselHttp = this.httpClient.get('/adminapi/basicdata/ormsCarousels'); let checkinDeskHttp = this.httpClient.get('/adminapi/basicdata/ormsCheckindesks'); let airportHttp = this.httpClient.get('/adminapi/basicdata/sysAirports'); @@ -79,6 +82,7 @@ export class BasicDataService { terminalHttp, chutHttp, standHttp, + standTypeHttp, carouselHttp, checkinDeskHttp, airportHttp, @@ -101,6 +105,7 @@ export class BasicDataService { terminalRes, chutRes, standRes, + standTypesRes, carouselRes, checkinDeskRes, airportRes, @@ -130,6 +135,8 @@ export class BasicDataService { this.chut_subject.next(chutRes.body); this.stand = standRes.body; this.stand_subject.next(standRes.body); + this.standType = standTypesRes.body; + this.standType_subject.next(standTypesRes.body); this.carousel = carouselRes.body; this.carousel_subject.next(carouselRes.body); this.checkin_desk = checkinDeskRes.body;