Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp =================================================================== diff -u -r30012 -r30104 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp (.../recyclingDamage.jsp) (revision 30012) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp (.../recyclingDamage.jsp) (revision 30104) @@ -273,11 +273,12 @@ offsetTop = offsetTop*zoomRatio; var mMsg = getMaterialMsg(); parent.setMaterialMsg(mMsg); + var url = 'addQualityMonitoring.jsp?resolution='+resolution+'&width='+width+'&height='+height+'&errorDamageQmKey='+errorDamageQmKey+'&tousseName='+tousseName + +'&depart='+depart+'&recyclingUser='+recyclingUser+'&circuitNurse='+circuitNurse+'&operationRoom='+operationRoom var index= parent.layer.open({ type : 2, title : ['添加质量监测记录',true], - content : 'addQualityMonitoring.jsp?resolution='+resolution+'&width='+width+'&height='+height+'&errorDamageQmKey='+errorDamageQmKey+'&tousseName='+tousseName - +'&depart='+depart+'&recyclingUser='+recyclingUser+'&circuitNurse='+circuitNurse+'&operationRoom='+operationRoom, + content : encodeURI(url), area : [ width + 'px' , height +heightExtra+ 'px'], border : [5, 0.3, '#fff', true], closeBtn : [2 , true], Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp =================================================================== diff -u -r30001 -r30104 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp (.../recyclingErrors.jsp) (revision 30001) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp (.../recyclingErrors.jsp) (revision 30104) @@ -294,11 +294,11 @@ offsetTop = offsetTop*zoomRatio; var mMsg = getMaterialMsg(); parent.setMaterialMsg(mMsg); + var url = 'addQualityMonitoring.jsp?resolution='+resolution+'&width='+width+'&height='+height+'&errorDamageQmKey='+errorDamageQmKey+'&tousseName='+tousseName+'&depart='+depart+'&recyclingUser='+recyclingUser+'&circuitNurse='+circuitNurse+'&operationRoom='+operationRoom var index= parent.layer.open({ type : 2, title : ['添加质量监测记录',true], - content : 'addQualityMonitoring.jsp?resolution='+resolution+'&width='+width+'&height='+height+'&errorDamageQmKey='+errorDamageQmKey+'&tousseName='+tousseName - +'&depart='+depart+'&recyclingUser='+recyclingUser+'&circuitNurse='+circuitNurse+'&operationRoom='+operationRoom, + content : encodeURI(url), area : [ width + 'px' , height +heightExtra+ 'px'], border : [5, 0.3, '#fff', true], closeBtn : [2 , true],