|
@@ -1844,16 +1844,19 @@ function setPosition (e,dom,setHighter){
|
|
const $dom = isBlock?$("#EmrBlockContainer"):$("#EmrContainer");
|
|
const $dom = isBlock?$("#EmrBlockContainer"):$("#EmrContainer");
|
|
const wrapHt = $dom.height();//滚动区域高度
|
|
const wrapHt = $dom.height();//滚动区域高度
|
|
const clickHt = getPageCoordinate(e).boxTop;//点击高度
|
|
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{
|
|
}else{
|
|
- setHighter&&setHighter(180); //标签填写单连续点击弹出,未超出需要恢复
|
|
|
|
|
|
+ setHighter&&setHighter(48); //标签填写单连续点击弹出,未超出需要恢复
|
|
}
|
|
}
|
|
- $(e.target)[0].scrollIntoView(true);
|
|
|
|
},10);
|
|
},10);
|
|
}
|
|
}
|
|
|
|
|