diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.html b/src/app/pages/seasonal-plan/seasonal-plan.component.html index 5a0ba8d..9a6efea 100644 --- a/src/app/pages/seasonal-plan/seasonal-plan.component.html +++ b/src/app/pages/seasonal-plan/seasonal-plan.component.html @@ -1,6 +1,6 @@ -
+
-
+
-
- +
+ +
-
+
-
+
-
+
diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.scss b/src/app/pages/seasonal-plan/seasonal-plan.component.scss index ae76ea7..8111a88 100644 --- a/src/app/pages/seasonal-plan/seasonal-plan.component.scss +++ b/src/app/pages/seasonal-plan/seasonal-plan.component.scss @@ -20,6 +20,9 @@ } } } + .second-condition,.third-condition{ + display: none; + } .input-container { padding: 0; > .form-control { @@ -27,6 +30,12 @@ display: inline-block; } } + .filterClose-c{ + display: none; + } + .filterClose-o{ + display: flex; + } } .airline-table{ .table-container{ @@ -48,10 +57,10 @@ background-color: #ddd; color: rgb(0, 0, 255); } - /* th,td{ + th,td{ // border: none; text-align: center; - } */ + } } &::-webkit-scrollbar { width: 15px; diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.ts b/src/app/pages/seasonal-plan/seasonal-plan.component.ts index 9451db8..1180096 100644 --- a/src/app/pages/seasonal-plan/seasonal-plan.component.ts +++ b/src/app/pages/seasonal-plan/seasonal-plan.component.ts @@ -1,4 +1,4 @@ -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'; @@ -15,6 +15,7 @@ declare var laydate: any; export class SeasonalPlanComponent implements OnInit { constructor( + private renderer2: Renderer2, private httpCilent: HttpClientService, private basicDataService: BasicDataService, private toastService: ToastService, @@ -69,9 +70,17 @@ export class SeasonalPlanComponent implements OnInit { public row_state: any = { renderFlight: {} }; public render_data: Array = []; //显示数据,即需要显示的数据 public return_data: Array = []; //下拉框显示数据 + + @ViewChild('mainPage') mainPage; + @ViewChild('searchFilter') searchFilter; + @ViewChild('tableContainer') tableContainer; ngOnInit() { //选择年份 this.laydateYear(); + this.renderer2.setStyle(this.tableContainer.nativeElement, 'height', this.mainPage.nativeElement.offsetHeight - this.searchFilter.nativeElement.offsetHeight - 55 + 'px'); + window.onresize = function () { + this.renderer2.setStyle(this.tableContainer.nativeElement, 'height', this.mainPage.nativeElement.offsetHeight - this.searchFilter.nativeElement.offsetHeight - 55 + 'px'); + }.bind(this) /* 获取季度计划信息 */ var value = new Date(new Date().getTime()); var subValue = format(value).substring(11,15); //时间截取到年份 @@ -258,6 +267,13 @@ export class SeasonalPlanComponent implements OnInit { }); } + public filterClose: boolean = true; + //点击展开切换操作 + toggleFilter() { + this.filterClose = !this.filterClose; + this.changeDetectorRef.detectChanges(); + } + /** * 复选框勾选事件 */