diff --git a/src/app/pages/main/main.component.html b/src/app/pages/main/main.component.html
index a99a08b..6440ee8 100644
--- a/src/app/pages/main/main.component.html
+++ b/src/app/pages/main/main.component.html
@@ -123,18 +123,18 @@
                     <label for="">后时间段：&nbsp;&nbsp;</label>
                     <select [(ngModel)]="filterItems.End_time" (ngModelChange)="selectChange()" class="form-control">
                         <option value=""></option>
-                        <option value="1">前1小时</option>
-                        <option value="2">前2小时</option>
-                        <option value="3">前3小时</option>
-                        <option value="4">前4小时</option>
-                        <option value="5">前5小时</option>
-                        <option value="6">前6小时</option>
-                        <option value="7">前7小时</option>
-                        <option value="8">前8小时</option>
-                        <option value="9">前9小时</option>
-                        <option value="10">前10小时</option>
-                        <option value="11">前11小时</option>
-                        <option value="12">前12小时</option>
+                        <option value="1">后1小时</option>
+                        <option value="2">后2小时</option>
+                        <option value="3">后3小时</option>
+                        <option value="4">后4小时</option>
+                        <option value="5">后5小时</option>
+                        <option value="6">后6小时</option>
+                        <option value="7">后7小时</option>
+                        <option value="8">后8小时</option>
+                        <option value="9">后9小时</option>
+                        <option value="10">后10小时</option>
+                        <option value="11">后11小时</option>
+                        <option value="12">后12小时</option>
                     </select>
                 </div>
             </div>
