Parcourir la source

bug2724,2723,2722,2721,2720

luolei il y a 5 ans
Parent
commit
8d787ebcfb

+ 1 - 1
src/components/AddAssistCheck/Textarea/index.less

@@ -1,6 +1,6 @@
 .divTextarea {
   /*overflow-y: auto;*/
-  overflow-x: hidden;
+  // overflow-x: hidden;
   /*max-height: 100px;*/
   border-bottom: 1px dashed #333;
   box-sizing: border-box;

+ 1 - 0
src/components/AddAssistCheck/index.less

@@ -192,6 +192,7 @@
 .tagSpan {
   position: relative;
   cursor: default;
+  font-weight: bold;
 }
 
 .tagSpan:hover {

+ 2 - 2
src/components/AddInspect/SlideSelect/index.jsx

@@ -126,13 +126,13 @@ class SlideSelect extends Component {
             // 标签,血常规。。
             item.show ?
             <p className={styles.staticTagActive}>
-                <span className={`${styles.tagSpan} ${styles.selectTagSpan} ${setFontColorSize(2)}`} data-flg="current" onClick={(e)=>this.handleLabelSub(e,item.questionId,idx)}>
+                <span className={`${styles.tagSpan} ${styles.selectTagSpan} ${setFontColorSize(2,6)}`} data-flg="current" onClick={(e)=>this.handleLabelSub(e,item.questionId,idx)}>
                   {item.name}
                   <span className={styles.imgInfo1} title='点击i图标可查看详细说明' onClick={()=>getInfomation({name:item.uniqueName || '', position: 1, type: 12})}></span>
                 </span>
             </p>:
             <p >
-                <i className={styles.tagSpan} data-flg="current" onClick={(e)=>this.handleLabelSub(e,item.questionId,idx)}>
+                <i className={`${styles.tagSpan} ${styles.tagSpanS} ${setFontColorSize(2,6)}`} data-flg="current" onClick={(e)=>this.handleLabelSub(e,item.questionId,idx)}>
                   {item.name}
                   <span className={styles.imgInfo} title='点击i图标可查看详细说明' onClick={()=>getInfomation({name:item.uniqueName || '', position: 1, type: 12})}></span>
                 </i>

+ 3 - 0
src/components/AddInspect/SlideSelect/index.less

@@ -197,6 +197,9 @@
   display: inline-block;
   position: relative;
 }
+.tagSpanS {
+    font-weight: bold;
+}
 .selectTagSpan {
   color: #000;
   font-weight: bold;

+ 1 - 1
src/components/Advice/index.jsx

@@ -88,7 +88,7 @@ class Advice extends Component{
             {/* {advice.commontreatment && <div className={style['treat-input']}  onInput={this.handleComTreatInput}  contentEditable={true} style = {{outline: 'none'}}></div>} */}
             {<Textarea value={advice.commontreatment} isRead={isRead} handleChangeAssistValue={this.handleComTreatInput} ></Textarea>}
         </div>}
-        {!isFirstMainDiag && hasFollowUp &&<div><FollowUp  noHeader="true" textStyle={{padding: '0 10px'}}  setFollowUp={saveFollowUp} followUp = {followUp} isRead={isRead}></FollowUp></div>}
+        {!isFirstMainDiag && hasFollowUp &&<FollowUp  noHeader="true" textStyle={{padding: '0 10px'}}  setFollowUp={saveFollowUp} followUp = {followUp} isRead={isRead}></FollowUp>}
         {advice.scheme && advice.scheme.length > 0 &&<div contentEditable='false' className={`${style['scheme']} ${setFontColorSize(2)}`}>
           {advice.scheme && advice.scheme.length > 0  && <h1>治疗方案</h1>}
           {scheme}

+ 11 - 0
src/components/Advice/index.less

@@ -8,17 +8,28 @@
 }
 .billing {
   padding: 0px 10px;
+  color: #000;
   h1{
     margin: 5px 0px;
+    font-size: unset;
+  }
+  p,span{
+    font-size: unset;
   }
 }
 .scheme {
   padding: 0px 10px;
+  color: #000;
   h1{
     margin: 5px 0px;
+    font-size: unset;
   }
   p{
     line-height: 18px;
+    font-size: unset;
+  }
+  div {
+    font-size: unset;
   }
 }
 .treat-input {

+ 6 - 0
src/components/Treat/FollowUp/index.less

@@ -1,6 +1,11 @@
 .general-wrapper {
     position: relative;
     padding: 10px 0 0 0;
+    font-size: unset;
+    color: #000;
+    div,span,p {
+        font-size: unset;
+    }
 }
 .general-title-box {
     height: 36px;
@@ -26,4 +31,5 @@
 .follow-up-box {
     border-bottom: 1px dotted  #D2D2D2;
     line-height: 36px;
+    font-size: unset;
 }