Merge branch 'develop-3'

src/app/pages/basic-data/aircraft-type/aircraft-type.component.html

@@ -1,5 +1,15 @@
-<div class="main-page">
+<div class="main-page breadcrumb-main-content">
-    <div class="page-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="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

@@ -2,23 +2,15 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 15px 10px;
+    padding: 16px 20px 20px;
-    background-color: #fff;
+    background-color: #f0f0f0;
     .page-content {
         border: 1px solid #ccc;
-        padding: 10px 20px;
+        // padding: 10px 20px;
+        // overflow-y: scroll;
+        // height: 100%;
         .search-filter {
             padding: 0 15px;
-            .first-condition {
-                .line-operator-right {
-                    text-align: right;
-                    padding: 0;
-                    .btn-info {
-                        background-color: rgb(122, 156, 204);
-                        border-color: rgb(122, 156, 204);
-                    }
-                }
-            }
             .input-container {
                 padding: 0;
                 > .form-control {
@@ -54,6 +46,19 @@
             }
         }
     }
+    .navigation{
+        padding-bottom: 16px;
+    }
+    .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

@@ -1,5 +1,15 @@
-<div class="main-page">
+<div class="main-page breadcrumb-main-content">
-    <div class="page-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="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

@@ -2,23 +2,15 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 15px 10px;
+    padding: 16px 20px 20px;
-    background-color: #fff;
+    background-color: #f0f0f0;
     .page-content {
         border: 1px solid #ccc;
-        padding: 10px 20px;
+        // padding: 10px 20px;
+        // overflow-y: scroll;
+        // height: 100%;
         .search-filter {
             padding: 0 15px;
-            .first-condition {
-                .line-operator-right {
-                    text-align: right;
-                    padding: 0;
-                    .btn-info {
-                        background-color: rgb(122, 156, 204);
-                        border-color: rgb(122, 156, 204);
-                    }
-                }
-            }
             .input-container {
                 padding: 0;
                 > .form-control {
@@ -54,6 +46,19 @@
             }
         }
     }
+    .navigation{
+        padding-bottom: 16px;
+    }
+    .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

@@ -1,5 +1,15 @@
-<div class="main-page">
+<div class="main-page breadcrumb-main-content">
-    <div class="page-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="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

@@ -2,23 +2,15 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 15px 10px;
+    padding: 16px 20px 20px;
-    background-color: #fff;
+    background-color: #f0f0f0;
     .page-content {
         border: 1px solid #ccc;
-        padding: 10px 20px;
+        // padding: 10px 20px;
+        // overflow-y: scroll;
+        // height: 100%;
         .search-filter {
             padding: 0 15px;
-            .first-condition {
-                .line-operator-right {
-                    text-align: right;
-                    padding: 0;
-                    .btn-info {
-                        background-color: rgb(122, 156, 204);
-                        border-color: rgb(122, 156, 204);
-                    }
-                }
-            }
             .input-container {
                 padding: 0;
                 > .form-control {
@@ -54,6 +46,19 @@
             }
         }
     }
+    .navigation{
+        padding-bottom: 16px;
+    }
+    .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

@@ -1,5 +1,15 @@
-<div class="main-page">
+<div class="main-page breadcrumb-main-content">
-  <div class="page-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="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

@@ -2,23 +2,15 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 15px 10px;
+    padding: 16px 20px 20px;
-    background-color: #fff;
+    background-color: #f0f0f0;
     .page-content {
         border: 1px solid #ccc;
-        padding: 10px 20px;
+        // padding: 10px 20px;
+        // overflow-y: scroll;
+        // height: 100%;
         .search-filter {
             padding: 0 15px;
-            .first-condition {
-                .line-operator-right {
-                    text-align: right;
-                    padding: 0;
-                    .btn-info {
-                        background-color: rgb(122, 156, 204);
-                        border-color: rgb(122, 156, 204);
-                    }
-                }
-            }
             .input-container {
                 padding: 0;
                 > .form-control {
@@ -54,6 +46,19 @@
             }
         }
     }
+    .navigation{
+        padding-bottom: 16px;
+    }
+    .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/basic-data.module.ts

@@ -19,12 +19,13 @@ import { AircraftTypeComponent } from './aircraft-type/aircraft-type.component';
 import { AircraftComponent } from './aircraft/aircraft.component';
 import { TerminalAreaComponent } from './terminal-area/terminal-area.component';
 import { AirlineComponent } from './airline/airline.component';
-
+import { NgZorroAntdModule} from 'ng-zorro-antd';
 @NgModule({
     imports: [
         CommonModule,
         BasicDataRouting,
         FormsModule,
+        NgZorroAntdModule,
         BasicDataPipesModule
     ],
     declarations: [
@@ -39,6 +40,6 @@ import { AirlineComponent } from './airline/airline.component';
         AircraftTypeComponent,
         AircraftComponent,
         TerminalAreaComponent,
-        AirlineComponent]
+        AirlineComponent],
 })
 export class BasicDataModule { }

src/app/pages/basic-data/carousel/carousel.component.html

@@ -1,5 +1,15 @@
-<div class="main-page">
+<div class="main-page breadcrumb-main-content">
-    <div class="page-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="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

@@ -2,23 +2,15 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 15px 10px;
+    padding: 16px 20px 20px;
-    background-color: #fff;
+    background-color: #f0f0f0;
     .page-content {
         border: 1px solid #ccc;
-        padding: 10px 20px;
+        // padding: 10px 20px;
+        // overflow-y: scroll;
+        // height: 100%;
         .search-filter {
             padding: 0 15px;
-            .first-condition {
-                .line-operator-right {
-                    text-align: right;
-                    padding: 0;
-                    .btn-info {
-                        background-color: rgb(122, 156, 204);
-                        border-color: rgb(122, 156, 204);
-                    }
-                }
-            }
             .input-container {
                 padding: 0;
                 > .form-control {
@@ -54,6 +46,19 @@
             }
         }
     }
+    .navigation{
+        padding-bottom: 16px;
+    }
+    .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

@@ -1,5 +1,15 @@
-<div class="main-page">
+<div class="main-page breadcrumb-main-content">
-  <div class="page-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="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

@@ -2,23 +2,15 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 15px 10px;
+    padding: 16px 20px 20px;
-    background-color: #fff;
+    background-color: #f0f0f0;
     .page-content {
         border: 1px solid #ccc;
-        padding: 10px 20px;
+        // padding: 10px 20px;
+        // overflow-y: scroll;
+        // height: 100%;
         .search-filter {
             padding: 0 15px;
-            .first-condition {
-                .line-operator-right {
-                    text-align: right;
-                    padding: 0;
-                    .btn-info {
-                        background-color: rgb(122, 156, 204);
-                        border-color: rgb(122, 156, 204);
-                    }
-                }
-            }
             .input-container {
                 padding: 0;
                 > .form-control {
@@ -54,6 +46,19 @@
             }
         }
     }
+    .navigation{
+        padding-bottom: 16px;
+    }
+    .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

@@ -1,5 +1,15 @@
-<div class="main-page">
+<div class="main-page breadcrumb-main-content">
-  <div class="page-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="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

@@ -2,11 +2,13 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 15px 10px;
+    padding: 16px 20px 20px;
-    background-color: #fff;
+    background-color: #f0f0f0;
     .page-content {
         border: 1px solid #ccc;
-        padding: 10px 20px;
+        // padding: 10px 20px;
+        // overflow-y: scroll;
+        // height: 100%;
         .search-filter {
             padding: 0 15px;
             .input-container {
@@ -44,6 +46,19 @@
             }
         }
     }
+    .navigation{
+        padding-bottom: 16px;
+    }
+    .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

@@ -1,5 +1,15 @@
-<div class="main-page">
+<div class="main-page breadcrumb-main-content">
-  <div class="page-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="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

@@ -2,23 +2,15 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 15px 10px;
+    padding: 16px 20px 20px;
-    background-color: #fff;
+    background-color: #f0f0f0;
     .page-content {
         border: 1px solid #ccc;
-        padding: 10px 20px;
+        // padding: 10px 20px;
+        // overflow-y: scroll;
+        // height: 100%;
         .search-filter {
             padding: 0 15px;
-            .first-condition {
-                .line-operator-right {
-                    text-align: right;
-                    padding: 0;
-                    .btn-info {
-                        background-color: rgb(122, 156, 204);
-                        border-color: rgb(122, 156, 204);
-                    }
-                }
-            }
             .input-container {
                 padding: 0;
                 > .form-control {
@@ -54,6 +46,19 @@
             }
         }
     }
+    .navigation{
+        padding-bottom: 16px;
+    }
+    .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

@@ -1,5 +1,15 @@
-<div class="main-page">
+<div class="main-page breadcrumb-main-content">
-    <div class="page-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="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

@@ -2,23 +2,15 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 15px 10px;
+    padding: 16px 20px 20px;
-    background-color: #fff;
+    background-color: #f0f0f0;
     .page-content {
         border: 1px solid #ccc;
-        padding: 10px 20px;
+        // padding: 10px 20px;
+        // overflow-y: scroll;
+        // height: 100%;
         .search-filter {
             padding: 0 15px;
-            .first-condition {
-                .line-operator-right {
-                    text-align: right;
-                    padding: 0;
-                    .btn-info {
-                        background-color: rgb(122, 156, 204);
-                        border-color: rgb(122, 156, 204);
-                    }
-                }
-            }
             .input-container {
                 padding: 0;
                 > .form-control {
@@ -54,6 +46,19 @@
             }
         }
     }
+    .navigation{
+        padding-bottom: 16px;
+    }
+    .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) {
@@ -67,19 +72,3 @@
 //         text-align: left;
 //     }
 // }
-
-.divFieldseTitle{
-    position: relative;
-    display: inline;
-    left: 10px;
-    top: 11px;
-    white-space: nowrap;
-    text-align: center;
-    background-color: #fff;
-    font-weight: bold;
-}
-.checkInfo{
-    position: relative;
-    top: 5px;
-    left: 15px;
-}

src/app/pages/basic-data/gate/gate.component.html

@@ -1,5 +1,15 @@
-<div class="main-page">
+<div class="main-page breadcrumb-main-content">
-    <div class="page-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="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

@@ -2,23 +2,15 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 15px 10px;
+    padding: 16px 20px 20px;
-    background-color: #fff;
+    background-color: #f0f0f0;
     .page-content {
         border: 1px solid #ccc;
-        padding: 10px 20px;
+        // padding: 10px 20px;
+        // overflow-y: scroll;
+        // height: 100%;
         .search-filter {
             padding: 0 15px;
-            .first-condition {
-                .line-operator-right {
-                    text-align: right;
-                    padding: 0;
-                    .btn-info {
-                        background-color: rgb(122, 156, 204);
-                        border-color: rgb(122, 156, 204);
-                    }
-                }
-            }
             .input-container {
                 padding: 0;
                 > .form-control {
@@ -54,6 +46,19 @@
             }
         }
     }
+    .navigation{
+        padding-bottom: 16px;
+    }
+    .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

@@ -1,5 +1,15 @@
-<div class="main-page">
+<div class="main-page breadcrumb-main-content">
-  <div class="page-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="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/stand/stand.component.scss

@@ -2,23 +2,15 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 15px 10px;
+    padding: 16px 20px 20px;
-    background-color: #fff;
+    background-color: #f0f0f0;
     .page-content {
         border: 1px solid #ccc;
-        padding: 10px 20px;
+        // padding: 10px 20px;
+        // overflow-y: scroll;
+        // height: 100%;
         .search-filter {
             padding: 0 15px;
-            .first-condition {
-                .line-operator-right {
-                    text-align: right;
-                    padding: 0;
-                    .btn-info {
-                        background-color: rgb(122, 156, 204);
-                        border-color: rgb(122, 156, 204);
-                    }
-                }
-            }
             .input-container {
                 padding: 0;
                 > .form-control {
@@ -54,6 +46,19 @@
             }
         }
     }
+    .navigation{
+        padding-bottom: 16px;
+    }
+    .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-area/terminal-area.component.html

@@ -1,5 +1,15 @@
-<div class="main-page">
+<div class="main-page breadcrumb-main-content">
-    <div class="page-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="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

@@ -2,23 +2,15 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 15px 10px;
+    padding: 16px 20px 20px;
-    background-color: #fff;
+    background-color: #f0f0f0;
     .page-content {
         border: 1px solid #ccc;
-        padding: 10px 20px;
+        // padding: 10px 20px;
+        // overflow-y: scroll;
+        // height: 100%;
         .search-filter {
             padding: 0 15px;
-            .first-condition {
-                .line-operator-right {
-                    text-align: right;
-                    padding: 0;
-                    .btn-info {
-                        background-color: rgb(122, 156, 204);
-                        border-color: rgb(122, 156, 204);
-                    }
-                }
-            }
             .input-container {
                 padding: 0;
                 > .form-control {
@@ -54,6 +46,19 @@
             }
         }
     }
+    .navigation{
+        padding-bottom: 16px;
+    }
+    .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

@@ -1,5 +1,15 @@
-<div class="main-page">
+<div class="main-page breadcrumb-main-content">
-  <div class="page-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="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

@@ -2,23 +2,15 @@
     width: 100%;
     height: 100%;
     overflow-y: scroll;
-    padding: 15px 10px;
+    padding: 16px 20px 20px;
-    background-color: #fff;
+    background-color: #f0f0f0;
     .page-content {
         border: 1px solid #ccc;
-        padding: 10px 20px;
+        // padding: 10px 20px;
+        // overflow-y: scroll;
+        // height: 100%;
         .search-filter {
             padding: 0 15px;
-            .first-condition {
-                .line-operator-right {
-                    text-align: right;
-                    padding: 0;
-                    .btn-info {
-                        background-color: rgb(122, 156, 204);
-                        border-color: rgb(122, 156, 204);
-                    }
-                }
-            }
             .input-container {
                 padding: 0;
                 > .form-control {
@@ -54,6 +46,19 @@
             }
         }
     }
+    .navigation{
+        padding-bottom: 16px;
+    }
+    .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/detail-tab/detail-tab.component.html

@@ -6,8 +6,8 @@
         <p><label>国际代码：</label>{{flight.internationalCode}}</p>
         <p><label>航空公司：</label>{{flight.airlineChnName}}</p>
         <p><label>航线类别：</label>{{flight.routeType}}</p>
-        <p><label>航班类别：</label>{{flight.flightTypeCode}}</p>
+        <p><label>航班类别：</label>{{flight.flightTypeNameCn}}</p>
-        <p><label>航班任务：</label>{{flight.flightTask}}</p>
+        <!-- <p><label>航班任务：</label>{{flight.flightTask}}</p> -->
         <p><label>运营日：</label>{{flight.operationDays}}</p>
         <p><label>开始日期：</label>{{flight.startDate}}</p>
         <p><label>结束日期：</label>{{flight.endDate}}</p>

src/app/pages/seasonal-plan/seasonal-plan.component.html

@@ -50,13 +50,13 @@
               <label for="flightTypeCode">航班类别：&nbsp;&nbsp;</label>
               <select  class="form-control" [(ngModel)]="filterItems.flightTypeCode" (ngModelChange)="selectChange()" >
                   <option value=""></option>
-                  <option value="P">客机</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 value="X">其他</option> -->
-                  <!-- <option *ngFor="let item of seasonals" [value]="item.flightTypeCode">{{item.flightTypeCode}}</option> -->
+                  <option *ngFor="let item of flightTypes" [value]="item.flightTypeCode">{{item.flightTypeNameCn}}</option>
               </select>
           </div>
           <div class="input-container mr-4">
@@ -68,7 +68,7 @@
                   <!-- <option *ngFor="let item of seasonals" [value]="item.arriOrDept">{{item.arriOrDept}}</option> -->
               </select>
           </div>
-          <div class="input-container mr-4">
+         <!--  <div class="input-container mr-4">
               <label for="flightTask">航班任务：&nbsp;&nbsp;</label>
               <select  class="form-control" [(ngModel)]="filterItems.flightTask" (ngModelChange)="selectChange()">
                   <option value=""></option>
@@ -82,9 +82,9 @@
                   <option value="Q">补班</option>
                   <option value="X">其他</option>
                   <option value="A">计划外</option>
-                  <!-- <option *ngFor="let item of seasonals" [value]="item.flightTask">{{item.flightTask}}</option> -->
+                  <option *ngFor="let item of seasonals" [value]="item.flightTask">{{item.flightTask}}</option>
               </select>
-          </div>
+          </div> -->
         </div>
         <div class="third-condition row">
           <label class="radio-inline custom-checkbox nowrap mr-4">
@@ -110,7 +110,7 @@
                           <th>航空公司</th>
                           <th>航线类别</th>
                           <th>航班类别</th>
-                          <th>航班任务</th>
+                          <!-- <th>航班任务</th> -->
                           <th>运营日</th>
                           <th>开始日期</th>
                           <th>结束日期</th>
@@ -133,8 +133,8 @@
                           <td>{{seasonal.internationalCode}}</td>
                           <td>{{seasonal.airlineChnName}}</td>
                           <td>{{seasonal.routeType}}</td>
-                          <td>{{seasonal.flightTypeCode}}</td>
+                          <td>{{seasonal.flightTypeNameCn}}</td>
-                          <td>{{seasonal.flightTask}}</td>
+                          <!-- <td>{{seasonal.flightTask}}</td> -->
                           <td>{{seasonal.operationDays}}</td>
                           <td>{{seasonal.startDate}}</td>
                           <td>{{seasonal.endDate}}</td>

src/app/pages/seasonal-plan/seasonal-plan.component.ts

@@ -2,6 +2,8 @@ import { Component, OnInit } 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';
 @Component({
   selector: 'app-seasonal-plan',
@@ -13,6 +15,7 @@ export class SeasonalPlanComponent implements OnInit {
     constructor(
         private httpCilent: HttpClientService,
         private basicDataService: BasicDataService,
+        private toastService: ToastService,
         private changeDetectorRef: ChangeDetectorRef
     ) { }
 
@@ -29,8 +32,8 @@ export class SeasonalPlanComponent implements OnInit {
         { col_code: 'internationalCode', col_chn: '国际代码' },
         { col_code: 'airlineChnName', col_chn: '航空公司' },
         { col_code: 'routeType', col_chn: '航线类别' },
-        { col_code: 'flightTypeCode', col_chn: '航班类别' },
+        { col_code: 'flightTypeNameCn', col_chn: '航班类别' },
-        { col_code: 'flightTask', col_chn: '航班任务' },
+        /* { col_code: 'flightTask', col_chn: '航班任务' }, */
         { col_code: 'operationDays', col_chn: '运营日' },
         { col_code: 'startDate', col_chn: '开始日期' },
         { col_code: 'endDate', col_chn: '结束日期' },
@@ -53,13 +56,14 @@ export class SeasonalPlanComponent implements OnInit {
         routeType: '',  //航线类别
         flightTypeCode: '',  //航班类别
         arriOrDept: '', //到达/出发
-        flightTask: '',    //航班任务
+        /* flightTask: '',    //航班任务 */
     }
     public tabClose: boolean = true;
 
     seasonals : Array<any>; 
     airlines : Array<any>; //航空公司
     aircraftTypes : Array<any>; //机型
+    flightTypes : Array<any>; //航班类别
     public row_state: any = { renderFlight: {} };
     public render_data: Array<object> = [];  //显示数据，即需要显示的数据
     public return_data: Array<object> = []; //下拉框显示数据
@@ -75,6 +79,9 @@ export class SeasonalPlanComponent implements OnInit {
                 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'] = '国内'
@@ -103,74 +110,6 @@ export class SeasonalPlanComponent implements OnInit {
                         return item['arriOrDept']
                     }
                 });
-                this.render_data.forEach(item => {//航班类别列表显示数据转换
-                    if(item['flightTypeCode'] == 'P'){
-                        item['flightTypeCode'] = '客机'
-                        return item['flightTypeCode']
-                    }
-                    if(item['flightTypeCode'] == 'F'){
-                        item['flightTypeCode'] = '货机'
-                        return item['flightTypeCode']
-                    }
-                    if(item['flightTypeCode'] == 'B'){
-                        item['flightTypeCode'] = '专机'
-                        return item['flightTypeCode']
-                    }
-                    if(item['flightTypeCode'] == 'O'){
-                        item['flightTypeCode'] = '公务机'
-                        return item['flightTypeCode']
-                    }
-                    if(item['flightTypeCode'] == 'M'){
-                        item['flightTypeCode'] = '军机'
-                        return item['flightTypeCode']
-                    }
-                    if(item['flightTypeCode'] == 'X'){
-                        item['flightTypeCode'] = '其他'
-                        return item['flightTypeCode']
-                    }
-                });
-                this.render_data.forEach(item => {//航班任务列表显示数据转换
-                    if(item['flightTask'] == 'S'){
-                        item['flightTask'] = '正班'
-                        return item['flightTask']
-                    }
-                    if(item['flightTask'] == 'N'){
-                        item['flightTask'] = '包机'
-                        return item['flightTask']
-                    }
-                    if(item['flightTask'] == 'E'){
-                        item['flightTask'] = '急救'
-                        return item['flightTask']
-                    }
-                    if(item['flightTask'] == 'B'){
-                        item['flightTask'] = '专机'
-                        return item['flightTask']
-                    }
-                    if(item['flightTask'] == 'G'){
-                        item['flightTask'] = '通用'
-                        return item['flightTask']
-                    }
-                    if(item['flightTask'] == 'J'){
-                        item['flightTask'] = '加班'
-                        return item['flightTask']
-                    }
-                    if(item['flightTask'] == 'M'){
-                        item['flightTask'] = '军用'
-                        return item['flightTask']
-                    }
-                    if(item['flightTask'] == 'Q'){
-                        item['flightTask'] = '补班'
-                        return item['flightTask']
-                    }
-                    if(item['flightTask'] == 'X'){
-                        item['flightTask'] = '其他'
-                        return item['flightTask']
-                    }
-                    if(item['flightTask'] == 'A'){
-                        item['flightTask'] = '计划外'
-                        return item['flightTask']
-                    }
-                });
             }
         )
         //航空公司
@@ -187,6 +126,13 @@ export class SeasonalPlanComponent implements OnInit {
                 this.aircraftTypes = data;
             }
         )
+        //航班类别
+        this.flightTypes = this.basicDataService.flightTypes;
+        this.basicDataService.flightTypes_subject.subscribe(
+            data=> {
+                this.flightTypes = data;
+            }
+        )
         /**
          * 固定表头
          */
@@ -217,6 +163,16 @@ export class SeasonalPlanComponent implements OnInit {
         })
     }
 
+    //航班类别数据转换处理
+    flightTypesHandle() {
+        this.render_data.forEach(item => {
+            let flightTypesLinkIndex = this.flightTypes.findIndex(val => val.flightTypeCode === item['flightTypeCode']);
+            if(this.flightTypes[flightTypesLinkIndex]){
+                item['flightTypeNameCn'] = this.flightTypes[flightTypesLinkIndex].flightTypeNameCn;
+            }
+        })
+    }
+
     /**
      * 复选框勾选事件
      */
@@ -245,7 +201,8 @@ export class SeasonalPlanComponent implements OnInit {
      * 刷新
      */
     refresh() {
-        this.render_data.reverse();
+        const toastCfg = new ToastConfig(ToastType.SUCCESS, '', '刷新成功！', 3000);
+        this.toastService.toast(toastCfg);
     }
 
     /**
@@ -288,56 +245,6 @@ export class SeasonalPlanComponent implements OnInit {
             if(item['arriOrDept'] == '出发'){
                 item['arriOrDept'] = 'D'
             }
-            //航班类别
-            if(item['flightTypeCode'] == '客机'){
-                item['flightTypeCode'] = 'P'
-            }
-            if(item['flightTypeCode'] == '货机'){
-                item['flightTypeCode'] = 'F'
-            }
-            if(item['flightTypeCode'] == '专机'){
-                item['flightTypeCode'] = 'B'
-            }
-            if(item['flightTypeCode'] == '公务机'){
-                item['flightTypeCode'] = 'O'
-            }
-            if(item['flightTypeCode'] == '军机'){
-                item['flightTypeCode'] = 'M'
-            }
-            if(item['flightTypeCode'] == '其他'){
-                item['flightTypeCode'] = 'X'
-            }
-            //航班任务
-            if(item['flightTask'] == '正班'){
-                item['flightTask'] = 'S'
-            }
-            if(item['flightTask'] == '包机'){
-                item['flightTask'] = 'N'
-            }
-            if(item['flightTask'] == '急救'){
-                item['flightTask'] = 'E'
-            }
-            if(item['flightTask'] == '专机'){
-                item['flightTask'] = 'B'
-            }
-            if(item['flightTask'] == '通用'){
-                item['flightTask'] = 'G'
-            }
-            if(item['flightTask'] == '加班'){
-                item['flightTask'] = 'J'
-            }
-            if(item['flightTask'] == '军用'){
-                item['flightTask'] = 'M'
-            }
-            if(item['flightTask'] == '补班'){
-                item['flightTask'] = 'Q'
-            }
-            if(item['flightTask'] == '其他'){
-                item['flightTask'] = 'X'
-            }
-            if(item['flightTask'] == '计划外'){
-                item['flightTask'] = 'A'
-            }
             for (const key in this.filterItems) {
                 if (this.filterItems.hasOwnProperty(key) && this.filterItems[key]) {
                     if (item[key] == this.filterItems[key]) {
@@ -380,74 +287,6 @@ export class SeasonalPlanComponent implements OnInit {
                 return item['arriOrDept']
             }
         });
-        this.return_data.forEach(item => {//航班类别列表显示数据转换
-            if(item['flightTypeCode'] == 'P'){
-                item['flightTypeCode'] = '客机'
-                return item['flightTypeCode']
-            }
-            if(item['flightTypeCode'] == 'F'){
-                item['flightTypeCode'] = '货机'
-                return item['flightTypeCode']
-            }
-            if(item['flightTypeCode'] == 'B'){
-                item['flightTypeCode'] = '专机'
-                return item['flightTypeCode']
-            }
-            if(item['flightTypeCode'] == 'O'){
-                item['flightTypeCode'] = '公务机'
-                return item['flightTypeCode']
-            }
-            if(item['flightTypeCode'] == 'M'){
-                item['flightTypeCode'] = '军机'
-                return item['flightTypeCode']
-            }
-            if(item['flightTypeCode'] == 'X'){
-                item['flightTypeCode'] = '其他'
-                return item['flightTypeCode']
-            }
-        });
-        this.return_data.forEach(item => {//航班任务列表显示数据转换
-            if(item['flightTask'] == 'S'){
-                item['flightTask'] = '正班'
-                return item['flightTask']
-            }
-            if(item['flightTask'] == 'N'){
-                item['flightTask'] = '包机'
-                return item['flightTask']
-            }
-            if(item['flightTask'] == 'E'){
-                item['flightTask'] = '急救'
-                return item['flightTask']
-            }
-            if(item['flightTask'] == 'B'){
-                item['flightTask'] = '专机'
-                return item['flightTask']
-            }
-            if(item['flightTask'] == 'G'){
-                item['flightTask'] = '通用'
-                return item['flightTask']
-            }
-            if(item['flightTask'] == 'J'){
-                item['flightTask'] = '加班'
-                return item['flightTask']
-            }
-            if(item['flightTask'] == 'M'){
-                item['flightTask'] = '军用'
-                return item['flightTask']
-            }
-            if(item['flightTask'] == 'Q'){
-                item['flightTask'] = '补班'
-                return item['flightTask']
-            }
-            if(item['flightTask'] == 'X'){
-                item['flightTask'] = '其他'
-                return item['flightTask']
-            }
-            if(item['flightTask'] == 'A'){
-                item['flightTask'] = '计划外'
-                return item['flightTask']
-            }
-        });
         this.render_data = this.return_data;
         if (this.FLT_POS === 1) {
             this.inputFilter(this.render_data);