Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js =================================================================== diff -u -r27788 -r27799 --- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 27788) +++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 27799) @@ -1123,7 +1123,8 @@ function gridItemRender(v , ctx , record){ ctx.tdAttr = " data-qtip = '"+record.data['name']+"' data-qwidth=300 data-qtitle='材料名称(点击查看图片):'"; return v; - } + } + var iframeHeight = window.screen.height; var materialGrid = new top.Ext4.grid.Panel({ id :'materialGrid', store: materialStore, @@ -1160,14 +1161,14 @@ var materialName = record.data['name']; if (materialDefinitionId != '') { materialId = materialDefinitionId; - var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980&parentPageName=packingView&tousseDefinitionID='+tousseDefinitionID+'&materialId='+materialId+'&tousseName='+encodeURIComponent(tousseName)+'&imgName='+encodeURIComponent(currentImageType)+'&number='+currentPage; + var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980&clientHeight='+iframeHeight+'&parentPageName=reviewView&tousseDefinitionID='+tousseDefinitionID+'&materialId='+materialId+'&tousseName='+encodeURIComponent(tousseName)+'&imgName='+encodeURIComponent(currentImageType)+'&number='+currentPage; openFullSizeWindowWithName(url,false,currentImageType); } } } }); - var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980&parentPageName=packingView&tousseDefinitionID='+tousseDefinitionID+'&materialId='+materialId+'&tousseName='+encodeURIComponent(tousseName)+'&imgName='+encodeURIComponent(currentImageType)+'&number='+currentPage; + var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980&clientHeight='+iframeHeight+'&parentPageName=reviewView&tousseDefinitionID='+tousseDefinitionID+'&materialId='+materialId+'&tousseName='+encodeURIComponent(tousseName)+'&imgName='+encodeURIComponent(currentImageType)+'&number='+currentPage; openFullSizeWindowWithName(url,false,currentImageType); } var columns = [