1.告警日志页面样式修改

src/styles/view/biz/situation/alarm.scss

@@ -7,11 +7,11 @@
     display: none;
   }
 
-  .alarm-view-search {
+  .custom-alarm-view-search {
     width: 100%;
     height: 45px;
     line-height: 40px;
-    background-color: $biz-title-color;
+    background-color: $page-header-background;
 
     .alarm-view-select-1 {
       display: inline-block;
@@ -39,16 +39,83 @@
 
     .aficon-down {
       &::before {
-        color: $core-color;
+        color: $content-color;
       }
     }
 
     .ant-calendar-picker-icon {
-      color: $core-color;
+      &::after{
+        color: $content-color;
+      }
     }
 
     .ant-calendar-picker-input {
       height: 30px;
+      border: $page-border-style;
+      background: $page-header-background;
+      color: $content-color;
+    }
+
+    .amos-select-dropdown {
+      border: $page-border-style;
+    }
+
+    .amos-input {
+      border: $page-border-style;
+      margin-right: 5px;
+
+    }
+
+    .ant-calendar-range-picker-separator {
+      color: $content-color;
+    }
+
+  }
+}
+.custom-picker {
+  &.ant-calendar-picker-container {
+    .ant-calendar {
+      background: $custom-picker-color;
+
+      .ant-calendar-month-panel-cell-disabled {
+        a {
+          color: #bcbcbc;
+        }
+      }
     }
+
+    .ant-calendar-date-input-wrap {
+      .ant-calendar-input {
+        background-color: $custom-picker-color;
+        color: $content-color;
+      }
+    }
+  }
+  .ant-calendar-range {
+    .ant-calendar-range-middle {
+      color: white;
+    }
+
+    .ant-calendar-in-range-cell {
+      &:before{
+        background: #4e6490;
+      }
+    }
+
+      &.ant-calendar-time{
+        .ant-calendar-time-picker-combobox {
+          background: $custom-picker-color;
+        }
+      }
+  }
+
+  .ant-calendar-month-panel {
+    background: $custom-picker-color;
+  }
+  .ant-calendar-year-panel {
+    background: $custom-picker-color;
+  }
+  .ant-calendar-decade-panel {
+    background: $custom-picker-color;
   }
 }

src/styles/view/var.scss

@@ -74,3 +74,6 @@ $biz-title-color: rgba(243, 243, 243, 1);//$component-bg-active;
 $biz-border-color: rgba(201, 201, 201, 1);
 $model-header-color-3d: #ebebeb;
 $model-body-color-3d: #f9f9f9;
+$page-header-background: #01133b;
+$page-border-style: 1px solid #1f5383;
+$custom-picker-color: #063c8c;

src/view/bizview/situation/alarm/AlarmSearch.js

@@ -72,7 +72,7 @@ class AlarmSearch extends Component {
   render() {
     let { equipData, searchParam } = this.state;
     return (
-      <div className="alarm-view-search">
+      <div className="custom-alarm-view-search">
         {/*<div className="alarm-view-select-1">
           <span>建/构筑物：</span>
           <Select
@@ -96,6 +96,7 @@ class AlarmSearch extends Component {
         <div className="alarm-view-select-3">
           <span>报警时间：</span>
           <RangePicker
+            dropdownClassName = "custom-picker"
             style = {{width:400}}
             format="YYYY-MM-DD HH:mm:ss"
             onChange={e => this.onSelectChange('time', e)}

themes/transparent.css

@@ -30,14 +30,23 @@
   margin-bottom: 0 !important;
   overflow: hidden;
   background: transparent;
+  border-top: 1px solid #1f5383;
+}
+
+.ant-table-fixed-header .ant-table-header > table {
+  border-left: 1px solid #1f5383;
+}
+
+.ant-table-fixed-header .ant-table-body >table {
+  border-left: 1px solid #1f5383;
 }
 
 .ant-table-header > table {
   border-top: #1f5383 !important;
 }
 
-.ant-table-bordered .ant-table-body > table {
-  border: 1px solid #1f5383 !important;
+.ant-table-header > table {
+  border-top: #1f5383 !important;
 }
 
 .ant-table-content .ant-table-placeholder {