弹窗遮挡问题

src/common/components/SearchOption/index.jsx

@@ -50,7 +50,6 @@ class SearchOption extends React.Component {
         })
     }
     handleClearVal(){
-        console.log(12312313);
         const { handleChangeValue } = this.props;
         this.textInput.current.value = '';
         this.textInput.current.focus();

src/components/AddAssistCheck/index.jsx

@@ -6,7 +6,6 @@ import Textarea from './Textarea';
 import AssistName from './AssistName';
 import { getPageCoordinate,getCurrentDate,setPosition, setFontColorSize } from '@utils/tools';
 import ScrollArea from 'react-scrollbar';
-import { autoFillModules } from '../../store/async-actions/fetchModules';
 
 class AddAssistCheck extends React.Component {
   constructor(props) {

src/components/AddInspect/index.jsx

@@ -126,7 +126,6 @@ class Inspect extends React.Component {
   }
   changeShowFill() {
     this.setState({ showFill: false })
-    console.log(123123);
     this.props.setHighter(48)
   }
   handleChangeDate(info) {

src/components/AddNewInspect/index.less

@@ -68,6 +68,7 @@
     } */
 }
 .labelWrap {
+    margin-bottom: 10px;
     .table {
         color: #000;
         width: 80%;

src/components/BlockEmrCont/index.less

@@ -14,11 +14,11 @@
   // min-width: 700px;
   // min-width: 548px;
   width: 1200px;
-  padding-bottom: 80px;
+  padding-bottom: 48px;
 }
 .inner{
   padding-top:20px;
-  padding-bottom: 80px;
+  padding-bottom: 48px;
 }
 .keep {
   position: absolute;

src/utils/tools.js

@@ -1844,16 +1844,19 @@ function setPosition (e,dom,setHighter){
     const $dom = isBlock?$("#EmrBlockContainer"):$("#EmrContainer");
     const wrapHt = $dom.height();//滚动区域高度
     const clickHt = getPageCoordinate(e).boxTop;//点击高度
-    const scrollHt = Math.abs(parseFloat($dom.parent('.scrollarea-content').css('margin-top'))) //滚动区滚动的距离
-    let btmHt = wrapHt-(clickHt-111)-scrollHt;//点击位置距离底部的距离
-    // console.log(wrapHt,clickHt,scrollHt,btmHt,contHt)
-    if(btmHt<contHt){
-      console.log(999)
-      setHighter&&setHighter(contHt-btmHt+100);
+    const scrollHt = Math.abs(parseFloat(document.documentElement.scrollTop || document.body.scrollTop)) //滚动的距离
+    let btmHt = $(window).height()-(clickHt-scrollHt);//点击位置距离底部的距离
+    // console.log('滚动区域高度:',wrapHt,' 点击高度:',clickHt,' 滚动区滚动的距离',scrollHt,'点击距离底部',btmHt,$(e.target).html())
+    if(btmHt<300){
+      if(btmHt<200&&$(e.target).html()=='添加检验项'){
+        setHighter&&setHighter(48);
+      }else{
+        setHighter&&setHighter(400-btmHt);
+      }
+      $(e.target)[0].scrollIntoView();
     }else{
-      setHighter&&setHighter(180);       //标签填写单连续点击弹出，未超出需要恢复
+      setHighter&&setHighter(48);       //标签填写单连续点击弹出，未超出需要恢复
     }
-    $(e.target)[0].scrollIntoView(true);
   },10);
 }