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 7eb92ed..056bb52 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,5 +1,15 @@ -
-
+
+ +
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 c2bfe0c..4149c66 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,23 +2,15 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 15px 10px; - background-color: #fff; + padding: 16px 20px 20px; + 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) { diff --git a/src/app/pages/basic-data/aircraft/aircraft.component.html b/src/app/pages/basic-data/aircraft/aircraft.component.html index 8177055..8cb5f27 100644 --- a/src/app/pages/basic-data/aircraft/aircraft.component.html +++ b/src/app/pages/basic-data/aircraft/aircraft.component.html @@ -1,5 +1,15 @@ -
-
+
+ +
diff --git a/src/app/pages/basic-data/aircraft/aircraft.component.scss b/src/app/pages/basic-data/aircraft/aircraft.component.scss index c2bfe0c..4149c66 100644 --- a/src/app/pages/basic-data/aircraft/aircraft.component.scss +++ b/src/app/pages/basic-data/aircraft/aircraft.component.scss @@ -2,23 +2,15 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 15px 10px; - background-color: #fff; + padding: 16px 20px 20px; + 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) { diff --git a/src/app/pages/basic-data/airline/airline.component.html b/src/app/pages/basic-data/airline/airline.component.html index 4bc8963..ca7f2d7 100644 --- a/src/app/pages/basic-data/airline/airline.component.html +++ b/src/app/pages/basic-data/airline/airline.component.html @@ -1,5 +1,15 @@ -
-
+
+ +
diff --git a/src/app/pages/basic-data/airline/airline.component.scss b/src/app/pages/basic-data/airline/airline.component.scss index c2bfe0c..4149c66 100644 --- a/src/app/pages/basic-data/airline/airline.component.scss +++ b/src/app/pages/basic-data/airline/airline.component.scss @@ -2,23 +2,15 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 15px 10px; - background-color: #fff; + padding: 16px 20px 20px; + 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) { diff --git a/src/app/pages/basic-data/airport/airport.component.html b/src/app/pages/basic-data/airport/airport.component.html index d69f1b4..364bbc4 100644 --- a/src/app/pages/basic-data/airport/airport.component.html +++ b/src/app/pages/basic-data/airport/airport.component.html @@ -1,5 +1,15 @@ -
-
+
+ +
diff --git a/src/app/pages/basic-data/airport/airport.component.scss b/src/app/pages/basic-data/airport/airport.component.scss index c2bfe0c..4149c66 100644 --- a/src/app/pages/basic-data/airport/airport.component.scss +++ b/src/app/pages/basic-data/airport/airport.component.scss @@ -2,23 +2,15 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 15px 10px; - background-color: #fff; + padding: 16px 20px 20px; + 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) { diff --git a/src/app/pages/basic-data/basic-data.module.ts b/src/app/pages/basic-data/basic-data.module.ts index f338507..e5e4f82 100644 --- a/src/app/pages/basic-data/basic-data.module.ts +++ b/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 { } diff --git a/src/app/pages/basic-data/carousel/carousel.component.html b/src/app/pages/basic-data/carousel/carousel.component.html index 758ccfc..289ce0e 100644 --- a/src/app/pages/basic-data/carousel/carousel.component.html +++ b/src/app/pages/basic-data/carousel/carousel.component.html @@ -1,5 +1,15 @@ -
-
+
+ +
diff --git a/src/app/pages/basic-data/carousel/carousel.component.scss b/src/app/pages/basic-data/carousel/carousel.component.scss index c2bfe0c..4149c66 100644 --- a/src/app/pages/basic-data/carousel/carousel.component.scss +++ b/src/app/pages/basic-data/carousel/carousel.component.scss @@ -2,23 +2,15 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 15px 10px; - background-color: #fff; + padding: 16px 20px 20px; + 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) { 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 c08f2c9..683d45f 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,5 +1,15 @@ -
-
+
+ +
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 c2bfe0c..4149c66 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,23 +2,15 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 15px 10px; - background-color: #fff; + padding: 16px 20px 20px; + 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) { 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 3361d2e..5160ba0 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,5 +1,15 @@ -
-
+
+ +
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 2804efa..4149c66 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,11 +2,13 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 15px 10px; - background-color: #fff; + padding: 16px 20px 20px; + 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) { diff --git a/src/app/pages/basic-data/chut/chut.component.html b/src/app/pages/basic-data/chut/chut.component.html index 173f29e..ec80b46 100644 --- a/src/app/pages/basic-data/chut/chut.component.html +++ b/src/app/pages/basic-data/chut/chut.component.html @@ -1,5 +1,15 @@ -
-
+
+ +
diff --git a/src/app/pages/basic-data/chut/chut.component.scss b/src/app/pages/basic-data/chut/chut.component.scss index c2bfe0c..4149c66 100644 --- a/src/app/pages/basic-data/chut/chut.component.scss +++ b/src/app/pages/basic-data/chut/chut.component.scss @@ -2,23 +2,15 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 15px 10px; - background-color: #fff; + padding: 16px 20px 20px; + 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) { diff --git a/src/app/pages/basic-data/city/city.component.html b/src/app/pages/basic-data/city/city.component.html index d8558e6..145deb4 100644 --- a/src/app/pages/basic-data/city/city.component.html +++ b/src/app/pages/basic-data/city/city.component.html @@ -1,5 +1,15 @@ -
-
+
+ +
diff --git a/src/app/pages/basic-data/city/city.component.scss b/src/app/pages/basic-data/city/city.component.scss index 9fd1dce..4149c66 100644 --- a/src/app/pages/basic-data/city/city.component.scss +++ b/src/app/pages/basic-data/city/city.component.scss @@ -2,23 +2,15 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 15px 10px; - background-color: #fff; + padding: 16px 20px 20px; + 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; -} \ No newline at end of file diff --git a/src/app/pages/basic-data/gate/gate.component.html b/src/app/pages/basic-data/gate/gate.component.html index 509a73d..8d8d146 100644 --- a/src/app/pages/basic-data/gate/gate.component.html +++ b/src/app/pages/basic-data/gate/gate.component.html @@ -1,5 +1,15 @@ -
-
+
+ +
diff --git a/src/app/pages/basic-data/gate/gate.component.scss b/src/app/pages/basic-data/gate/gate.component.scss index c2bfe0c..4149c66 100644 --- a/src/app/pages/basic-data/gate/gate.component.scss +++ b/src/app/pages/basic-data/gate/gate.component.scss @@ -2,23 +2,15 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 15px 10px; - background-color: #fff; + padding: 16px 20px 20px; + 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) { diff --git a/src/app/pages/basic-data/stand/stand.component.html b/src/app/pages/basic-data/stand/stand.component.html index e89561e..fb4e0db 100644 --- a/src/app/pages/basic-data/stand/stand.component.html +++ b/src/app/pages/basic-data/stand/stand.component.html @@ -1,5 +1,15 @@ -
-
+
+ +
diff --git a/src/app/pages/basic-data/stand/stand.component.scss b/src/app/pages/basic-data/stand/stand.component.scss index c2bfe0c..4149c66 100644 --- a/src/app/pages/basic-data/stand/stand.component.scss +++ b/src/app/pages/basic-data/stand/stand.component.scss @@ -2,23 +2,15 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 15px 10px; - background-color: #fff; + padding: 16px 20px 20px; + 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) { 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 0bda148..279e638 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,5 +1,15 @@ -
-
+
+ +
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 c2bfe0c..4149c66 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,23 +2,15 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 15px 10px; - background-color: #fff; + padding: 16px 20px 20px; + 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) { diff --git a/src/app/pages/basic-data/terminal/terminal.component.html b/src/app/pages/basic-data/terminal/terminal.component.html index ea59d66..17d4403 100644 --- a/src/app/pages/basic-data/terminal/terminal.component.html +++ b/src/app/pages/basic-data/terminal/terminal.component.html @@ -1,5 +1,15 @@ -
-
+
+ +
diff --git a/src/app/pages/basic-data/terminal/terminal.component.scss b/src/app/pages/basic-data/terminal/terminal.component.scss index c2bfe0c..4149c66 100644 --- a/src/app/pages/basic-data/terminal/terminal.component.scss +++ b/src/app/pages/basic-data/terminal/terminal.component.scss @@ -2,23 +2,15 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 15px 10px; - background-color: #fff; + padding: 16px 20px 20px; + 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) { diff --git a/src/app/pages/seasonal-plan/detail-tab/detail-tab.component.html b/src/app/pages/seasonal-plan/detail-tab/detail-tab.component.html index b33a141..98c36cd 100644 --- a/src/app/pages/seasonal-plan/detail-tab/detail-tab.component.html +++ b/src/app/pages/seasonal-plan/detail-tab/detail-tab.component.html @@ -6,8 +6,8 @@

{{flight.internationalCode}}

{{flight.airlineChnName}}

{{flight.routeType}}

-

{{flight.flightTypeCode}}

-

{{flight.flightTask}}

+

{{flight.flightTypeNameCn}}

+

{{flight.operationDays}}

{{flight.startDate}}

{{flight.endDate}}

diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.html b/src/app/pages/seasonal-plan/seasonal-plan.component.html index 23e6cc4..53bc224 100644 --- a/src/app/pages/seasonal-plan/seasonal-plan.component.html +++ b/src/app/pages/seasonal-plan/seasonal-plan.component.html @@ -50,13 +50,13 @@
@@ -68,7 +68,7 @@
-
+ + -
+
-->