Merge remote-tracking branch 'origin/optimize' into optimize

src/components/Emergency/HisList/index.jsx

@@ -174,16 +174,18 @@ class HisList extends Component {
     const { data,total } = this.props;
     const { hasSecond } = this.state;
     return <div className={style['list-Box']}>
-      <h2>本科室近期全部历史病历</h2>
-      <div className={style['list-time']}>
-        <img src={date} />
-        <TimeInterval getStartTime={this.getStartTime} getEndTime={this.getEndTime}></TimeInterval>
-      </div>
-      <div className={style['filter-box']}>
-        <span className={style['filter']}>筛选：</span>
-        <span className={hasSecond==-1?`${style['condition']} ${style['select']}`:style['condition']} onClick={this.handleFilter.bind(this,-1)}>默认</span>
-        <span className={hasSecond==1?`${style['condition']} ${style['select']}`:style['condition']} onClick={this.handleFilter.bind(this,1)}>有二次诊断</span>
-        <span className={hasSecond==0?`${style['condition']} ${style['select']}`:style['condition']} onClick={this.handleFilter.bind(this,0)}>没有二次诊断</span>
+      <div className={style['top']}>
+        <h2>本科室近期全部历史病历</h2>
+        <div className={style['list-time']}>
+          <img src={date} />
+          <TimeInterval getStartTime={this.getStartTime} getEndTime={this.getEndTime}></TimeInterval>
+        </div>
+        <div className={style['filter-box']}>
+          <span className={style['filter']}>筛选：</span>
+          <span className={hasSecond==-1?`${style['condition']} ${style['select']}`:style['condition']} onClick={this.handleFilter.bind(this,-1)}>默认</span>
+          <span className={hasSecond==1?`${style['condition']} ${style['select']}`:style['condition']} onClick={this.handleFilter.bind(this,1)}>有二次诊断</span>
+          <span className={hasSecond==0?`${style['condition']} ${style['select']}`:style['condition']} onClick={this.handleFilter.bind(this,0)}>没有二次诊断</span>
+        </div>
       </div>
       <div className={style['list']}>
         <ul>

src/components/Emergency/HisList/index.less

@@ -1,7 +1,17 @@
 .list-Box{
-  width: 360px;
-  height: 700px;
-  padding-top: 30px;
+  // width: 360px;
+  width: 324px;
+  // height: 700px;
+  height: 100%;
+  overflow: hidden;
+  padding-top: 130px;
+  padding-bottom: 70px;
+  position: relative;
+  .top{
+    position: absolute;
+    top:20px;
+    left: 0;
+  }
   h2{
     font-weight: 700;
     font-size: 18px;
@@ -11,10 +21,10 @@
     margin: 0 0 10px 20px;
   }
   .list-time{
-    width: 320px;
+    width: 323px;
     height: 39px;
     background: #E9F5FA;
-    margin: 0 20px 8px;
+    // margin: 0 20px 8px;
     padding-top: 6px;
     position: relative;
   }
@@ -41,7 +51,8 @@
     }
   }
   .list{
-    height: 480px;
+    // height: 480px;
+    height: 100%;
     overflow-y: auto;
     padding-bottom: 20px;
     li{
@@ -86,9 +97,14 @@
   .all-box{
     color: #7C828E;
     height: 69px;
+    width: 323px;
     line-height: 69px;
     padding: 0 20px;
     border-top: 1px solid #E9F5FA;
+    position: absolute;
+    bottom: 2px;
+    left: 0;
+    background: #fff;
     .check-all{
       width: 14px;
       margin: 0 8px 0 0;
@@ -102,7 +118,7 @@
       text-align: center;
       border: 1px solid #E2EFF6;
       border-radius: 4px;
-      margin-left: 177px;
+      margin-left: 136px;
       cursor: pointer;
     }
     .exp-select{

src/components/Emergency/index.less

@@ -3,19 +3,20 @@
   .mask;
 }
 .emer-box{
-  width: 1060px;
-  height: 700px;
+  // width: 1060px;
+  width: 1024px;
+  // height: 700px;
+  height: 84%;
   position: fixed;
-  top:55px; //搜索结果展示-6-26
-  // top: 50%;
+  top:20px; //搜索结果展示-6-26
   left:50%;
-  // margin-top: -350px;
   margin-left: -530px;
   z-index: 2002;
   background: #fff;
   // overflow: hidden;
   .emer-content{
     position: relative;
+    height: 100%;
   }
   .closeModal {
     width: 100%;
@@ -34,13 +35,15 @@
     z-index: 888;
   }
   .emer-left{
-    width: 360px;
+    // width: 360px;
+    width: 324px;
+    height: 100%;
     display: inline-block;
     border-right: 1px solid #E9F5FA;
   }
   .emer-right{
     width: 700px;
-    height: 700px;
+    height: 100%;
     overflow-y: auto;
     display: inline-block;
     vertical-align: top;

src/components/PushItems/index.less

@@ -12,7 +12,7 @@
   .vigilant{
     background: #FF8D54;
     overflow: hidden;
-    padding: 10px 0;
+    padding: 10px 15px;
     .title{
       color:#fff;
       font-size: 14px;
@@ -21,9 +21,8 @@
       margin: 10px 0px 0 0;
       img {
         float: left;
-        margin: 1px 2px 0 20px;
-        width: 18px;
-        height: 17px;
+        margin: 0px 5px 0 0px;
+        width: 20px;
       }
     }
     .vigilantContent {