tmp

src/components/Treat/index.jsx

@@ -30,6 +30,7 @@ class Treat extends Component {
     
     hideTreat() {
         const { hideTreat,clearTreat, hideDrugInfo } = this.props;
+        
         clearTreat && clearTreat();
         hideTreat && hideTreat();
         hideDrugInfo && hideDrugInfo();
@@ -56,7 +57,7 @@ class Treat extends Component {
     render(){
         const {setDrugInfoMore,treatIndex,treatIndexSet, generalTreat, treatment, treatItem, surgeryTreat, lastTreat, selectDrug, drugInfo, treatDesc, setOtherRecommend, setDrugInfo, showDrug, showDrugInfo,hideDrugInfo, title, drugInfoList, hideDrugInfoMore, adversReactionList, changeReact} = this.props;
         const { zIndex,show } = this.state
-        {console.log('adversReactionListadversReactionList11', adversReactionList)}
+        // {console.log('adversReactionListadversReactionList11', adversReactionList)}
         return(
             <div   className={style['treat-wrapper']}>
                 <div className={style['treat-mask']} onClick={this.hideTreat}>

src/store/actions/mainSuit.js

@@ -677,7 +677,7 @@ export const clearMainSuit = (state,action)=>{//回读和清除
   if(action.symptomFeature !== undefined){//清除分词数据
     res.symptomFeature.featureData = action.symptomFeature;
   }
-  console.log(res,action);
+  // console.log(res,action);
   return res;
 }
 

src/store/async-actions/historyTemplates.js

@@ -10,7 +10,7 @@ export const initItemList = (item) => {
     const param = {
       "hospitalId": state.hospitalId,
       "patientId": state.patientId,
-      "disName":item?item.name : 'bbb',
+      "disName":item?item.name : 'dis',
       "disType":item?1:0
     }
     return (dispatch) => {

src/utils/tools.js

@@ -764,36 +764,48 @@ function getPageLength(event) {     //兼容ie8获取页面距离左和上的距
   return page;
 }
 function dragBox(domWrap,domDrag){
+  console.log(domWrap,domDrag,'拖拽')
   let drag = document.getElementById(domDrag);//拖拽区域
   let wrap = document.getElementById(domWrap);//被拖拽的元素
+  let wrapHeight = wrap.offsetHeight;//被拖拽的元素高度
+  let wrapWidth = wrap.offsetWidth;//被拖拽的元素高度
   let width = window.innerWidth||document.documentElement.clientWidth||document.body.clientWidth;//屏幕宽度
   let height = window.innerHeight||document.documentElement.clientHeight||document.body.clientHeight;//屏幕高度
   let mouseX = 0,mouseY = 0,dragX = 0,dragY = 0,isDrag = false,isMove = false;
-  windowEventHandler('mousedown',(event)=>{    //鼠标位置获取，计算点击位置到拖拽元素左边的距离
-    let wrap = document.getElementById(domWrap);
+  windowEventHandler('mousedown',function(event){    //鼠标位置获取，计算点击位置到拖拽元素左边的距离
     let page = getPageLength(event);
-    drag = document.getElementById(domDrag);
     mouseX = page.pageX - wrap.offsetLeft      //鼠标到拖拽元素的左边界的距离
     mouseY = page.pageY - wrap.offsetTop       //鼠标到拖拽元素的上边界的距离
     isDrag = true
-    isMove = false
+    // isMove = false
   },drag)
   // windowEventHandler('mousemove',handleMove,document)
-  windowEventHandler('mousemove',(event)=>{      //移动的
+  windowEventHandler('mousemove',handleMove,document)
+  windowEventHandler('mouseup',()=>{
+    // if(isMove){ //有move就设置位置没有移动就不处理
+    //   console.log(dragX)
+    //   wrap.style.left = dragX + 'px'
+    //   wrap.style.top = dragY + 'px'
+    // }
+    isDrag = false
+    return false
+  },drag)
+
+  function handleMove(event){      //移动的
     let dragDes = document.getElementById('treatDescBox');//展開区域
     let page = getPageLength(event);
     let maxDragX = 0,dragDesWidth = 0;
-    let maxDragY = height - wrap.offsetHeight;//最大可拖拽y方向距离
-
+    let maxDragY = height - wrapHeight;//最大可拖拽y方向距离
+  
     if(domDrag == 'dragTreatTitle'){//最大可推拽x方向距离
       if(dragDes != null){
         dragDesWidth = dragDes.offsetWidth
       }else{
         dragDesWidth = 0
       }
-      maxDragX = width - wrap.offsetWidth - dragDesWidth
+      maxDragX = width - wrapWidth - dragDesWidth
     }else{
-      maxDragX = width - wrap.offsetWidth
+      maxDragX = width - wrapWidth
     }
     if(isDrag){
       dragX = page.pageX - mouseX          //鼠标可拖拽到左边的最大距离
@@ -805,36 +817,25 @@ function dragBox(domWrap,domDrag){
         dragY = 0
       }
       if(domDrag == 'dragTreatTitle'){
-        if(width-dragX-dragDesWidth < wrap.offsetWidth){    //不能超出右边界
+        if(width-dragX-dragDesWidth < wrapWidth){    //不能超出右边界
           dragX = maxDragX
         }
       }else{
-        if(width-dragX < wrap.offsetWidth){    //不能超出右边界
+        if(width-dragX < wrapWidth){    //不能超出右边界
           dragX = maxDragX
         }
       }
-      if(height-dragY < wrap.offsetHeight){     //不能超出下边界
+      if(height-dragY < wrapHeight){     //不能超出下边界
         dragY = maxDragY
       }
-      isMove = true
+      // isMove = true
       wrap.style.left = dragX + 'px'
       wrap.style.marginLeft = 0 + 'px'
       wrap.style.top = dragY + 'px'
     }
-  },document)
-  windowEventHandler('mouseup',()=>{
-    // if(isMove){ //有move就设置位置没有移动就不处理
-      // console.log(dragX)
-      // wrap.style.left = dragX + 'px'
-      // wrap.style.top = dragY + 'px'
-    // }
-    isDrag = false
-    return false
-  },document)
+  }
 }
-// function handleMove(event,mouseX){
-//     console.log(event)
-// }
+
 function getCurrentDate(){
   let myDate = new Date();
   let year = myDate.getFullYear();       //获取完整的年份(4位,1970-????)