From 6e35f9cb884ac645ac6ce8ea11edd015d614c15e Mon Sep 17 00:00:00 2001 From: zhouyuejun <505127606@qq.com> Date: Mon, 24 Dec 2018 16:33:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E9=AB=98=E5=BA=A6=E8=87=AA?= =?UTF-8?q?=E9=80=82=E5=BA=94=E7=AD=89=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../historical-data.component.html | 15 +++---- .../historical-data.component.scss | 22 ++++++++++ .../historical-data.component.ts | 21 +++++++++- src/app/pages/main/main.component.html | 39 +++++++++++------- src/app/pages/main/main.component.scss | 13 ++++++ src/app/pages/main/main.component.ts | 33 ++++++++------- src/app/pages/pages.component.html | 8 ++-- src/app/pages/pages.component.scss | 17 ++++++++ src/assets/images/loading.png | Bin 0 -> 8229 bytes 9 files changed, 127 insertions(+), 41 deletions(-) create mode 100644 src/assets/images/loading.png diff --git a/src/app/pages/historical-data/historical-data.component.html b/src/app/pages/historical-data/historical-data.component.html index de0c02f..e788d26 100644 --- a/src/app/pages/historical-data/historical-data.component.html +++ b/src/app/pages/historical-data/historical-data.component.html @@ -1,6 +1,6 @@ -
+
-
+
-
- +
+ +
-
+
航班关联信息 @@ -106,7 +107,7 @@
-
+
diff --git a/src/app/pages/historical-data/historical-data.component.scss b/src/app/pages/historical-data/historical-data.component.scss index dba3c39..ebc37b5 100644 --- a/src/app/pages/historical-data/historical-data.component.scss +++ b/src/app/pages/historical-data/historical-data.component.scss @@ -19,6 +19,9 @@ } } } + .second-condition,.third-condition{ + display: none; + } .input-container { padding: 0; > .form-control { @@ -26,6 +29,12 @@ display: inline-block; } } + .filterClose-c{ + display: none; + } + .filterClose-o{ + display: flex; + } } .airline-table{ .table-container{ @@ -50,6 +59,19 @@ text-align: center; } } + &::-webkit-scrollbar { + width: 15px; + height: 15px; + } + &::-webkit-scrollbar-thumb { + /*滚动条里面小方块*/ + background: rgba(165, 207, 222, 1); + border-radius: 10px; + } + &::-webkit-scrollbar-track { + background: rgba(0, 0, 0, 0.06); + border-radius: 10px; + } } } } diff --git a/src/app/pages/historical-data/historical-data.component.ts b/src/app/pages/historical-data/historical-data.component.ts index 0da4562..146537c 100644 --- a/src/app/pages/historical-data/historical-data.component.ts +++ b/src/app/pages/historical-data/historical-data.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit,ViewChild,Renderer2 } from '@angular/core'; import { ChangeDetectorRef } from '@angular/core'; import { ToastService } from '../../components/toast/toast.service'; @@ -22,6 +22,7 @@ declare var laydate: any; export class HistoricalDataComponent implements OnInit { constructor( + private renderer2: Renderer2, private basicDataService: BasicDataService, private operateSpinServiceService: OperateSpinServiceService, private httpCilent: HttpClientService, @@ -65,6 +66,10 @@ export class HistoricalDataComponent implements OnInit { 'guarantee': false } + @ViewChild('mainPage') mainPage; + @ViewChild('searchFilter') searchFilter; + @ViewChild('tableContainer') tableContainer; + ngOnInit() { laydate.render({ elem: '#selectDate', @@ -93,6 +98,11 @@ export class HistoricalDataComponent implements OnInit { } }); + 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/settings/uisettings').subscribe( @@ -106,7 +116,7 @@ export class HistoricalDataComponent implements OnInit { } ) //获取航班动态信息 - this.httpCilent.post('/adminapi/hitFlightData/list').subscribe( + this.httpCilent.post('/adminapi/hitFlightData/list',{ hstFLightTime: '2018-11-22' }).subscribe( data => { this.raw_data = data.body; @@ -204,6 +214,13 @@ export class HistoricalDataComponent implements OnInit { this.operateSpinServiceService.hideSpin() } + public filterClose: boolean = true; + toggleFilter() { + this.filterClose = !this.filterClose; + this.changeDetectorRef.detectChanges(); + this.renderer2.setStyle(this.tableContainer.nativeElement, 'height', this.mainPage.nativeElement.offsetHeight - this.searchFilter.nativeElement.offsetHeight - 55 + 'px'); + } + /** * 刷新 */ diff --git a/src/app/pages/main/main.component.html b/src/app/pages/main/main.component.html index 4b18be7..b5363e0 100644 --- a/src/app/pages/main/main.component.html +++ b/src/app/pages/main/main.component.html @@ -1,6 +1,6 @@ -
+
-
+
-
- +
+ +
-
+
航班关联信息 @@ -126,7 +127,7 @@
-
+
@@ -140,14 +141,22 @@ [ngClass]="{'selected':row_state['renderFlight']['FLNO']===airline_row['renderFlight']['FLNO']}"> diff --git a/src/app/pages/main/main.component.scss b/src/app/pages/main/main.component.scss index 3ea2897..5c34736 100644 --- a/src/app/pages/main/main.component.scss +++ b/src/app/pages/main/main.component.scss @@ -9,9 +9,13 @@ border: 1px solid #ccc; padding: 10px 20px; .search-filter { + position: relative; padding: 0 15px; .first-condition { .line-operator-right { + // position: absolute; + // top: 0; + // right: 0; text-align: right; padding: 0; .btn-info { @@ -20,6 +24,9 @@ } } } + .second-condition,.third-condition{ + display: none; + } .input-container { padding: 0; > .form-control { @@ -27,6 +34,12 @@ display: inline-block; } } + .filterClose-c{ + display: none; + } + .filterClose-o{ + display: flex; + } } .airline-table { .table-container { diff --git a/src/app/pages/main/main.component.ts b/src/app/pages/main/main.component.ts index 274211f..287c394 100644 --- a/src/app/pages/main/main.component.ts +++ b/src/app/pages/main/main.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, ViewChild, Renderer2 } from '@angular/core'; import { ChangeDetectorRef } from '@angular/core'; import { NavigationEnd, Router } from '@angular/router'; @@ -28,6 +28,7 @@ import * as $ from 'jquery'; export class MainComponent implements OnInit { constructor( private router: Router, + private renderer2: Renderer2, private basicDataService: BasicDataService, private operateSpinServiceService: OperateSpinServiceService, private httpCilent: HttpClientService, @@ -35,14 +36,12 @@ export class MainComponent implements OnInit { private toastService: ToastService, private websocketService: WebsocketService ) { - console.log(new Date().getTime()); this.operateSpinServiceService.showSpin(); this.changeDetectorRef.detach(); this.router.events.pipe( filter((event => event instanceof NavigationEnd)) ).subscribe( (event: NavigationEnd) => { - console.log(event); if (event.urlAfterRedirects === '/app/main') { this.httpCilent.get('/adminapi/settings/uisettings').subscribe( data => { @@ -107,31 +106,36 @@ export class MainComponent implements OnInit { 'guarantee': false } + @ViewChild('mainPage') mainPage; + @ViewChild('searchFilter') searchFilter; + @ViewChild('tableContainer') tableContainer; + + ngOnInit() { + 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.websocketService.dynamicsMessage().subscribe( event => { let data = JSON.parse(event as string); if (data.topic === 'schd') { - console.log(new Date().getTime()); let message = JSON.parse(data.message); - console.log(message); //是否可以开始处理动态消息 if (this.canHandleDynamicMessage) { this.dynamicMessageHandle(message); } else { this.dynamicMessageArray.push(message); } - } else if (data.topic === 'msg') { let message = JSON.parse(data.message); - console.log(message); if (this.canHandleDynamicAlert) { this.dynamicAlertHandle(message); } else { this.dynamicAlertArray.push(message); } - } } ) @@ -207,6 +211,13 @@ export class MainComponent implements OnInit { tableCont.addEventListener('scroll', scrollHandle) } + public filterClose: boolean = true; + toggleFilter() { + this.filterClose = !this.filterClose; + this.changeDetectorRef.detectChanges(); + this.renderer2.setStyle(this.tableContainer.nativeElement, 'height', this.mainPage.nativeElement.offsetHeight - this.searchFilter.nativeElement.offsetHeight - 55 + 'px'); + } + /** * 动态消息处理方法 @@ -262,8 +273,6 @@ export class MainComponent implements OnInit { return (a['ORDER'] - b['ORDER']); }) this.changeDetectorRef.detectChanges(); - console.log(new Date().getTime()); - } /** @@ -295,7 +304,6 @@ export class MainComponent implements OnInit { } dynamicAlertHandle(message) { let alertType = message.META.TYPE + '-' + message.META.STYP; - console.log(alertType) let index = this.airline_message_alert.findIndex(val => val['COL_CODE'] === alertType); if (index > -1) { let alertText = this.alertMessage[alertType](); @@ -330,7 +338,6 @@ export class MainComponent implements OnInit { this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} }; this.changeDetectorRef.detectChanges(); this.operateSpinServiceService.hideSpin(); - console.log(new Date().getTime()); //开始处理动态消息 this.canHandleDynamicMessage = true; @@ -379,7 +386,6 @@ export class MainComponent implements OnInit { * 输入框回车事件 */ inputEnter() { - console.log(new Date().getTime()); if (this.FLT_POS === 1) { this.selectChange() } else { @@ -567,7 +573,6 @@ export class MainComponent implements OnInit { this.row_state = this.render_data.length > 0 ? this.render_data[0] : { renderFlight: {} }; this.changeDetectorRef.detectChanges(); this.operateSpinServiceService.hideSpin(); - console.log(new Date().getTime()); } /** diff --git a/src/app/pages/pages.component.html b/src/app/pages/pages.component.html index 1913136..ed3295b 100644 --- a/src/app/pages/pages.component.html +++ b/src/app/pages/pages.component.html @@ -37,7 +37,7 @@ Something else here --> -
{{i+1}} - - - - - - - - + + + + + + + + {{airline_row['renderFlight'][airline_col.COL_CODE]}}