From b0f94ada239ef8b566cc3491aece866f5586cf1a Mon Sep 17 00:00:00 2001
From: zhouyuejun <505127606@qq.com>
Date: Thu, 21 Feb 2019 14:58:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A3=E5=BA=A6=E8=AE=A1=E5=88=92=E5=92=8C?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E9=A1=B5=E9=9D=A2=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=B0=83=E6=95=B4=E7=BE=8E=E8=A7=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../historical-data.component.html            | 18 +++++++-------
 .../historical-data.component.scss            | 14 ++++++-----
 src/app/pages/main/main.component.html        | 14 +++++------
 src/app/pages/main/main.component.scss        | 12 ++++++----
 .../seasonal-plan.component.html              | 24 ++++++++++---------
 .../seasonal-plan.component.scss              | 11 ++++++---
 6 files changed, 53 insertions(+), 40 deletions(-)

diff --git a/src/app/pages/historical-data/historical-data.component.html b/src/app/pages/historical-data/historical-data.component.html
index 30d9c99..33c6582 100644
--- a/src/app/pages/historical-data/historical-data.component.html
+++ b/src/app/pages/historical-data/historical-data.component.html
@@ -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>
 
diff --git a/src/app/pages/historical-data/historical-data.component.scss b/src/app/pages/historical-data/historical-data.component.scss
index 6b4dd3a..eae0469 100644
--- a/src/app/pages/historical-data/historical-data.component.scss
+++ b/src/app/pages/historical-data/historical-data.component.scss
@@ -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;
     }
 }
 
diff --git a/src/app/pages/main/main.component.html b/src/app/pages/main/main.component.html
index 32fb33e..9130d6f 100644
--- a/src/app/pages/main/main.component.html
+++ b/src/app/pages/main/main.component.html
@@ -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>
 
diff --git a/src/app/pages/main/main.component.scss b/src/app/pages/main/main.component.scss
index 00b2761..56de5fb 100644
--- a/src/app/pages/main/main.component.scss
+++ b/src/app/pages/main/main.component.scss
@@ -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;
     }
 }
 
diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.html b/src/app/pages/seasonal-plan/seasonal-plan.component.html
index 7212008..984951f 100644
--- a/src/app/pages/seasonal-plan/seasonal-plan.component.html
+++ b/src/app/pages/seasonal-plan/seasonal-plan.component.html
@@ -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()">
diff --git a/src/app/pages/seasonal-plan/seasonal-plan.component.scss b/src/app/pages/seasonal-plan/seasonal-plan.component.scss
index 934b321..e114069 100644
--- a/src/app/pages/seasonal-plan/seasonal-plan.component.scss
+++ b/src/app/pages/seasonal-plan/seasonal-plan.component.scss
@@ -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;
     }
 }