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 4149c66..86a6e49 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,7 +2,7 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 16px 20px 20px; + padding: 10px 20px 20px; background-color: #f0f0f0; .page-content { border: 1px solid #ccc; @@ -47,7 +47,7 @@ } } .navigation{ - padding-bottom: 16px; + padding-bottom: 10px; } .breadcrumb-main-container { padding: 20px 20px; diff --git a/src/app/pages/basic-data/aircraft/aircraft.component.scss b/src/app/pages/basic-data/aircraft/aircraft.component.scss index 4149c66..86a6e49 100644 --- a/src/app/pages/basic-data/aircraft/aircraft.component.scss +++ b/src/app/pages/basic-data/aircraft/aircraft.component.scss @@ -2,7 +2,7 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 16px 20px 20px; + padding: 10px 20px 20px; background-color: #f0f0f0; .page-content { border: 1px solid #ccc; @@ -47,7 +47,7 @@ } } .navigation{ - padding-bottom: 16px; + padding-bottom: 10px; } .breadcrumb-main-container { padding: 20px 20px; diff --git a/src/app/pages/basic-data/airline/airline.component.scss b/src/app/pages/basic-data/airline/airline.component.scss index 4149c66..86a6e49 100644 --- a/src/app/pages/basic-data/airline/airline.component.scss +++ b/src/app/pages/basic-data/airline/airline.component.scss @@ -2,7 +2,7 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 16px 20px 20px; + padding: 10px 20px 20px; background-color: #f0f0f0; .page-content { border: 1px solid #ccc; @@ -47,7 +47,7 @@ } } .navigation{ - padding-bottom: 16px; + padding-bottom: 10px; } .breadcrumb-main-container { padding: 20px 20px; diff --git a/src/app/pages/basic-data/airport/airport.component.scss b/src/app/pages/basic-data/airport/airport.component.scss index 4149c66..86a6e49 100644 --- a/src/app/pages/basic-data/airport/airport.component.scss +++ b/src/app/pages/basic-data/airport/airport.component.scss @@ -2,7 +2,7 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 16px 20px 20px; + padding: 10px 20px 20px; background-color: #f0f0f0; .page-content { border: 1px solid #ccc; @@ -47,7 +47,7 @@ } } .navigation{ - padding-bottom: 16px; + padding-bottom: 10px; } .breadcrumb-main-container { padding: 20px 20px; diff --git a/src/app/pages/basic-data/carousel/carousel.component.scss b/src/app/pages/basic-data/carousel/carousel.component.scss index 4149c66..86a6e49 100644 --- a/src/app/pages/basic-data/carousel/carousel.component.scss +++ b/src/app/pages/basic-data/carousel/carousel.component.scss @@ -2,7 +2,7 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 16px 20px 20px; + padding: 10px 20px 20px; background-color: #f0f0f0; .page-content { border: 1px solid #ccc; @@ -47,7 +47,7 @@ } } .navigation{ - padding-bottom: 16px; + padding-bottom: 10px; } .breadcrumb-main-container { padding: 20px 20px; 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 4149c66..86a6e49 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,7 +2,7 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 16px 20px 20px; + padding: 10px 20px 20px; background-color: #f0f0f0; .page-content { border: 1px solid #ccc; @@ -47,7 +47,7 @@ } } .navigation{ - padding-bottom: 16px; + padding-bottom: 10px; } .breadcrumb-main-container { padding: 20px 20px; 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 4149c66..86a6e49 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,7 +2,7 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 16px 20px 20px; + padding: 10px 20px 20px; background-color: #f0f0f0; .page-content { border: 1px solid #ccc; @@ -47,7 +47,7 @@ } } .navigation{ - padding-bottom: 16px; + padding-bottom: 10px; } .breadcrumb-main-container { padding: 20px 20px; diff --git a/src/app/pages/basic-data/chut/chut.component.scss b/src/app/pages/basic-data/chut/chut.component.scss index 4149c66..86a6e49 100644 --- a/src/app/pages/basic-data/chut/chut.component.scss +++ b/src/app/pages/basic-data/chut/chut.component.scss @@ -2,7 +2,7 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 16px 20px 20px; + padding: 10px 20px 20px; background-color: #f0f0f0; .page-content { border: 1px solid #ccc; @@ -47,7 +47,7 @@ } } .navigation{ - padding-bottom: 16px; + padding-bottom: 10px; } .breadcrumb-main-container { padding: 20px 20px; diff --git a/src/app/pages/basic-data/city/city.component.scss b/src/app/pages/basic-data/city/city.component.scss index 4149c66..86a6e49 100644 --- a/src/app/pages/basic-data/city/city.component.scss +++ b/src/app/pages/basic-data/city/city.component.scss @@ -2,7 +2,7 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 16px 20px 20px; + padding: 10px 20px 20px; background-color: #f0f0f0; .page-content { border: 1px solid #ccc; @@ -47,7 +47,7 @@ } } .navigation{ - padding-bottom: 16px; + padding-bottom: 10px; } .breadcrumb-main-container { padding: 20px 20px; diff --git a/src/app/pages/basic-data/gate/gate.component.scss b/src/app/pages/basic-data/gate/gate.component.scss index 4149c66..86a6e49 100644 --- a/src/app/pages/basic-data/gate/gate.component.scss +++ b/src/app/pages/basic-data/gate/gate.component.scss @@ -2,7 +2,7 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 16px 20px 20px; + padding: 10px 20px 20px; background-color: #f0f0f0; .page-content { border: 1px solid #ccc; @@ -47,7 +47,7 @@ } } .navigation{ - padding-bottom: 16px; + padding-bottom: 10px; } .breadcrumb-main-container { padding: 20px 20px; diff --git a/src/app/pages/basic-data/stand/stand.component.scss b/src/app/pages/basic-data/stand/stand.component.scss index 4149c66..86a6e49 100644 --- a/src/app/pages/basic-data/stand/stand.component.scss +++ b/src/app/pages/basic-data/stand/stand.component.scss @@ -2,7 +2,7 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 16px 20px 20px; + padding: 10px 20px 20px; background-color: #f0f0f0; .page-content { border: 1px solid #ccc; @@ -47,7 +47,7 @@ } } .navigation{ - padding-bottom: 16px; + padding-bottom: 10px; } .breadcrumb-main-container { padding: 20px 20px; 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 4149c66..86a6e49 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,7 +2,7 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 16px 20px 20px; + padding: 10px 20px 20px; background-color: #f0f0f0; .page-content { border: 1px solid #ccc; @@ -47,7 +47,7 @@ } } .navigation{ - padding-bottom: 16px; + padding-bottom: 10px; } .breadcrumb-main-container { padding: 20px 20px; diff --git a/src/app/pages/basic-data/terminal/terminal.component.scss b/src/app/pages/basic-data/terminal/terminal.component.scss index 4149c66..86a6e49 100644 --- a/src/app/pages/basic-data/terminal/terminal.component.scss +++ b/src/app/pages/basic-data/terminal/terminal.component.scss @@ -2,7 +2,7 @@ width: 100%; height: 100%; overflow-y: scroll; - padding: 16px 20px 20px; + padding: 10px 20px 20px; background-color: #f0f0f0; .page-content { border: 1px solid #ccc; @@ -47,7 +47,7 @@ } } .navigation{ - padding-bottom: 16px; + padding-bottom: 10px; } .breadcrumb-main-container { padding: 20px 20px; diff --git a/src/app/pages/main.scss b/src/app/pages/main.scss index bb3ac34..33ef4a9 100644 --- a/src/app/pages/main.scss +++ b/src/app/pages/main.scss @@ -39,11 +39,11 @@ } } .card{ + height: 100%; background: #fff; padding: 20px; box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15); border-radius: 0; - margin-bottom: 20px; } .tree-box{ 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 98c36cd..4a6840f 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 @@ -15,6 +15,6 @@

