bug

src/components/AssistCheck/index.jsx

@@ -177,10 +177,10 @@ class AssistCheck extends React.Component {
                     </div> */}
                     {
                       hospitalMsg.import_way_pacs == 1 ? <div className={styles.pushButton} disabled={ieVersion && ieVersion > 9 ? true : false} onClick={ieVersion && ieVersion <= 9 ? null : this.handleImportExcel}>
-                        导入辅检结果
+                        <p className={styles.importInspectBtn}>导入辅检结果</p>
                         <input type="file" name="uploadfile" id="choose" style={{ display: 'none' }} ref={(DOM) => this.inputRef = DOM} />
                       </div> : hospitalMsg.import_way_pacs == 2 ? <div className={styles.pushButton} disabled={ieVersion && ieVersion > 9 ? true : false} onClick={checkSystemIpt}>
-                        导入辅检结果
+                        <p className={styles.importInspectBtn}>导入辅检结果</p>
                       </div> : hospitalMsg.import_way_pacs == 3 ? <div className={`${styles.pushButton} ${styles.importInspect}`} onClick={showSlideImport}>
                         <p id="importExcelBtns" className={styles.importInspectBtn}>导入辅检结果</p>
                         {

src/components/AssistCheck/index.less

@@ -26,7 +26,7 @@
 }
 .pushButton {
     float: right;
-    width: 90px;
+    // width: 90px;
     height: 28px;
     line-height: 28px;
     border: 1px solid @template-color;

src/components/EmergencyProcedure/EmergencyModal/index.jsx

@@ -10,7 +10,8 @@ import pic5 from '../img/pic5.png'
 import $ from 'jquery'
 import { dragBox } from '@utils/drag';
 import close from '@common/images/icon_close.png';
-
+import {windowEventHandler} from '@utils/tools';
+let a = 0
 class EmergencyModal extends React.Component{
   constructor(props){
     super(props)
@@ -33,6 +34,10 @@ class EmergencyModal extends React.Component{
         }
       }
     });
+    // const {windowHeight} = this.props;
+    // windowEventHandler('resize', ()=>{
+    //   $("#preImg").css("height",(windowHeight-120)+'px')
+    // });
   }
   handleSlideShow(){
     let flg = this.state.show
@@ -45,9 +50,9 @@ class EmergencyModal extends React.Component{
   handleImgShow(flg){
     this.setState({imgShow:flg},()=>{
       if(flg){
-        dragBox('dragModalWrap','dragModalTitle','add')
+        dragBox('dragModalWrap','dragModalTitle','add',false,true)
       }else{
-        dragBox('dragModalWrap','dragModalTitle','del')
+        dragBox('dragModalWrap','dragModalTitle','del',false,false)
       }
     })
   }
@@ -56,10 +61,10 @@ class EmergencyModal extends React.Component{
     return <div className={styles.emergencyProdure} style={{display:show?'block':'none'}}>
       <div className={`${styles.modalTop} clearfix`}>
           <div className={styles.modalTopL}>
-            <img onClick={()=>handleShow(false)} src={small} alt=""/>
+            <img className={styles.imgs} onClick={()=>handleShow(false)} src={small} alt=""/>
             <p className="ellipsOver">{data.emergencyname}</p>
             {
-              idx == 0?null:<img src={pic} onClick={()=>{this.handleImgShow(true)}} alt=""/>
+              idx == 0?null:<img className={styles.imgs} src={pic} onClick={()=>{this.handleImgShow(true)}} alt=""/>
             }
             {
               this.state.imgShow?<React.Fragment>
@@ -68,7 +73,7 @@ class EmergencyModal extends React.Component{
                   <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 id="preImg" 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

@@ -27,7 +27,7 @@
       text-overflow: ellipsis;
       white-space: nowrap;
     }
-    img {
+    .imgs {
       position: relative;
       top: -17px;
     }
@@ -88,19 +88,22 @@
     z-index: 500;
     width: 1000px;
     padding-top: 30px;
+    box-sizing: border-box;
     margin-left: -500px;
     // margin-top: -400px;
     // height: 800px;
     // top: 50%;
     left: 50%;
-    top: 7%;
-    bottom: 7%;
+    top: 60px;
+    bottom: 60px;
     .emergencyImg{
       height: 100%;
       width: 100%;
-      float: left;
-      top: 0;
       position: relative;
+      float: left;
+      // position: absolute;
+      // left: 50%;
+      // transform: translateX(-50%);
     }
   }
   .dragImgWrap {

src/components/EmergencyProcedure/index.jsx

@@ -36,7 +36,7 @@ class EmergencyProcedure extends React.Component {
     !type&&this.slideToggle(0)
   }
   render(){
-    const {data,setDataIdx,idx} = this.props;
+    const {data,setDataIdx,idx,windowHeight} = this.props;
     const domNode = document.getElementById('root');
     return ReactDom.createPortal(<div className={styles.emergencyProdureWrap}>
       <div id="emergencyWrap" className={styles.emergencyWrap}>
@@ -46,7 +46,7 @@ class EmergencyProcedure extends React.Component {
         <i onClick={()=>this.slideToggle(0)} id="emergencyPic"><img src={right} alt=""/></i>
       </div>
       {
-        <EmergencyModal idx={idx} handleShow={()=>this.handleShow()} setDataIdx={setDataIdx} show={this.state.show} data={data}></EmergencyModal>
+        <EmergencyModal windowHeight={windowHeight} idx={idx} handleShow={()=>this.handleShow()} setDataIdx={setDataIdx} show={this.state.show} data={data}></EmergencyModal>
       }
     </div>,domNode)
   }

src/components/PushItems/index.jsx

@@ -160,7 +160,7 @@ class PushItems extends Component {
       tipsDetails,
       tmpFlg,
     } = this.props.pushMessage;
-    const { tipsDiscalimer,chronicPushItems,wholeIndexs,setPushEmergencyIdx,sysConfig} = this.props;
+    const { tipsDiscalimer,chronicPushItems,wholeIndexs,setPushEmergencyIdx,sysConfig,windowHeight} = this.props;
     const {
       billing,
       changeCheck,
@@ -281,7 +281,7 @@ class PushItems extends Component {
             tipsDetails = {tipsDetails}/>}
             
             {
-              (setPushEmergencyIdx+'')&&(sysConfig.emergency_show==1)&&<EmergencyProcedure data={dataLis[this.state.idx]||dataLis[setPushEmergencyIdx]} idx={this.state.idx||setPushEmergencyIdx} setDataIdx={this.setDataIdx}></EmergencyProcedure>
+              (setPushEmergencyIdx+'')&&(sysConfig.emergency_show==1)&&<EmergencyProcedure windowHeight={windowHeight} data={dataLis[this.state.idx]||dataLis[setPushEmergencyIdx]} idx={this.state.idx||setPushEmergencyIdx} setDataIdx={this.setDataIdx}></EmergencyProcedure>
             }
       </div>
     );

src/containers/Emergency.js

@@ -13,7 +13,7 @@ const mapStateToProps = function(state){
     total:emergencyHis.total,
     params:emergencyHis.params,
     preInfo : state.patInfo.message,
-    searchData:emergencyHis.searchData
+    searchData:emergencyHis.searchData,
   }
 }
 

src/containers/PushItemsContainer.js

@@ -17,7 +17,8 @@ function mapStateToProps(state) {//console.log(state)
         showList: pushMessage.showList,
         chronicPushItems: pushMessage.chronicPushItems,
         setPushEmergencyIdx: state.pushMessage.setPushEmergencyIdx || '',  
-        sysConfig:state.homePage.sysConfig
+        sysConfig:state.homePage.sysConfig,
+        windowHeight:state.homePage.windowHeight,
     }
 }
 

src/utils/drag.js

@@ -81,7 +81,7 @@ function handleUp(){
  * @param {拖动元素/清除拖动事件监听} type add:添加事件监听  del:移除事件监听
  * @param {展开元素id} addDom 
  */
-function dragBox(dragWrap,dragTop,type,addDom) {
+function dragBox(dragWrap,dragTop,type,addDom,img) {
   let drag = $("#"+dragTop); //拖拽区域
   let wrap = $("#"+dragWrap); //被拖拽的元素
   width = getWindowInnerWidth(); 
@@ -93,6 +93,11 @@ function dragBox(dragWrap,dragTop,type,addDom) {
     $(document).off('mouseup', handleUp)
   } else {
     drag.on('mousedown', function (event) {
+      let lenHeight = wrap.height()
+      console.log(lenHeight,78787)
+      if(img){
+        $("#preImg").css("height",(lenHeight)+'px')
+      }
       let page = getPageCoordinate(event, '0');
       mouseX = page.boxLeft - wrap.offset().left; //鼠标到拖拽元素的左边界的距离
       mouseY = page.boxTop - wrap.offset().top; //鼠标到拖拽元素的上边界的距离

src/utils/tools.js

@@ -6,7 +6,7 @@ import {CLEARCHECKBODY} from '@store/types/checkBody';
 import {clearAssistData,addAssistLabel} from '@store/actions/assistCheck';
 import {clearAllLabel,addLabel} from '@store/actions/inspect';
 import {CLEAR_ALL_DIAG} from '@store/types/diagnosticList';
-import {CLEAR_ALL_PUSH_MESSAGE, SET_TIPS} from '@store/types/pushMessage';
+import {CLEAR_ALL_PUSH_MESSAGE, SET_TIPS,BILLING_ADVICE} from '@store/types/pushMessage';
 import {ISREAD, SETREADDITEMS} from "../store/types/homePage";
 import {CLEAR_FIRST_MAIN_DIAG, CLEAR_ALL_TREAT} from "../store/types/treat";
 import {tabChange} from '@store/actions/tabTemplate';
@@ -15,6 +15,7 @@ import config from '@config/index.js';
 import up from '@images/up.png';
 import down from '@images/down.png';
 
+
 /***
  * 工具函数
  *
@@ -265,6 +266,18 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
         store.dispatch({
           type: CLEAR_ASSESS_RESULT_VALUE,
         });
+        store.dispatch({//推送重置
+          type: BILLING_ADVICE,
+          determine:[],
+          doubt:[],
+          possible:[],
+          vigilant: [],
+          likely:[],
+          lab: [],
+          pacs:[],
+          setPushEmergency:[],
+          setPushEmergencyIdx:''
+        });
         storageLocal.remove('emrParam');
        // Notify.success('页面已清空')
     }else{