单元格颜色显示修改

src/app/components/toast/toast.component.scss

@@ -7,6 +7,12 @@
  }
  .c-toast{
      height: 100%;
+     padding: 15px 30px 15px 15px;
+ }
+ button.close{
+     position: absolute;
+     top: 10px;
+     right: 10px;
  }
 
 

src/app/pages/main/main.component.ts

@@ -886,10 +886,6 @@ export class MainComponent implements OnInit {
         'SODT': this.cellColorHandle.sodt.bind(this.cellColorHandle),
         'PADT': this.cellColorHandle.padt.bind(this.cellColorHandle),
         'PSST': this.cellColorHandle.psst.bind(this.cellColorHandle),
-        'COTM': this.cellColorHandle.cotm.bind(this.cellColorHandle),
-        'CCTM': this.cellColorHandle.cctm.bind(this.cellColorHandle),
-        'BOTM': this.cellColorHandle.botm.bind(this.cellColorHandle),
-        'GCTM': this.cellColorHandle.gctm.bind(this.cellColorHandle)
     }
     getColor(col_CODE, flight, col_WIDTH) {
         let index = this.airline_color.findIndex(color => color['COL_CODE'] === col_CODE)

src/app/pages/system-management/personal-settings/color-settings/color-settings.component.ts

@@ -27,11 +27,12 @@ export class ColorSettingsComponent implements OnInit {
 	ngOnInit() {
 		this.queryTable();
 		this.defaultList=[
-			{"COL_CODE":"RENO", "COL_CN":"飞机号", "COL_BG_COLOR":"rgb(46,255,135,1)","COL_COLOR":"rgb(0,70,255,1)"},
+            {"COL_CODE":"SODT", "COL_CN":"预计到达／出发", "COL_BG_COLOR":"rgb(230,221,221,1)","COL_COLOR":"rgb(0,70,255,1)"},
-			{"COL_CODE":"ACTT", "COL_CN":"实际到达／出发", "COL_BG_COLOR":"rgb(149,207,255,1)","COL_COLOR":"rgb(0,70,255,1)"},
             {"COL_CODE":"ESTT", "COL_CN":"预计到达／出发", "COL_BG_COLOR":"rgb(255,207,157,1)","COL_COLOR":"rgb(0,70,255,1)"},
+            {"COL_CODE":"ACTT", "COL_CN":"实际到达／出发", "COL_BG_COLOR":"rgb(149,207,255,1)","COL_COLOR":"rgb(0,70,255,1)"},
+            {"COL_CODE":"RENO", "COL_CN":"飞机号变更", "COL_BG_COLOR":"rgb(46,255,135,1)","COL_COLOR":"rgb(0,70,255,1)"},
+            {"COL_CODE":"PSST", "COL_CN":"计划机位变更", "COL_BG_COLOR":"rgb(173,255,46,1)","COL_COLOR":"rgb(0,70,255,1)"},
             {"COL_CODE":"PADT", "COL_CN":"前站起飞时间", "COL_BG_COLOR":"rgb(114,181,255,1)","COL_COLOR":"rgb(0,70,255,1)"},
-			{"COL_CODE":"PSST", "COL_CN":"计划机位", "COL_BG_COLOR":"rgb(173,255,46,1)","COL_COLOR":"rgb(0,70,255,1)"},
 		]
 	}
 	//设置颜色 1设置背景颜色   2设置字体颜色  

src/app/utils/cell-color-handle.ts

@@ -7,8 +7,7 @@ export class CellColorHandle {
 
 
     public reno(flight, colorSetting) {
-        if (this.orderHandle.isArriFlight(flight)) {
+        if (flight['renderFlight']['RENO'] && flight['renderFlight']['RENO'].indexOf('(') > 0) {
-            if (flight['preFlight']['RENO'] && flight['preFlight']['RENO'].indexOf('(') > 0) {
             return {
                 'background-color': colorSetting.COL_BG_COLOR,
                 'color': colorSetting.COL_COLOR
@@ -16,25 +15,6 @@ export class CellColorHandle {
         } else {
             return {};
         }
-        } else if (this.orderHandle.isDeptFlight(flight)) {
-            if (flight['reaFlight']['RENO'] && flight['reaFlight']['RENO'].indexOf('(') > 0) {
-                return {
-                    'background-color': colorSetting.COL_BG_COLOR,
-                    'color': colorSetting.COL_COLOR
-                }
-            } else {
-                return {};
-            }
-        } else {
-            if ((flight['preFlight']['RENO'] && flight['preFlight']['RENO'].indexOf('(') > 0) || (flight['reaFlight']['RENO'] && flight['reaFlight']['RENO'].indexOf('(') > 0)) {
-                return {
-                    'background-color': colorSetting.COL_BG_COLOR,
-                    'color': colorSetting.COL_COLOR
-                }
-            } else {
-                return {};
-            }
-        }
     }
 
     public actt(flight, colorSetting) {
@@ -105,8 +85,8 @@ export class CellColorHandle {
     }
 
     public padt(flight, colorSetting) {
-        if (this.orderHandle.isArriFlight(flight)) {
+        if (this.orderHandle.isArriFlight(flight) || this.orderHandle.isLinked(flight)) {
-            if (flight['preFlight']['PADT'] && flight['preFlight']['PADT'].indexOf('(') > 0) {
+            if (flight['preFlight']['PADT']) {
                 return {
                     'background-color': colorSetting.COL_BG_COLOR,
                     'color': colorSetting.COL_COLOR
@@ -114,66 +94,13 @@ export class CellColorHandle {
             } else {
                 return {};
             }
-        } else if (this.orderHandle.isDeptFlight(flight)) {
-            if (flight['reaFlight']['PADT'] && flight['reaFlight']['PADT'].indexOf('(') > 0) {
-                return {
-                    'background-color': colorSetting.COL_BG_COLOR,
-                    'color': colorSetting.COL_COLOR
-                }
-            } else {
-                return {};
-            }
-        } else {
-            if ((flight['preFlight']['PADT'] && flight['preFlight']['PADT'].indexOf('(') > 0) || (flight['reaFlight']['PADT'] && flight['reaFlight']['PADT'].indexOf('(') > 0)) {
-                return {
-                    'background-color': colorSetting.COL_BG_COLOR,
-                    'color': colorSetting.COL_COLOR
-                }
-            } else {
-                return {};
-            }
-        }
-    }
-
-    public psst(flight, colorSetting) {
-        return {};
-    }
-
-    public cotm(flight, colorSetting) {
-        if (flight['renderFlight']['COTM'] && !flight['renderFlight']['CCTM']) {
-            return {
-                'background-color': colorSetting.COL_BG_COLOR,
-                'color': colorSetting.COL_COLOR
-            }
         } else {
             return {};
         }
     }
 
-    public cctm(flight, colorSetting) {
+    public psst(flight, colorSetting) {
-        if (flight['renderFlight']['CCTM']) {
+        if (flight['renderFlight']['PSST'] && flight['renderFlight']['PSST'].indexOf('(') > 0) {
-            return {
-                'background-color': colorSetting.COL_BG_COLOR,
-                'color': colorSetting.COL_COLOR
-            }
-        } else {
-            return {};
-        }
-    }
-
-    public botm(flight, colorSetting) {
-        if (flight['renderFlight']['BOTM'] && !flight['renderFlight']['GCTM']) {
-            return {
-                'background-color': colorSetting.COL_BG_COLOR,
-                'color': colorSetting.COL_COLOR
-            }
-        } else {
-            return {};
-        }
-    }
-
-    public gctm(flight, colorSetting) {
-        if (flight['renderFlight']['GCTM']) {
             return {
                 'background-color': colorSetting.COL_BG_COLOR,
                 'color': colorSetting.COL_COLOR