diff --git a/src/app/pages/main/main.component.ts b/src/app/pages/main/main.component.ts
index ec67006..abfd089 100644
--- a/src/app/pages/main/main.component.ts
+++ b/src/app/pages/main/main.component.ts
@@ -154,7 +154,7 @@ export class MainComponent implements OnInit {
             data => {
                 data.body.forEach(element => {
                     if (element.groupCode === 'userSettingCol') {
-                        this.col_lists = JSON.parse(element.settingContent).allCols;
+                        this.col_lists = JSON.parse(element.settingContent).defaultData;
                         this.render_col_lists = JSON.parse(element.settingContent).targetList;
                     } else if (element.groupCode === 'userSettingColor') {
                         this.airline_color = JSON.parse(element.settingContent);
@@ -424,7 +424,7 @@ export class MainComponent implements OnInit {
             data => {
                 data.body.forEach(element => {
                     if (element.groupCode === 'userSettingCol') {
-                        this.col_lists = JSON.parse(element.settingContent).allCols;
+                        this.col_lists = JSON.parse(element.settingContent).defaultData;
                         this.render_col_lists = JSON.parse(element.settingContent).targetList;
                     } else if (element.groupCode === 'userSettingColor') {
                         this.airline_color = JSON.parse(element.settingContent);
@@ -477,9 +477,9 @@ export class MainComponent implements OnInit {
         MVIN: '',    //到达/出发
         FTSS: '',    //运营状态
         TRML: '',    //航站楼
-        Abnormal_state: '9',  //异常状态
+        Abnormal_state: '',  //异常状态
         Start_time: '9',
-        End_time: '',
+        End_time: '9',
         FHAG: '',    //机坪代理
         MHAG: '',    //维护代理
         PHAG: '',    //旅客代理
@@ -524,7 +524,7 @@ export class MainComponent implements OnInit {
                             } else if (key === 'Start_time') {
                                 let planTime = new Date(dateFormatter(item['preFlight']['SODT'])).getTime();
                                 let nowTime = new Date().getTime();
-                                if (nowTime - planTime > +filterItems[key] * 60 * 60 * 1000) {
+                                if (nowTime - planTime >= +filterItems[key] * 60 * 60 * 1000 || nowTime - planTime < 0) {
                                     is_satis = false;
                                     break;
                                 } else {
@@ -534,7 +534,7 @@ export class MainComponent implements OnInit {
                             } else if (key === 'End_time') {
                                 let planTime = new Date(dateFormatter(item['preFlight']['SODT'])).getTime();
                                 let nowTime = new Date().getTime();
-                                if (planTime - nowTime > +filterItems[key] * 60 * 60 * 1000) {
+                                if (planTime - nowTime > +filterItems[key] * 60 * 60 * 1000 || planTime - nowTime < 0) {
                                     is_satis = false;
                                     break;
                                 } else {
@@ -568,7 +568,7 @@ export class MainComponent implements OnInit {
                             } else if (key === 'Start_time') {
                                 let planTime = new Date(dateFormatter(item['reaFlight']['SODT'])).getTime();
                                 let nowTime = new Date().getTime();
-                                if (nowTime - planTime > +filterItems[key] * 60 * 60 * 1000) {
+                                if (nowTime - planTime > +filterItems[key] * 60 * 60 * 1000 || nowTime - planTime < 0) {
                                     is_satis = false;
                                     break;
                                 } else {
@@ -578,7 +578,7 @@ export class MainComponent implements OnInit {
                             } else if (key === 'End_time') {
                                 let planTime = new Date(dateFormatter(item['reaFlight']['SODT'])).getTime();
                                 let nowTime = new Date().getTime();
-                                if (planTime - nowTime > +filterItems[key] * 60 * 60 * 1000) {
+                                if (planTime - nowTime > +filterItems[key] * 60 * 60 * 1000 || planTime - nowTime < 0) {
                                     is_satis = false;
                                     break;
                                 } else {
@@ -613,7 +613,7 @@ export class MainComponent implements OnInit {
                             } else if (key === 'Start_time') {
                                 let planTime = new Date(dateFormatter(item['preFlight']['SODT'])).getTime();
                                 let nowTime = new Date().getTime();
-                                if (nowTime - planTime > +filterItems[key] * 60 * 60 * 1000) {
+                                if (nowTime - planTime > +filterItems[key] * 60 * 60 * 1000 || nowTime - planTime < 0) {
                                     pre_satis = false;
                                     break;
                                 } else {
@@ -623,7 +623,7 @@ export class MainComponent implements OnInit {
                             } else if (key === 'End_time') {
                                 let planTime = new Date(dateFormatter(item['preFlight']['SODT'])).getTime();
                                 let nowTime = new Date().getTime();
-                                if (planTime - nowTime > +filterItems[key] * 60 * 60 * 1000) {
+                                if (planTime - nowTime > +filterItems[key] * 60 * 60 * 1000 || planTime - nowTime < 0) {
                                     pre_satis = false;
                                     break;
                                 } else {
@@ -654,7 +654,7 @@ export class MainComponent implements OnInit {
                             } else if (key === 'Start_time') {
                                 let planTime = new Date(dateFormatter(item['reaFlight']['SODT'])).getTime();
                                 let nowTime = new Date().getTime();
-                                if (nowTime - planTime > +filterItems[key] * 60 * 60 * 1000) {
+                                if (nowTime - planTime > +filterItems[key] * 60 * 60 * 1000 || nowTime - planTime < 0) {
                                     rea_satis = false;
                                     break;
                                 } else {
@@ -664,7 +664,7 @@ export class MainComponent implements OnInit {
                             } else if (key === 'End_time') {
                                 let planTime = new Date(dateFormatter(item['reaFlight']['SODT'])).getTime();
                                 let nowTime = new Date().getTime();
-                                if (planTime - nowTime > +filterItems[key] * 60 * 60 * 1000) {
+                                if (planTime - nowTime > +filterItems[key] * 60 * 60 * 1000 || planTime - nowTime < 0) {
                                     rea_satis = false;
                                     break;
                                 } else {
diff --git a/src/app/utils/flights-data-handle.ts b/src/app/utils/flights-data-handle.ts
index 11b4b77..538f096 100644
--- a/src/app/utils/flights-data-handle.ts
+++ b/src/app/utils/flights-data-handle.ts
@@ -144,7 +144,6 @@ export class FlightsDataHandle {
             }
         } catch (error) {
             console.log('数据有误，处理失败，请检查数据');
-            console.log(item);
             throw error;
         } finally {
             return flights_item;
@@ -252,7 +251,6 @@ export class FlightsDataHandle {
             }
         } catch (error) {
             console.log('基础数据转换有误，处理失败，请检查数据');
-            console.log(item);
             throw error;
         } finally {
             return item;