소스 검색

管理评估量表等结果样式修改

zhouna 5 년 전
부모
커밋
37c46e2c0e
2개의 변경된 파일18개의 추가작업 그리고 21개의 파일을 삭제
  1. 11 14
      src/components/AssessResult/ScaleItem/index.jsx
  2. 7 7
      src/components/AssessResult/index.less

+ 11 - 14
src/components/AssessResult/ScaleItem/index.jsx

@@ -36,10 +36,10 @@ class ScaleItem extends Component {
         }else if(its.type==2){      //计算公式
           const showRes = calcuResult&&calcuResult[item.conceptId]||it.content.result;
           const cresult = showRes&&showRes[1]&&showRes[1].text;
-                    temp = <div className={style['results']}>
-                    <span>患者可能有:</span>
-                    <span className={style["blue"]}>{cresult}</span>
-                </div>
+                    temp = <span className={style['results']}>
+                    患者可能有:
+                    <i className={style["blue"]}>{cresult}</i>
+                </span>
         }else if(its.type==3){
           temp = <div className={style['results']}>
                     <span>可能结果:</span>
@@ -48,11 +48,9 @@ class ScaleItem extends Component {
         }
         const passId = item.details[j].type==1?item.details[j].content.conceptId:undefined;
         const li = disabled?<li>
-            <span className={style['s-title']}>{item.name}:</span>
-            <div className={style['row']}>{temp}</div>
+            <div className={style['s-title']}>{item.name}:{temp}</div>
           </li>:<li>
-          <span className={style['s-title']}>{item.name}:</span>
-          <div className={style['row']}>{temp}</div>
+          <span className={style['s-title']}>{item.name}:{temp}</span>
           <div className={style["recommend"]} onClick={this.props.handleRemove.bind(this,false,i,passId,j)}>
             <img className={style["deleteIconNo"]} src={deleteIconNo} />
             <img className={style["deleteIcon"]} src={deleteIcon} />
@@ -81,14 +79,13 @@ class ScaleItem extends Component {
       let scaleRes=formulaResult&&formulaResult[it.conceptId]&&formulaResult[it.conceptId].calcalculate;
       const name = scaleRes&&scaleRes.result?(' 【'+scaleItems[i].name+'】 结果:'+scaleRes.result.value+" "+(scaleRes.result.text||'')):'【'+scaleItems[i].name+'】';
       //这里onClick不能用箭头函数,用箭头函数会一直绑定for的最后一个it
-      temp =<span className={style['scale']}
-                  title={name}>{name}</span>;
+      temp =<i className={style['scale']}
+                  title={name}>{name}</i>;
       li = disabled?<li>
-        <span className={style['s-title']}>相关量表:</span>
-        <div className={style['row']}>{temp}</div>
+        <span className={style['s-title']}>相关量表:{temp}</span>
       </li>:<li>
-        <span className={style['s-title']}>相关量表:</span>
-        <div className={style['row']}>{temp}</div>
+        <span className={style['s-title']}>相关量表:{temp}</span>
+        {/*<div className={style['row']}>{temp}</div>*/}
         <div className={style["recommend"]} onClick={this.props.handleRemove.bind(this,true,it.conceptId)}>
           <img className={style["deleteIconNo"]} src={deleteIconNo} />
           <img className={style["deleteIcon"]} src={deleteIcon} />

+ 7 - 7
src/components/AssessResult/index.less

@@ -34,10 +34,10 @@
   }
   li {
     line-height: 35px;
-    .row{
+    /*.row{
       display: inline-block;
       max-width: 86%;
-    }
+    }*/
     .results{
       position: relative;
     }
@@ -50,18 +50,18 @@
       }
     }
     .s-title{
-      display: inline-block;
+      /*display: inline-block;
       max-width: 100px;
-      vertical-align: top;
+      vertical-align: top;*/
     }
     .scale{
-      display: inline-block;
+      /*display: inline-block;*/
       color: @blue;
-      white-space: nowrap;
+      /*white-space: nowrap;
       max-width: 100%;
       overflow: hidden;
       text-overflow: ellipsis;
-      vertical-align: top;
+      vertical-align: top;*/
     }
     .blue{
       color:#3B9ED0;