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

Merge branch 'develop-3'

Browse Source
This commit is contained in:
zhouyuejun
2018-12-24 18:47:39 +08:00
parent 9ddb893ffc 54fd21b56c
commit ac184d2d86
31 changed files with 364 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/basic-data/aircraft-type/aircraft-type.component.html
+2 -12
View File
@@ -1,15 +1,5 @@
<div class="main-page breadcrumb-main-content">
<div class="navigation">
<nz-breadcrumb>
<nz-breadcrumb-item>
机型
</nz-breadcrumb-item>
<nz-breadcrumb-item>
列表
</nz-breadcrumb-item>
</nz-breadcrumb>
</div>
<div class="page-content breadcrumb-main-content card">
<div class="main-page">
<div class="page-content">
<div class="search-filter mb-3">
<div class="first-condition row">
<div class="line-operator-left input-container mb-3 col-xlg-8 col-mlg-8 col-xl-8 col-lg-10">
src/app/pages/basic-data/aircraft-type/aircraft-type.component.scss
+3 -18
View File
@@ -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) {
src/app/pages/basic-data/aircraft/aircraft.component.html
+2 -12
View File
@@ -1,15 +1,5 @@
<div class="main-page breadcrumb-main-content">
<div class="navigation">
<nz-breadcrumb>
<nz-breadcrumb-item>
飞机
</nz-breadcrumb-item>
<nz-breadcrumb-item>
列表
</nz-breadcrumb-item>
</nz-breadcrumb>
</div>
<div class="page-content breadcrumb-main-content card">
<div class="main-page">
<div class="page-content">
<div class="search-filter mb-3">
<div class="first-condition row">
<div class="line-operator-left input-container mb-3 col-xlg-8 col-mlg-8 col-xl-8 col-lg-10">
src/app/pages/basic-data/aircraft/aircraft.component.scss
+3 -18
View File
@@ -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) {
src/app/pages/basic-data/airline/airline.component.html
+2 -12
View File
@@ -1,15 +1,5 @@
<div class="main-page breadcrumb-main-content">
<div class="navigation">
<nz-breadcrumb>
<nz-breadcrumb-item>
航空公司
</nz-breadcrumb-item>
<nz-breadcrumb-item>
列表
</nz-breadcrumb-item>
</nz-breadcrumb>
</div>
<div class="page-content breadcrumb-main-content card">
<div class="main-page">
<div class="page-content">
<div class="search-filter mb-3">
<div class="first-condition row">
<div class="line-operator-left input-container mb-3 col-xlg-8 col-mlg-8 col-xl-8 col-lg-10">
src/app/pages/basic-data/airline/airline.component.scss
+3 -18
View File
@@ -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) {
src/app/pages/basic-data/airport/airport.component.html
+2 -12
View File
@@ -1,15 +1,5 @@
<div class="main-page breadcrumb-main-content">
<div class="navigation">
<nz-breadcrumb>
<nz-breadcrumb-item>
机场
</nz-breadcrumb-item>
<nz-breadcrumb-item>
列表
</nz-breadcrumb-item>
</nz-breadcrumb>
</div>
<div class="page-content breadcrumb-main-content card">
<div class="main-page">
<div class="page-content">
<div class="search-filter mb-3">
<div class="first-condition row">
<div class="line-operator-left input-container mb-3 col-xlg-8 col-mlg-8 col-xl-8 col-lg-10">
src/app/pages/basic-data/airport/airport.component.scss
+3 -18
View File
@@ -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) {
src/app/pages/basic-data/carousel/carousel.component.html
+2 -12
View File
@@ -1,15 +1,5 @@
<div class="main-page breadcrumb-main-content">
<div class="navigation">
<nz-breadcrumb>
<nz-breadcrumb-item>
行李转盘
</nz-breadcrumb-item>
<nz-breadcrumb-item>
列表
</nz-breadcrumb-item>
</nz-breadcrumb>
</div>
<div class="page-content breadcrumb-main-content card">
<div class="main-page">
<div class="page-content">
<div class="search-filter mb-3">
<div class="first-condition row">
<div class="line-operator-left input-container mb-3 col-xlg-8 col-mlg-8 col-xl-8 col-lg-10">
src/app/pages/basic-data/carousel/carousel.component.scss
+3 -18
View File
@@ -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) {
src/app/pages/basic-data/checkin-desk/checkin-desk.component.html
+2 -12
View File
@@ -1,15 +1,5 @@
<div class="main-page breadcrumb-main-content">
<div class="navigation">
<nz-breadcrumb>
<nz-breadcrumb-item>
值机柜台
</nz-breadcrumb-item>
<nz-breadcrumb-item>
列表
</nz-breadcrumb-item>
</nz-breadcrumb>
</div>
<div class="page-content breadcrumb-main-content card">
<div class="main-page">
<div class="page-content">
<div class="search-filter mb-3">
<div class="first-condition row">
<div class="line-operator-left input-container mb-3 col-xlg-8 col-mlg-8 col-xl-8 col-lg-10">
src/app/pages/basic-data/checkin-desk/checkin-desk.component.scss
+3 -18
View File
@@ -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) {
src/app/pages/basic-data/checkin-group/checkin-group.component.html
+2 -12
View File
@@ -1,15 +1,5 @@
<div class="main-page breadcrumb-main-content">
<div class="navigation">
<nz-breadcrumb>
<nz-breadcrumb-item>
值机岛
</nz-breadcrumb-item>
<nz-breadcrumb-item>
列表
</nz-breadcrumb-item>
</nz-breadcrumb>
</div>
<div class="page-content breadcrumb-main-content card">
<div class="main-page">
<div class="page-content">
<div class="search-filter mb-3">
<div class="first-condition row">
<div class="line-operator-left input-container mb-3 col-xlg-8 col-mlg-8 col-xl-8 col-lg-10">
src/app/pages/basic-data/checkin-group/checkin-group.component.scss
+3 -18
View File
@@ -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) {
src/app/pages/basic-data/chut/chut.component.html
+2 -12
View File
@@ -1,15 +1,5 @@
<div class="main-page breadcrumb-main-content">
<div class="navigation">
<nz-breadcrumb>
<nz-breadcrumb-item>
行李传送带
</nz-breadcrumb-item>
<nz-breadcrumb-item>
列表
</nz-breadcrumb-item>
</nz-breadcrumb>
</div>
<div class="page-content breadcrumb-main-content card">
<div class="main-page">
<div class="page-content">
<div class="search-filter mb-3">
<div class="first-condition row">
<div class="line-operator-left input-container mb-3 col-xlg-8 col-mlg-8 col-xl-8 col-lg-10">
src/app/pages/basic-data/chut/chut.component.scss
+3 -18
View File
@@ -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) {
src/app/pages/basic-data/city/city.component.html
+2 -12
View File
@@ -1,15 +1,5 @@
<div class="main-page breadcrumb-main-content">
<div class="navigation">
<nz-breadcrumb>
<nz-breadcrumb-item>
城市
</nz-breadcrumb-item>
<nz-breadcrumb-item>
列表
</nz-breadcrumb-item>
</nz-breadcrumb>
</div>
<div class="page-content breadcrumb-main-content card">
<div class="main-page">
<div class="page-content">
<div class="search-filter mb-3">
<div class="first-condition row">
<div class="line-operator-left input-container mb-3 col-xlg-8 col-mlg-8 col-xl-8 col-lg-10">
src/app/pages/basic-data/city/city.component.scss
+3 -18
View File
@@ -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) {
src/app/pages/basic-data/gate/gate.component.html
+2 -12
View File
@@ -1,15 +1,5 @@
<div class="main-page breadcrumb-main-content">
<div class="navigation">
<nz-breadcrumb>
<nz-breadcrumb-item>
登机门
</nz-breadcrumb-item>
<nz-breadcrumb-item>
列表
</nz-breadcrumb-item>
</nz-breadcrumb>
</div>
<div class="page-content breadcrumb-main-content card">
<div class="main-page">
<div class="page-content">
<div class="search-filter mb-3">
<div class="first-condition row">
<div class="line-operator-left input-container mb-3 col-xlg-8 col-mlg-8 col-xl-8 col-lg-10">
src/app/pages/basic-data/gate/gate.component.scss
+3 -18
View File
@@ -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) {
src/app/pages/basic-data/stand/stand.component.html
+8 -23
View File
@@ -1,15 +1,5 @@
<div class="main-page breadcrumb-main-content">
<div class="navigation">
<nz-breadcrumb>
<nz-breadcrumb-item>
机位
</nz-breadcrumb-item>
<nz-breadcrumb-item>
列表
</nz-breadcrumb-item>
</nz-breadcrumb>
</div>
<div class="page-content breadcrumb-main-content card">
<div class="main-page">
<div class="page-content">
<div class="search-filter mb-3">
<div class="first-condition row">
<div class="line-operator-left input-container mb-3 col-xlg-8 col-mlg-8 col-xl-8 col-lg-10">
@@ -25,33 +15,28 @@
<input type="radio" [(ngModel)]="FLT_POS" [value]="2" name="filter-position">
<span>查找定位</span>
</label>
<input class="form-control" [(ngModel)]="SEARCH" type="text" (keyup.enter) = "inputEnter()" id="inputerInfo">
<input class="form-control" [(ngModel)]="SEARCH" type="text" (keyup.enter) = "inputEnter()">
</div>
</div>
<div class="second-condition mb-3 row">
<div class="input-container mr-4">
<label for="terminalAreaCode">所属航站楼区域：&nbsp;&nbsp;</label>
<select class="form-control" [(ngModel)]="filterItems.terminalAreaCode" (ngModelChange)="selectChange()" id="qy">
<select class="form-control" [(ngModel)]="filterItems.terminalAreaCode" (ngModelChange)="selectChange()">
<option value=""></option>
<option *ngFor="let items of terminalAreas" [value]="items.terminalAreaCode">{{items.terminalAreaName}}</option>
</select>
</div>
<div class="input-container mr-4">
<label for="standType">机位类型：&nbsp;&nbsp;</label>
<select class="form-control" [(ngModel)]="filterItems.standType" (ngModelChange)="selectChange()" id="jtype">
<select class="form-control" [(ngModel)]="filterItems.standType" (ngModelChange)="selectChange()">
<option value=""></option>
<option value="bridge">靠桥机位</option>
<option value="remote">远机位</option>
<option value="near">近机位</option>
<option value="night">过夜机位</option>
<option value="specific">专机位</option>
<!-- <option *ngFor="let items of stands" [value]="items.standType">{{items.standType}}</option> -->
<option *ngFor="let items of standTypes" [value]="items.standType">{{items.standTypeDesc}}</option>
</select>
</div>
<div class="input-container mr-4">
<label for="standStatus">资源状态：&nbsp;&nbsp;</label>
<select class="form-control" [(ngModel)]="filterItems.standStatus" (ngModelChange)="selectChange()" id="zystatus">
<select class="form-control" [(ngModel)]="filterItems.standStatus" (ngModelChange)="selectChange()">
<option value=""></option>
<!-- <option *ngFor="let items of stands" [value]="items.standStatus">{{items.standStatus}}</option> -->
<option value="0">可用</option>
@@ -83,7 +68,7 @@
<td>{{i+1}}</td>
<td>{{stand.standCode}}</td>
<td>{{stand.standName}}</td>
<td>{{stand.standType}}</td>
<td>{{stand.standTypeDesc}}</td>
<td>{{stand.standStatus}}</td>
<td>{{stand.terminalAreaName}}</td>
</tr>
src/app/pages/basic-data/stand/stand.component.scss
+3 -18
View File
@@ -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) {
src/app/pages/basic-data/stand/stand.component.ts
+27 -5
View File
@@ -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<any>; //所属航站楼区域
standTypes: Array<any>; //停机位类别
stands: Array<any>;
public row_state: any = { renderFlight: {} };
public render_data: Array<object> = []; //显示数据，即需要显示的数据
@@ -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() {
src/app/pages/basic-data/terminal-area/terminal-area.component.html
+2 -12
View File
@@ -1,15 +1,5 @@
<div class="main-page breadcrumb-main-content">
<div class="navigation">
<nz-breadcrumb>
<nz-breadcrumb-item>
航站楼区域
</nz-breadcrumb-item>
<nz-breadcrumb-item>
列表
</nz-breadcrumb-item>
</nz-breadcrumb>
</div>
<div class="page-content breadcrumb-main-content card">
<div class="main-page">
<div class="page-content">
<div class="search-filter mb-3">
<div class="first-condition row">
<div class="line-operator-left input-container mb-3 col-xlg-8 col-mlg-8 col-xl-8 col-lg-10">
src/app/pages/basic-data/terminal-area/terminal-area.component.scss
+3 -18
View File
@@ -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) {
src/app/pages/basic-data/terminal/terminal.component.html
+2 -12
View File
@@ -1,15 +1,5 @@
<div class="main-page breadcrumb-main-content">
<div class="navigation">
<nz-breadcrumb>
<nz-breadcrumb-item>
航站楼
</nz-breadcrumb-item>
<nz-breadcrumb-item>
列表
</nz-breadcrumb-item>
</nz-breadcrumb>
</div>
<div class="page-content breadcrumb-main-content card">
<div class="main-page">
<div class="page-content">
<div class="search-filter mb-3">
<div class="first-condition row">
<div class="line-operator-left input-container mb-3 col-xlg-8 col-mlg-8 col-xl-8 col-lg-10">
src/app/pages/basic-data/terminal/terminal.component.scss
+3 -18
View File
@@ -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) {
src/app/pages/seasonal-plan/seasonal-plan.component.html
+12 -39
View File
@@ -1,6 +1,6 @@
<div class="main-page">
<div class="main-page" #mainPage>
<div class="page-content">
<div class="search-filter mb-3">
<div class="search-filter mb-3" #searchFilter>
<div class="first-condition row">
<div class="line-operator-left input-container mb-3 col-xlg-8 col-mlg-8 col-xl-8 col-lg-10">
<select class="mr-4 form-control" [(ngModel)]="SEL_COL" name="" id="">
@@ -17,17 +17,13 @@
</label>
<input class="form-control" [(ngModel)]="SEARCH" type="text" (keyup.enter) = "inputEnter()">
</div>
<div class="line-operator-right mb-3 col-xlg-4 col-mlg-4 col-xl-4 col-lg-1">
<!-- <button type="button" class="btn btn-info mr-3">打印</button>
<button type="button" class="btn btn-info mr-3">航班季度</button>
<button type="button" class="btn btn-info mr-3">季度计划发布</button>
<button type="button" class="btn btn-info mr-3">刷新数据</button>
<button type="button" class="btn btn-info mr-3">季度计划维护</button> -->
<button type="button" class="btn btn-info mr-3" (click)="refresh()">刷新</button>
<div class="line-operator-right mb-3 col-xlg-4 col-mlg-4 col-xl-4 col-lg-2">
<button type="button" class="btn btn-info mr-2" (click)="toggleFilter()">{{filterClose?'展开':'关闭'}}</button>
<button type="button" class="btn btn-info mr-2" (click)="refresh()">刷新</button>
</div>
</div>
<div class="second-condition mb-3 row">
<div class="second-condition mb-3 row" [ngClass]="{'filterClose-c':filterClose,'filterClose-o':!filterClose}">
<div class="input-container mr-4">
<label for="airlineId">航空公司：&nbsp;&nbsp;</label>
<select class="form-control" [(ngModel)]="filterItems.airlineId" (ngModelChange)="selectChange()">
@@ -43,50 +39,29 @@
<option value="I">国际</option>
<option value="M">混合</option>
<option value="R">地区</option>
<!-- <option *ngFor="let item of seasonals" [value]="item.routeType">{{item.routeType}}</option> -->
</select>
</div>
<div class="input-container mr-4">
<label for="flightTypeCode">航班类别：&nbsp;&nbsp;</label>
<select class="form-control" [(ngModel)]="filterItems.flightTypeCode" (ngModelChange)="selectChange()" >
<option value=""></option>
<!-- <option value="P">客机</option>
<option value="F">货机</option>
<option value="B">专机</option>
<option value="O">公务机</option>
<option value="M">军机</option>
<option value="X">其他</option> -->
<option *ngFor="let item of flightTypes" [value]="item.flightTypeCode">{{item.flightTypeNameCn}}</option>
</select>
</div>
<div class="input-container mr-4">
<label for="startDate">查询年份：&nbsp;&nbsp;</label>
<input readonly type="text" id="startDate" class="form-control" style="background:transparent;cursor: pointer">
</div>
<div class="input-container mr-4">
<label for="arriOrDept">到达/出发：&nbsp;&nbsp;</label>
<select class="form-control" [(ngModel)]="filterItems.arriOrDept" (ngModelChange)="selectChange()">
<option value=""></option>
<option value="A">到达</option>
<option value="D">出发</option>
<!-- <option *ngFor="let item of seasonals" [value]="item.arriOrDept">{{item.arriOrDept}}</option> -->
</select>
</div>
<!-- <div class="input-container mr-4">
<label for="flightTask">航班任务：&nbsp;&nbsp;</label>
<select class="form-control" [(ngModel)]="filterItems.flightTask" (ngModelChange)="selectChange()">
<option value=""></option>
<option value="S">正班</option>
<option value="N">包机</option>
<option value="E">急救</option>
<option value="B">专机</option>
<option value="G">通用</option>
<option value="J">加班</option>
<option value="M">军用</option>
<option value="Q">补班</option>
<option value="X">其他</option>
<option value="A">计划外</option>
<option *ngFor="let item of seasonals" [value]="item.flightTask">{{item.flightTask}}</option>
</select>
</div> -->
</div>
<div class="third-condition row">
<div class="third-condition row" [ngClass]="{'filterClose-c':filterClose,'filterClose-o':!filterClose}">
<label class="radio-inline custom-checkbox nowrap mr-4">
<input type="checkbox" [(ngModel)]="checkboxGroup.related" (ngModelChange)="checkboxChange()">
<span>航班关联信息</span>
@@ -99,7 +74,7 @@
</div>
<div class="airline-table">
<div id="table-container" class="table-container" [ngClass]="{'table-c': !tabClose,'table-o': tabClose}">
<div #tableContainer id="table-container" class="table-container" [ngClass]="{'table-c': !tabClose,'table-o': tabClose}">
<table id="table" class="table table-bordered table-striped">
<thead>
<tr>
@@ -121,7 +96,6 @@
<th>机型</th>
<th>飞行距离(千米)</th>
<th>飞行时间(分钟)</th>
<!-- <th *ngFor="let seasonal of seasonal_lists">{{seasonal.COL_CN}}</th> -->
</tr>
</thead>
<tbody>
@@ -145,7 +119,6 @@
<td>{{seasonal.aircraftTypeName}}</td>
<td>{{seasonal.flyingDistance}}</td>
<td>{{seasonal.flyingTime}}</td>
<!-- <td *ngFor="let seasonal of seasonal_lists" [ngStyle]="{'background-color':getColor(seasonal.COL_CODE)}">{{airline_row['renderFlight'][seasonal.COL_CODE]}}</td> -->
</tr>
</tbody>
</table>
src/app/pages/seasonal-plan/seasonal-plan.component.scss
+11 -2
View File
@@ -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;
src/app/pages/seasonal-plan/seasonal-plan.component.ts
+114 -13
View File
@@ -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<object> = []; //显示数据，即需要显示的数据
public return_data: Array<object> = []; //下拉框显示数据
@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();
}
/**
* 复选框勾选事件
*/
src/app/services/basic-data-service.ts
+7
View File
@@ -20,6 +20,8 @@ export class BasicDataService {
public chut_subject = new Subject<any>();
public stand: Array<any> = [];
public stand_subject = new Subject<any>();
public standType: Array<any> = [];
public standType_subject = new Subject<any>();
public carousel: Array<any> = [];
public carousel_subject = new Subject<any>();
public checkin_desk: Array<any> = [];
@@ -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;