Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp =================================================================== diff -u -r32949 -r39807 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp (.../recyclingErrors.jsp) (revision 32949) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp (.../recyclingErrors.jsp) (revision 39807) @@ -49,6 +49,8 @@ var recyclingUser = '${param.recyclingUser}'; var circuitNurse = '${param.circuitNurse}'; var operationRoom = '${param.operationRoom}'; + var param_width = '${param.width}'; + var param_height = '${param.height}'; //动态加载JS和CSS document.write(''); layer.config({ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.js =================================================================== diff -u -r39128 -r39807 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.js (.../recyclingDamage.js) (revision 39128) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.js (.../recyclingDamage.js) (revision 39807) @@ -365,19 +365,20 @@ //对功能按键的获取 document.onkeydown = banBackSpace; $('#damageRemark').click(function () { - var width = document.body.clientWidth - 100; - var height = document.body.clientHeight - 100; - var offsetTop = 50; + var zoomRatio = calculateZoomRatio(980,700,param_width,param_height); + var width = param_width / zoomRatio -100; + var height = param_height / zoomRatio -100; var url = WWWROOT + '/disinfectsystem/recyclingApplication/selectEndCause.jsp?time=' + new Date().getTime() + '&optionType=error'; damageIndex = layer.open({ type: 2, title: ['报损备注', true], content: url, + move: false, area: [width + 'px', height + 'px'], border: [5, 0.3, '#fff', true], closeBtn: [2, true], - offset: [offsetTop + 'px', ''] + offset: ['30px', '50px'] }); }); }) \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.js =================================================================== diff -u -r39127 -r39807 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.js (.../recyclingErrors.js) (revision 39127) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.js (.../recyclingErrors.js) (revision 39807) @@ -482,19 +482,21 @@ document.onkeydown = banBackSpace; //触发备注事件 $('#errorRemark').click(function () { - var width = document.body.clientWidth - 100; - var height = document.body.clientHeight - 100; - var offsetTop = 50; + var zoomRatio = calculateZoomRatio(980,700,param_width,param_height); + var width = param_width / zoomRatio -100; + var height = param_height / zoomRatio -100; + var url = WWWROOT + '/disinfectsystem/recyclingApplication/selectEndCause.jsp?time=' + new Date().getTime() + '&optionType=error'; errorIndex = layer.open({ type: 2, title: ['丢失备注', true], content: url, + move: false, area: [width + 'px', height + 'px'], border: [5, 0.3, '#fff', true], closeBtn: [2, true], - offset: [offsetTop + 'px', ''] + offset: ['30px', '50px'] }); }); if (!sstsConfig.enableRecycleMaterialErrorDamageRemark) { Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp =================================================================== diff -u -r32950 -r39807 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp (.../recyclingDamage.jsp) (revision 32950) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp (.../recyclingDamage.jsp) (revision 39807) @@ -48,6 +48,8 @@ var recyclingUser = '${param.recyclingUser}'; var circuitNurse = '${param.circuitNurse}'; var operationRoom = '${param.operationRoom}'; +var param_width = '${param.width}'; +var param_height = '${param.height}'; errorDamageQmKey = errorDamageQmKey + "_damage"; var dep = '${param.depart}';//$('depart').val(); $('depart').val(dep);