Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css =================================================================== diff -u -r27260 -r27423 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css (.../style.css) (revision 27260) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css (.../style.css) (revision 27423) @@ -54,9 +54,9 @@ .data-table{position:absolute; width:1160px; height:485px; bottom:150px; left:33px} .data-table .box{ height:500px; overflow-y:scroll; overflow-x:hidden;} .data-table .box table{ margin:0 45px; width:1045px} -.data-table .input-a{ background:url(pic_bg.jpg) no-repeat 0 -206px; border:none; width:349px; height:62px; font-size:26px; padding:0 10px; line-height:40px;} -.data-table .input-a-yellow{ background:url(pic_bg2.png) no-repeat 0 -2px; border:none; width:335px; height:62px; font-size:26px; padding:0 2px; line-height:40px;} -.data-table .input-b{ background:url(pic_bg.jpg) no-repeat -246px 0; border:none; width:52px; height:62px; font-size:26px; padding:0 5px; line-height:40px;} +.data-table .input-a{ background:url(pic_bg.jpg) no-repeat 0 -206px; border:none; width:349px; height:62px; font-size:26px; padding:0 10px; line-height:62px;line-height:62px\9;} +.data-table .input-a-yellow{ background:url(pic_bg2.png) no-repeat 0 -2px; border:none; width:335px; height:62px; font-size:26px; padding:0 2px; line-height:62px;line-height:62px\9;} +.data-table .input-b{ background:url(pic_bg.jpg) no-repeat -246px 0; border:none; width:52px; height:62px; font-size:26px; padding:0 5px; line-height:62px;line-height:62px\9;} .data-table .add{ background:url(pic_bg.jpg) no-repeat -318px 0; width:44px; height:64px; display:block; line-height:200px; overflow:hidden;} .data-table .add:hover{ background-position:-318px -64px} .data-table .minus{ background:url(pic_bg.jpg) no-repeat -367px 0px; width:44px; height:64px; display:block; line-height:200px; overflow:hidden;} Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r27416 -r27423 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 27416) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 27423) @@ -1000,9 +1000,13 @@ var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight); var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio); - document.body.style.zoom = 1; - documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio; + var isLessIE11 = navigator.userAgent.indexOf('compatible') > -1 && navigator.userAgent.indexOf('MSIE') > -1; + if(!isLessIE11){ + document.body.style.zoom = 1; + documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio; + } + width = size.width; height = size.height; offsetTop = offsetTop*zoomRatio; @@ -1665,8 +1669,12 @@ var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio); var errorRemark = $('#hiddenErrorRemark'+row).val(); - document.body.style.zoom = 1; - documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio; + var isLessIE11 = navigator.userAgent.indexOf('compatible') > -1 && navigator.userAgent.indexOf('MSIE') > -1; + + if(!isLessIE11){ + document.body.style.zoom = 1; + documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio; + } width = size.width; height = size.height; @@ -1720,8 +1728,12 @@ var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight); var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio); - document.body.style.zoom = 1; - documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio; + var isLessIE11 = navigator.userAgent.indexOf('compatible') > -1 && navigator.userAgent.indexOf('MSIE') > -1; + + if(!isLessIE11){ + document.body.style.zoom = 1; + documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio; + } width = size.width; height = size.height; @@ -1918,7 +1930,6 @@ } function openRecyclingDamagePage(row,tousseName,tousseItemId,errorDamageQmKey){ - var tousseType = $('#tousseType' + row).val(); if(tousseType == '外来器械包'){ alertDiv("外来器械包不能添加报损项!"); @@ -1945,12 +1956,15 @@ var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight); var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio); - document.body.style.zoom = 1; - documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio; + var isLessIE11 = navigator.userAgent.indexOf('compatible') > -1 && navigator.userAgent.indexOf('MSIE') > -1; + + if(!isLessIE11){ + document.body.style.zoom = 1; + documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio; + } width = size.width; height = size.height; - offsetTop = offsetTop*zoomRatio; layerIndex=layer.open({ type : 2, @@ -1959,7 +1973,7 @@ +'&row='+row+'&tousseDefinitionID='+$('#tousseDefinitionID'+row).val()+'&tousseName='+tousseName +'&tousseItemId='+tousseItemId+'&tousseCount='+$('#recycleAmount'+row).attr('value') +'&recordType=' + params_recordType - +'&depart='+depart+'&departCode='+departCode+ '&damageRemark=' + damageRemark + +'&depart='+encodeURI(depart)+'&departCode='+departCode+ '&damageRemark=' + damageRemark +'&errorDamageQmKey=' + errorDamageQmKey, area : [ width + 'px' , height +heightExtra + 'px'], border : [5, 0.3, '#fff', true], @@ -2073,8 +2087,12 @@ var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight); var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio); - document.body.style.zoom = 1; - documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio; + var isLessIE11 = navigator.userAgent.indexOf('compatible') > -1 && navigator.userAgent.indexOf('MSIE') > -1; + + if(!isLessIE11){ + document.body.style.zoom = 1; + documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio; + } width = size.width; height = size.height; @@ -2107,8 +2125,12 @@ var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight); var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio); - document.body.style.zoom = 1; - documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio; + var isLessIE11 = navigator.userAgent.indexOf('compatible') > -1 && navigator.userAgent.indexOf('MSIE') > -1; + + if(!isLessIE11){ + document.body.style.zoom = 1; + documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio; + } width = size.width; height = size.height; @@ -3907,8 +3929,12 @@ var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight); var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio); - document.body.style.zoom = 1; - documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio; + var isLessIE11 = navigator.userAgent.indexOf('compatible') > -1 && navigator.userAgent.indexOf('MSIE') > -1; + + if(!isLessIE11){ + document.body.style.zoom = 1; + documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio; + } width = size.width; height = size.height; @@ -3946,8 +3972,12 @@ var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight); var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio); - document.body.style.zoom = 1; - documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio; + var isLessIE11 = navigator.userAgent.indexOf('compatible') > -1 && navigator.userAgent.indexOf('MSIE') > -1; + + if(!isLessIE11){ + document.body.style.zoom = 1; + documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio; + } var width = 980; var height = 330; @@ -3994,8 +4024,12 @@ var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight); var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio); - document.body.style.zoom = 1; - documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio; + var isLessIE11 = navigator.userAgent.indexOf('compatible') > -1 && navigator.userAgent.indexOf('MSIE') > -1; + + if(!isLessIE11){ + document.body.style.zoom = 1; + documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio; + } width = size.width; height = size.height; @@ -4134,8 +4168,12 @@ var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight); var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio); - document.body.style.zoom = 1; - documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio; + var isLessIE11 = navigator.userAgent.indexOf('compatible') > -1 && navigator.userAgent.indexOf('MSIE') > -1; + + if(!isLessIE11){ + document.body.style.zoom = 1; + documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio; + } width = size.width; height = size.height; @@ -4230,11 +4268,15 @@ width = 1100; height = 860; } - var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight); + var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight); var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio); - document.body.style.zoom = 1; - documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio; + var isLessIE11 = navigator.userAgent.indexOf('compatible') > -1 && navigator.userAgent.indexOf('MSIE') > -1; + + if(!isLessIE11){ + document.body.style.zoom = 1; + documentGetElementsByClassName('mbody')[0].style.zoom = zoomRatio; + } width = size.width; height = size.height;