{{flight.arriOrDept}}

{{flight.arrivalTime}}

{{flight.departureTime}}

-

{{flight.aircraftTypeCode}}

+

{{flight.aircraftTypeName}}

\ No newline at end of file diff --git a/src/app/pages/system-management/department-management/department-management.component.ts b/src/app/pages/system-management/department-management/department-management.component.ts index df4e4ca..b9bc93d 100644 --- a/src/app/pages/system-management/department-management/department-management.component.ts +++ b/src/app/pages/system-management/department-management/department-management.component.ts @@ -61,11 +61,11 @@ export class DepartmentManagementComponent implements OnInit { } ngOnInit() { - $('.tree-box').css('height',(document.documentElement.clientHeight-126+'px')); - $('.main-content').css('height',(document.documentElement.clientHeight-126+'px')); + $('.tree-box').css('height',(document.documentElement.clientHeight-106+'px')); + $('.main-content').css('height',(document.documentElement.clientHeight-106+'px')); $(window).resize(function(){ - $('.tree-box').css('height',(document.documentElement.clientHeight-126+'px')); - $('.main-content').css('height',(document.documentElement.clientHeight-126+'px')); + $('.tree-box').css('height',(document.documentElement.clientHeight-106+'px')); + $('.main-content').css('height',(document.documentElement.clientHeight-106+'px')); }) //表单实例化 this.validateForm = this.fb.group({ diff --git a/src/app/pages/system-management/operation-logs/operation-logs.component.html b/src/app/pages/system-management/operation-logs/operation-logs.component.html index 8dd0568..7f0ae1a 100644 --- a/src/app/pages/system-management/operation-logs/operation-logs.component.html +++ b/src/app/pages/system-management/operation-logs/operation-logs.component.html @@ -1,12 +1,7 @@
-
-
+
+