季度计划补充不完整字段及计划机位、飞机号变更显示修改

This commit is contained in:
zhouyuejun
2019-01-14 11:01:29 +08:00
parent 1852eb7b04
commit 91e24db0d6
10 changed files with 427 additions and 138 deletions
-14
View File
@@ -166,10 +166,6 @@
<div #tableContainer id="table-container" class="table-container" [ngClass]="{'table-c': !tabClose,'table-o': tabClose}">
<div class="table-head" #tableHead>
<table class="table">
<!-- <colgroup>
<col *ngFor="let common_col of commonCol" [width]="common_col.COL_WIDTH">
<col *ngFor="let airline_col of render_col_lists" [width]="airline_col.COL_WIDTH">
</colgroup> -->
<thead>
<tr>
<th *ngFor="let common_col of commonCol" [ngStyle]="{'min-width':common_col.COL_WIDTH}">{{common_col.COL_CN}}</th>
@@ -181,16 +177,6 @@
<div class="table-body" #tableBody (scroll)="handleScroll($event)">
<div class="list-view-phantom" [ngStyle]="{ 'height': wait_render_data.length * 42 + 'px' }"></div>
<table #tableContent id="table" class="table table-striped">
<!-- <thead>
<tr>
<th *ngFor="let common_col of commonCol" [width]="common_col.COL_WIDTH"></th>
<th *ngFor="let airline_col of render_col_lists" [width]="airline_col.COL_WIDTH"></th>
</tr>
</thead> -->
<!-- <colgroup>
<col *ngFor="let common_col of commonCol" [width]="common_col.COL_WIDTH">
<col *ngFor="let airline_col of render_col_lists" [width]="airline_col.COL_WIDTH">
</colgroup> -->
<tbody>
<tr *ngFor="let airline_row of render_data;let i = index" (click)="selectRow(airline_row)"
[ngClass]="{'selected':row_state['renderFlight']['FLNO']===airline_row['renderFlight']['FLNO']}">
+3 -2
View File
@@ -61,6 +61,7 @@
th {
background-color: #ddd;
color: rgb(0, 0, 255);
text-align: center;
}
}
&::-webkit-scrollbar {
@@ -98,8 +99,8 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
border: none;
// text-align: center;
border: 1px solid #dee2e6;
text-align: center;
}
}
&::-webkit-scrollbar {
+2 -2
View File
@@ -126,7 +126,6 @@ export class MainComponent implements OnInit {
ngOnInit() {
console.log(Object.prototype.toString.call({}));
this.renderer2.setStyle(this.tableContainer.nativeElement, 'height', this.pageContent.nativeElement.offsetHeight - this.searchFilter.nativeElement.offsetHeight - 35 + 'px');
this.renderer2.setStyle(this.tableBody.nativeElement, 'height', this.tableContainer.nativeElement.offsetHeight - this.tableHead.nativeElement.offsetHeight + 'px');
if (!this.tabClose) {
@@ -472,7 +471,7 @@ export class MainComponent implements OnInit {
/**
* 创建线程并执行
*/
public promise: Worker = new Worker('/adminweb/assets/web-worker-handle.js');
public promise: Worker = new Worker('/assets/web-worker-handle.js');
creatWorkers() {
let dynamicData = {
raw_data: this.raw_data,
@@ -485,6 +484,7 @@ export class MainComponent implements OnInit {
}
this.promise.postMessage(dynamicData);
this.promise.onmessage = function (e) {
console.log('=====')
this.combined_data = e.data;
this.selectChange('dynamic');
// this.promise.terminate();