历史病历样式修改

src/common/less/variables.less

@@ -304,4 +304,27 @@
 }
 .contentZIndex3 {
   z-index: 30;
+}
+::-webkit-scrollbar{
+   /*滚动条整体样式*/
+   width: 8px;
+   /*高宽分别对应横竖滚动条的尺寸*/
+   height: 8px;
+   background: #fff;
+   -webkit-box-shadow: inset 1px 0 1px rgba(0, 0, 0, 0.2);
+ }
+
+::-webkit-scrollbar-thumb{
+  /*滚动条里面小方块*/
+  width: 8px;
+  height: 8px;
+  border-radius: 5px;
+  background: @extBlue;
+}
+
+::-webkit-scrollbar-track{
+  /*滚动条里面轨道*/
+  border-radius: 5px;
+  background: #fff;
+  opacity: .2;
 }

src/components/AddInspect/SlideSelect/index.jsx

@@ -116,9 +116,10 @@ class SlideSelect extends Component {
       right:'0',
       top:'6px',
       zIndex:'15',
-      width:'14px',
+      borderRadius:'4px',
+      width:'7px',
       background:'#f1f1f1'};
-    const barStyle={background:'#777',width:'100%'};
+    const barStyle={background:'#C9C9C9',width:'100%'};
     const listLen = currentData.details&&currentData.details.length;
     const stopScroll =(windowWidth<1300&&listLen>12)||(windowWidth>1299&&listLen>24);
     return (

src/components/EMRContainer/index.jsx

@@ -46,13 +46,13 @@ class EMRContainer extends Component {
     }
     render() {
         const contStyle={
-                          opacity:'0.4',
+                          opacity:'1',
                           top:'1px',
                           right:'458px',
                           zIndex:'15',
-                          width:'14px',
+                          width:'7px',
                           background:'#f1f1f1'};
-        const barStyle={background:'#777',width:'100%',marginLeft:'0'};
+        const barStyle={borderRadius:'4px',background: '#C9C9C9',width:'100%',marginLeft:'0'};
         return <div className={style['EMR-container']}
                     ref={this.$cont} id="addScrollEvent">
             <InfoTitle></InfoTitle>

src/components/HistoryCaseContainer/HistoryList/index.jsx

@@ -332,14 +332,14 @@ class HistoryCaseContainer extends React.Component {
             return jsonDataString;
         }
       const contStyle = {
-        opacity: '0.4',
+        opacity: '1',
         right: '0',
         top: '1px',
         zIndex: '15',
-        width: '14px',
+        width: '7px',
         background: '#f1f1f1'
       };
-      const barStyle = { background: '#777', width: '100%' };
+      const barStyle = { borderRadius:'4px',background: '#C9C9C9', width: '100%' };
         return (
             <div className={styles.mainHistory} id="hisWrapMove">
                 <div className={styles.mainTop}>

src/components/Information/index.less

@@ -1,15 +1,15 @@
 .title {
   clear: both;
-  font-size: 22px !important;
-  margin-bottom: 15px;
+  font-size: 24px !important;
+  margin-bottom: 27px;
   text-align:center;
   padding-top: 15px;
 }
 .patInfo {
   margin: 0px 0px 15px 0px;
   td {
-    border: 1px solid #aaa;
-    padding: 14px 8px;
+    border: 1px solid #CCD2D9;
+    padding: 6px 14px 7px;
     font-size: 14px;
   }
   tr td{

src/components/PreviewBody/Inspect/index.jsx

@@ -7,9 +7,9 @@ const PreviewInspect = (props) => {
     return <tr className={style['patInfoFst']}>
       <td className={style['patInfoSec']}>检验：</td>
       <td className={style['patInfoSec']}>
-        <table style={style.assistTable}>
+        <table className={style.assistTable}>
         {
-          (dataJson.labelListSmall.length !== 0 || dataJson.labelListBig.length !== 0) && ( <tr style={{ lineHeight: '36px' }}>检验结果数据</tr>)
+          (dataJson.labelListSmall.length !== 0 || dataJson.labelListBig.length !== 0) && ( <span style={{ lineHeight: '36px' }}>检验结果数据</span>)
         }
         {
           dataJson && dataJson.labelListSmall && dataJson.labelListSmall.map((item) => {

src/components/PreviewBody/MedicalAdvice/index.jsx

@@ -14,7 +14,7 @@ class MedicalAdvice extends Component {
         <tr className={style['patInfoFst']}>
           <td className={style['patInfoSec']}>医嘱：</td>
           <td className={style['patInfoSec']}>
-            <table style={style.assistTable}>
+            <table className={style.assistTable}>
               {
               labelListBig && labelListBig.map((item,index)=>{
                 return (

src/components/PreviewBody/index.jsx

@@ -86,14 +86,14 @@ class PreviewBody extends Component {
     let other_data={},lis_data={},pas_data={},other_yjs='',access='',adviceData={};
     let isShowSex = baseObj.sex !== 2 ? false : true
     const contStyle = {
-      opacity: '0.4',
+      opacity: '1',
       right: '0',
       top: '1px',
       zIndex: '15',
-      width: '14px',
+      width:'7px',
       background: '#f1f1f1'
     };
-    const barStyle = { background: '#777', width: '100%' };
+    const barStyle = { borderRadius:'4px',background: '#C9C9C9', width: '100%' };
     // if(!come){
     //   other_data = JSON.parse(baseObj.detailList[2].contentJson)
     //   lis_data = JSON.parse(baseObj.detailList[4].contentJson)
@@ -117,7 +117,7 @@ class PreviewBody extends Component {
         verticalContainerStyle={contStyle}
         verticalScrollbarStyle={barStyle}
         contentClassName="content">
-      <div className={style['contents']} id="content" style={{ margin: "0 auto", maxWidth: "620px" }}>
+      <div className={style['contents']} id="content">
         {/* <div style={{height:'40px', backgroundColor: 'red', width:'100%'}}></div> */}
         <Information baseObj={baseObj} preInfo={preInfo}></Information>
         <table className={style['infos']}>

src/components/PreviewBody/index.less

@@ -10,6 +10,7 @@
   .contents {
     position: relative;
     padding-bottom: 26px;
+    margin: 0 15px 0 18px;
     // padding-top: 40px;
   }
 }
@@ -70,8 +71,11 @@ table{
   margin-bottom: 10px;
   width: 100%;
   font-size: 12px;
+  tr:nth-child(odd){
+    background: #F2F2F2;
+  }
   .assistTableTrSec {
-    line-height: 1.5;
+    line-height: 22px;
     max-width: 650px;
     td {
       font-size: 12px;
@@ -106,7 +110,7 @@ table{
   width: 32%;
 }
 .adviceTableTdFst {
-  width: 45%;
+  width: 28%;
 }
 .assistTableTdSec {
   width: 12%;
@@ -122,7 +126,7 @@ table{
   width:18%;
 }
 .assistTableTdFor {
-  width: 18%;
+  width: 22%;
 }
 .assistTableTrSecExcel {
   line-height: 1.5;