windy/airport-chengdu-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

季度计划和历史数据页面查询调整美观

Browse Source
This commit is contained in:
zhouyuejun
2019-02-21 14:58:07 +08:00
parent fef8e19595
commit b0f94ada23
6 changed files with 53 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/historical-data/historical-data.component.html
+10 -8
View File
@@ -1,8 +1,8 @@
<div class="main-page">
<div class="page-content" #pageContent>
<div class="search-filter mb-3" #searchFilter>
<div class="search-filter mb-2" #searchFilter>
<div class="first-condition row">
<div class="line-operator-left input-container mb-3 col-xlg-8 col-mlg-8 col-xl-8 col-lg-10">
<div class="line-operator-left input-container mb-2">
<select [(ngModel)]="SEL_COL" class="mr-4 form-control" (ngModelChange)="resetPositionArray()" name="" id="">
<option value="">选择列名</option>
<option *ngFor="let airline_col of render_col_lists" [value]="airline_col.COL_CODE">{{airline_col.COL_CN}}</option>
@@ -16,12 +16,14 @@
<span>查找定位</span>
</label>
<input class="form-control mr-4" [(ngModel)]="SEARCH" (ngModelChange)="resetPositionArray()" type="text" (keyup.enter)="inputEnter()">
<label for="">查询日期：&nbsp;&nbsp;</label>
<input readonly style="background:transparent;cursor: pointer" type="text" id="selectDate" class="form-control">
</div>
<div class="line-operator-right mb-3 col-xlg-4 col-mlg-4 col-xl-4 col-lg-2">
<button type="button" class="btn btn-info mr-2" (click)="toggleFilter()">{{filterClose?'展开':'关闭'}}</button>
<button type="button" class="btn btn-info mr-2" (click)="refresh()">刷新</button>
<div class="input-container mr-4" style="display:inline-block">
<label for="">查询日期：&nbsp;&nbsp;</label>
<input readonly style="background:transparent;cursor: pointer" type="text" id="selectDate" class="form-control">
</div>
<div class="line-operator-right">
<button type="button" class="btn btn-info mr-2" (click)="toggleFilter()">{{filterClose?'展开':'关闭'}}</button>
<button type="button" class="btn btn-info mr-2" (click)="refresh()">刷新</button>
</div>
</div>
</div>
src/app/pages/historical-data/historical-data.component.scss
+8 -6
View File
@@ -14,11 +14,13 @@
position: relative;
padding: 0 15px;
.first-condition {
.line-operator-left{
width: 100%;
}
.line-operator-right {
// position: absolute;
// top: 0;
// right: 0;
text-align: right;
// text-align: right;
display: inline-block;
float: right;
padding: 0;
.btn-info {
background-color: rgb(122, 156, 204);
@@ -182,9 +184,9 @@
}
}
@media screen and (max-width: 991px) {
@media screen and (max-width: 1276px) {
.line-operator-right {
text-align: left !important;
float: none !important;
}
}
src/app/pages/main/main.component.html
+7 -7
View File
@@ -1,8 +1,8 @@
<div class="main-page">
<div class="page-content" #pageContent>
<div class="search-filter mb-3" #searchFilter>
<div class="search-filter mb-2" #searchFilter>
<div class="first-condition row">
<div class="line-operator-left input-container mb-3 col-xlg-8 col-mlg-8 col-xl-8 col-lg-10">
<div class="line-operator-left input-container mb-2">
<select [(ngModel)]="SEL_COL" class="mr-4 form-control" (ngModelChange)="resetPositionArray()" name="" id="">
<option value="">选择列名</option>
<option *ngFor="let airline_col of render_col_lists" [value]="airline_col.COL_CODE">{{airline_col.COL_CN}}</option>
@@ -15,11 +15,11 @@
<input type="radio" [(ngModel)]="FLT_POS" [value]="2" name="filter-position">
<span>查找定位</span>
</label>
<input class="form-control" [(ngModel)]="SEARCH" (ngModelChange)="resetPositionArray()" type="text" (keyup.enter)="inputEnter()">
</div>
<div class="line-operator-right mb-3 col-xlg-4 col-mlg-4 col-xl-4 col-lg-2">
<button type="button" class="btn btn-info mr-2" (click)="toggleFilter()">{{filterClose?'展开':'关闭'}}</button>
<button type="button" class="btn btn-info mr-2" (click)="refresh()">刷新</button>
<input class="form-control mr-4" [(ngModel)]="SEARCH" (ngModelChange)="resetPositionArray()" type="text" (keyup.enter)="inputEnter()">
<div class="line-operator-right">
<button type="button" class="btn btn-info mr-2" (click)="toggleFilter()">{{filterClose?'展开':'关闭'}}</button>
<button type="button" class="btn btn-info mr-2" (click)="refresh()">刷新</button>
</div>
</div>
</div>
src/app/pages/main/main.component.scss
+7 -5
View File
@@ -14,11 +14,13 @@
position: relative;
padding: 0 15px;
.first-condition {
.line-operator-left{
width: 100%;
}
.line-operator-right {
// position: absolute;
// top: 0;
// right: 0;
text-align: right;
// text-align: right;
display: inline-block;
float: right;
padding: 0;
.btn-info {
background-color: rgb(122, 156, 204);
@@ -184,7 +186,7 @@
@media screen and (max-width: 991px) {
.line-operator-right {
text-align: left !important;
float: none !important;
}
}
src/app/pages/seasonal-plan/seasonal-plan.component.html
+13 -11
View File
@@ -1,8 +1,8 @@
<div class="main-page">
<div class="page-content" #pageContent>
<div class="search-filter mb-3" #searchFilter>
<div class="search-filter mb-2" #searchFilter>
<div class="first-condition row">
<div class="line-operator-left input-container mb-3 col-xlg-8 col-mlg-8 col-xl-8 col-lg-10">
<div class="line-operator-left input-container mb-2">
<select class="mr-4 form-control" [(ngModel)]="SEL_COL" (ngModelChange)="resetPositionArray()" name="" id="">
<option value="">选择列名</option>
<option *ngFor="let col of render_col_lists" [value]="col.COL_CODE">{{col.COL_CN}}</option>
@@ -16,18 +16,20 @@
<span>查找定位</span>
</label>
<input class="form-control mr-4" [(ngModel)]="SEARCH" (ngModelChange)="resetPositionArray()" type="text" (keyup.enter)="inputEnter()">
<label for="arriOrDept">查询年份：&nbsp;&nbsp;</label>
<select class="form-control" [(ngModel)]="filterYear" (ngModelChange)="selectYearChange($event)">
<option *ngFor="let year of yearLists" [value]="year">{{year}}</option>
</select>
</div>
<div class="line-operator-right mb-3 col-xlg-4 col-mlg-4 col-xl-4 col-lg-2">
<button type="button" class="btn btn-info mr-2" (click)="toggleFilter()">{{filterClose?'展开':'关闭'}}</button>
<button type="button" class="btn btn-info mr-2" (click)="refresh()">刷新</button>
<div class="input-container mr-4" style="display:inline-block">
<label for="arriOrDept">查询年份：&nbsp;&nbsp;</label>
<select class="form-control" [(ngModel)]="filterYear" (ngModelChange)="selectYearChange($event)">
<option *ngFor="let year of yearLists" [value]="year">{{year}}</option>
</select>
</div>
<div class="line-operator-right">
<button type="button" class="btn btn-info mr-2" (click)="toggleFilter()">{{filterClose?'展开':'关闭'}}</button>
<button type="button" class="btn btn-info mr-2" (click)="refresh()">刷新</button>
</div>
</div>
</div>
<div class="second-condition mb-3 row" [ngClass]="{'filterClose-c':filterClose,'filterClose-o':!filterClose}">
<div class="second-condition mb-2 row" [ngClass]="{'filterClose-c':filterClose,'filterClose-o':!filterClose}">
<div class="input-container mr-4">
<label for="airlineId">航空公司：&nbsp;&nbsp;</label>
<select class="form-control" [(ngModel)]="filterItems.airlineId" (ngModelChange)="selectChange()">
src/app/pages/seasonal-plan/seasonal-plan.component.scss
+8 -3
View File
@@ -12,8 +12,13 @@
.search-filter {
padding: 0 15px;
.first-condition {
.line-operator-left{
width: 100%;
}
.line-operator-right {
text-align: right;
// text-align: right;
display: inline-block;
float: right;
padding: 0;
.btn-info {
background-color: rgb(122, 156, 204);
@@ -168,9 +173,9 @@
}
}
@media screen and (max-width: 991px) {
@media screen and (max-width: 1276px) {
.line-operator-right {
text-align: left !important;
float: none !important;
}
}