Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r27343 -r27355 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 27343) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 27355) @@ -948,6 +948,10 @@ } var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight); var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio); + + document.body.style.zoom = 1; + document.getElementsByClassName('mbody')[0].style.zoom = zoomRatio; + width = size.width; height = size.height; offsetTop = offsetTop*zoomRatio; @@ -1539,6 +1543,9 @@ var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight); var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio); var errorRemark = $('#hiddenErrorRemark'+row).val(); + + document.body.style.zoom = 1; + document.getElementsByClassName('mbody')[0].style.zoom = zoomRatio; width = size.width; height = size.height; @@ -1591,6 +1598,9 @@ } var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight); var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio); + + document.body.style.zoom = 1; + document.getElementsByClassName('mbody')[0].style.zoom = zoomRatio; width = size.width; height = size.height; @@ -1813,6 +1823,9 @@ } var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight); var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio); + + document.body.style.zoom = 1; + document.getElementsByClassName('mbody')[0].style.zoom = zoomRatio; width = size.width; height = size.height; @@ -1938,6 +1951,9 @@ } var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight); var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio); + + document.body.style.zoom = 1; + document.getElementsByClassName('mbody')[0].style.zoom = zoomRatio; width = size.width; height = size.height; @@ -1969,6 +1985,9 @@ } var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight); var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio); + + document.body.style.zoom = 1; + document.getElementsByClassName('mbody')[0].style.zoom = zoomRatio; width = size.width; height = size.height; @@ -3758,11 +3777,15 @@ } var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight); var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio); + + document.body.style.zoom = 1; + document.getElementsByClassName('mbody')[0].style.zoom = zoomRatio; width = size.width; height = size.height; offsetTop = offsetTop*zoomRatio; + layerIndex=layer.open({ type : 2, title : ['添加器械包',true], @@ -3794,6 +3817,9 @@ } var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight); var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio); + + document.body.style.zoom = 1; + document.getElementsByClassName('mbody')[0].style.zoom = zoomRatio; var width = 980; var height = 330; @@ -3839,6 +3865,9 @@ } var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight); var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio); + + document.body.style.zoom = 1; + document.getElementsByClassName('mbody')[0].style.zoom = zoomRatio; width = size.width; height = size.height; @@ -3974,6 +4003,9 @@ } var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight); var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio); + + document.body.style.zoom = 1; + document.getElementsByClassName('mbody')[0].style.zoom = zoomRatio; width = size.width; height = size.height; @@ -4070,6 +4102,9 @@ } var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight); var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio); + + document.body.style.zoom = 1; + document.getElementsByClassName('mbody')[0].style.zoom = zoomRatio; width = size.width; height = size.height; Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/commonRecycle.js =================================================================== diff -u -r26864 -r27355 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/commonRecycle.js (.../commonRecycle.js) (revision 26864) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/commonRecycle.js (.../commonRecycle.js) (revision 27355) @@ -39,7 +39,7 @@ var zoomRatio = 1; if(designedWidth != actualWidth || designedHeight != actualHeight){ var zoomWidthRatio = actualWidth/designedWidth; - var zoomHeightRatio = actualHeight/designedHeight; + var zoomHeightRatio = (actualHeight-50)/designedHeight; if(zoomWidthRatio < 1.0 || zoomHeightRatio < 1.0){ // 需要缩小