Merge branch 'optimize' of http://192.168.2.236:10080/zhouna/newICSS into optimize

src/components/ChronicInfo/index.jsx

@@ -520,8 +520,8 @@ class ChronicInfo extends React.Component{
                                 handleConfirm={this.comfirnTable}/>;
     if(data&&data.length>0){
       return <div className={style["tips"]} style={{marginBottom:'15px'}}>
-        <div className={`${style["tips-title"]} ${style["chronic"]}`}>
-          <div className={style["tips-name"]} onClick={this.slideToggle}>
+        <div className={`${style["tips-title"]} ${style["chronic"]}`} onClick={this.slideToggle}>
+          <div className={style["tips-name"]}>
             <img src={chronicPic} />
             <h2>{chronicMagItem&&chronicMagItem.name||chronicDesease&&chronicDesease.name||'病情提示'}<span className={style["redTips"]}>(页面信息有更新可能影响评估结果)</span></h2>
           </div>

src/components/EmergencyProcedure/EmergencyModal/index.jsx

@@ -8,6 +8,8 @@ import pic3 from '../img/pic3.png'
 import pic4 from '../img/pic4.png'
 import pic5 from '../img/pic5.png'
 import $ from 'jquery'
+import { dragBox } from '@utils/drag';
+import close from '@common/images/icon_close.png';
 
 class EmergencyModal extends React.Component{
   constructor(props){
@@ -41,7 +43,13 @@ class EmergencyModal extends React.Component{
     this.props.setDataIdx(num)
   }
   handleImgShow(flg){
-    this.setState({imgShow:flg})
+    this.setState({imgShow:flg},()=>{
+      if(flg){
+        dragBox('dragModalWrap','dragModalTitle','add')
+      }else{
+        dragBox('dragModalWrap','dragModalTitle','del')
+      }
+    })
   }
   render(){
     const {data,handleShow,setDataIdx,idx,show} = this.props;
@@ -56,8 +64,12 @@ class EmergencyModal extends React.Component{
             {
               this.state.imgShow?<React.Fragment>
                 <div className={styles.imageModalWrap} onClick={()=>{this.handleImgShow(false)}}></div>
-                <div className={styles.imageModal}>
-                  <img src={idx==1?pic1:idx==2?pic2:idx==3?pic3:idx==4?pic4:idx==5?pic5:null} alt=""/>
+                <div className={styles.imageModal} id="dragModalWrap">
+                  <div id="dragModalTitle" className={`${styles.dragImgWrap} drag-title`}>
+                    {data.emergencyname}
+                  </div>
+                  <img className={styles.emergencyImg} src={idx==1?pic1:idx==2?pic2:idx==3?pic3:idx==4?pic4:idx==5?pic5:null}/>
+                  <img className={styles.img} src={close} onClick={()=>{this.handleImgShow(false)}} />
                 </div>
               </React.Fragment>:null
             }

src/components/EmergencyProcedure/EmergencyModal/index.less

@@ -83,27 +83,42 @@
   }
   .imageModal {
     position: fixed;
-    top: 7%;
-    bottom: 7%;
-    // height: 86%;
     background-color: #fff;
     overflow: hidden;
     z-index: 500;
     width: 1000px;
+    padding-top: 30px;
     margin-left: -500px;
-    // margin-top: -420px;
-    // height: 840px;
-    // transform: translateX(-50%);
-    left: 50%;
+    // margin-top: -400px;
+    // height: 800px;
     // top: 50%;
-    img{
-      // width: 100%;
+    left: 50%;
+    top: 7%;
+    bottom: 7%;
+    .emergencyImg{
       height: 100%;
-      position: absolute;
-      left: 50%;
-      transform: translateX(-50%);
-      // float: left;
+      width: 100%;
+      float: left;
       top: 0;
+      position: relative;
     }
   }
+  .dragImgWrap {
+    width: 100%;
+    height: 30px;
+    line-height: 36px;
+    text-indent: 1em;
+    z-index: 502;
+    background-color: transparent;
+    position: absolute;
+    top: 0;
+    left: 0;
+  }
+  img.img{
+    cursor: pointer;
+    position: absolute;
+    top: 6px;
+    right: 10px;
+    z-index: 800;
+  }
 }

src/components/EmergencyProcedure/EmergencyPart/PartSec/index.jsx

@@ -241,7 +241,7 @@ class PartSec extends React.Component{
     return <div className={`${styles.partSec} ${styles.partPub} clearfix`} style={{borderBottom:idx==1?'0':null}}>
       {
         data.select.map((item,idx)=>{
-          return <div className={`${idx == 0?styles.commonBtn:styles.emergencyBtn} ${styles.btn}`}>{item}</div>
+          return <div className={`${idx == 0&&data.select.length>1?styles.commonBtn:styles.emergencyBtn} ${styles.btn}`}>{item}</div>
         })
       }
       <p>步骤2</p>

src/components/EmergencyProcedure/EmergencyPart/PartTrd/index.jsx

@@ -255,7 +255,7 @@ class PartTrd extends React.Component {
               <div className={`${styles.goDownPub} ${styles.goDownB}`}>
                 <span>收入ICU</span>
               </div>
-              <h4>生命体征稳定建议检查CTAP（肺动脉造影）</h4>
+              <h4>生命体征稳定建议检查CTPA（肺动脉造影）</h4>
               <h4>建议检查肺动脉增强CT</h4>
               <div className={`${styles.hold}`}>
                 <span className={styles.holdLeft}>阳性</span>

src/components/EmergencyProcedure/emergency.js

@@ -159,7 +159,7 @@ let data = [
       step2:{//步骤2
         waring:'检查X线或者CT检查',
         tips:'',
-        select:['普通心内会诊','紧急心内会诊'],//按钮
+        select:['胸外科会诊'],//按钮
         items:[
           {
             actionname:'气胸患者',
@@ -252,7 +252,7 @@ let data = [
                     link:''
                   },
                   {
-                    message:'生命体征稳定建议检查CTAP（肺动脉造影）',
+                    message:'生命体征稳定建议检查CTPA（肺动脉造影）',
                     text:'建议检查肺动脉增强CT',
                     link:''
                   },

src/components/EmergencyProcedure/index.jsx

@@ -16,15 +16,15 @@ class EmergencyProcedure extends React.Component {
   
   slideToggle(type){
     if(type){
-      $("#emergencyName").css({"display":"block","paddingLeft":"50px","paddingRight":"30px"})
+      $("#emergencyName").css({"display":"block"})
       $("#emergencyPic").css("display","block")
       $("#emergencys").css("display","none")
       $("#emergency").css("display","block")
-      $("#emergencyWrap").css({"width":"auto","height":"44px"})
+      $("#emergencyWrap").css({"width":"auto","height":"44px","paddingLeft":"50px","paddingRight":"30px"})
     }else{
       $("#emergencyName").css({"display":"none","padding":"0"})
       $("#emergencyPic").css("display","none")
-      $("#emergencyWrap").css({"width":"44px","height":"44px"})
+      $("#emergencyWrap").css({"width":"44px","height":"44px","padding":"0"})
       $("#emergencys").css("display","block")
       $("#emergency").css("display","none")
     }

src/components/EmergencyProcedure/index.less

@@ -11,17 +11,18 @@
     z-index: 205;
     top: 55px;
     right: 20px;
-    width: 44px;
+    width: auto;
     height: 44px;
     line-height: 44px;
     border-radius: 22px;
     border: 2px solid #F93333;
     background-color: #fff;
+    padding-left: 50px;
+    padding-right: 30px;
     cursor: pointer;
-
     .emergencyName {
       overflow: hidden;
-      display: none;
+      display: block;
     }
 
     i {
@@ -30,7 +31,6 @@
       right: 10px;
       width: 22px;
       height: 40px;
-
       img {
         position: relative;
         top: 6px;

src/components/MedicalInfo/index.jsx

@@ -21,13 +21,15 @@ class MedicalInfo extends Component {
     }
     getSearchList() {
         const { getAllConceptDetail,searchResult } = this.props;
+        let showDtl = false;
         return searchResult && searchResult.map((item) => {
+          showDtl = item.type=='51'
           return <li key={item.conceptId}
                      title='点击查看详情'
                      onClick={() => getAllConceptDetail({name: item.name, type: item.type, uname: item.uniqueName})}>
-            <span>{item.name}</span>
+            <span>{item.name} {showDtl?"("+item.retrievalName+")":""}</span>
             <i>( {item.libTypeName} )</i>
-            {item.retrievalName?<p>• {item.retrievalName}</p>:''}
+            {item.retrievalName&&!showDtl?<p>• {item.retrievalName}</p>:''}
             {/*<button>查看</button>*/}
           </li>;
             });

src/components/PushItems/DetailsModal/index.jsx

@@ -72,18 +72,22 @@ class DetailsModal extends Component {
                             
                         </div>
                         <div className={styles['content-menu-box']}>
-                            <div className={styles['content-menu']}>
-                                {tipsDetails && tipsDetails.details && tipsDetails.details.map((item, index) => {
-                                        return (<div>
-                                            <div className={styles['details-menu-title-box']}>
-                                                {index === 0 ? '' : <div className={styles['details-content-menu-line']}></div>}
-                                                <span onClick={this.handleClickMenu.bind(this, index, item, tipsDetails)} className={styles['details-content-menu-name']} style = {index === currentIndex ? {color:'#0089be'} : ''}>
-                                                    <span className={styles['details-content-menu-circle']} style = {index === currentIndex ? {background:'#0089be'} : ''}></span>{item.title}
-                                                </span>
-                                            </div>
-                                        </div>)
-                                    })}
+                            <div className={styles['content-menu-wrapper']}>
+                                <div className={styles['content-menu']}>
+                                    {tipsDetails && tipsDetails.details && tipsDetails.details.map((item, index) => {
+                                            return (<div>
+                                                <div className={styles['details-menu-title-box']}>
+                                                    {index === 0 ? '' : <div className={styles['details-content-menu-line']}></div>}
+                                                    <span onClick={this.handleClickMenu.bind(this, index, item, tipsDetails)} className={styles['details-content-menu-name']} style = {index === currentIndex ? {color:'#0089be'} : ''}>
+                                                        <span className={styles['details-content-menu-circle']} style = {index === currentIndex ? {background:'#0089be'} : ''}></span>{item.title}
+                                                    </span>
+                                                </div>
+                                            </div>)
+                                        })}
+                                </div>
+
                             </div>
+                            
                         </div>
                             
                     </div>

src/components/PushItems/DetailsModal/index.less

@@ -5,6 +5,9 @@
     left: 0;
     top: 0;
     z-index: 205;
+    img {
+        max-width: 100%;
+    }
 }
 
 .details-content-wrapper {

src/components/PushItems/index.jsx

@@ -186,25 +186,24 @@ class PushItems extends Component {
             )}
             {/* 不展示确诊 */}
             {/* {determine && determine.length>0 && <PushDiag titleBg='#FAEBEC' icon={possibleImg} title='确诊' diagList={determine} maxShowNum={28}/>} */}
-            {possible && possible.length > 0 && (
+            {doubt && doubt.length > 0 && (
               <PushDiag
                 titleBg="#FAEBEC"
-                icon={possibleImg}
-                title="可能诊断"
-                diagList={possible}
+                icon={doubtImg}
+                title="初步诊断"
+                diagList={doubt}
                 maxShowNum={24}
               />
             )}
-            {doubt && doubt.length > 0 && (
+            {possible && possible.length > 0 && (
               <PushDiag
                 titleBg="#FAEBEC"
-                icon={doubtImg}
-                title="初步诊断"
-                diagList={doubt}
+                icon={possibleImg}
+                title="可能诊断"
+                diagList={possible}
                 maxShowNum={24}
               />
             )}
-            
             {likely && likely.length > 0 && (
               <PushDiag
                 titleBg="#FAEBEC"
@@ -224,7 +223,7 @@ class PushItems extends Component {
                   <div className={style["doubt"]}>
                     <h1>
                       <img src={doubtImg} />
-                      疑似诊断
+                      初步诊断
                     </h1>
                     <div className={style["no-push"]}>无</div>
                   </div>

src/components/TreatDesc/DrugInfo/index.less

@@ -11,6 +11,7 @@
     padding: 40px 0 60px;
     box-shadow: 0px 0px 5px -2px #7d7c7c;
     word-break: break-all;
+    max-width: 100%;
 }
 .drug-desc-wrapper {
     height: 100%;

src/utils/drag.js

@@ -21,7 +21,7 @@ let width = '',//屏幕宽度
 /**
  * 
  * @param {事件对象} event 
- * @param {被拖动的元素} dragModalWrap 
+ * @param {被拖动的元素} dragModalWrap
  * @param {可拖动的区域} dragModalTitle 
  */
 function handleMove(event) {
@@ -65,6 +65,7 @@ function handleMove(event) {
       marginLeft: 0 + 'px',
       marginTop: 0 + 'px',
       top: dragY + 'px',
+      bottom:'auto',
       right:'inherit',
     })
   }