Index: ssts-web/src/main/webapp/disinfectsystem/packing/tousesPackingTeachingImage.js =================================================================== diff -u -r27654 -r27661 --- ssts-web/src/main/webapp/disinfectsystem/packing/tousesPackingTeachingImage.js (.../tousesPackingTeachingImage.js) (revision 27654) +++ ssts-web/src/main/webapp/disinfectsystem/packing/tousesPackingTeachingImage.js (.../tousesPackingTeachingImage.js) (revision 27661) @@ -7,18 +7,12 @@ } loadToussePackingTeachingImage(lastLoadObj.tousseName,lastLoadObj.td_id,lastLoadObj.imgType,lastLoadObj.currentPage,""); } -function loadToussePackingTeachingImage(tousseName,td_id,imgType,page,pageName){ +function loadToussePackingTeachingImage(tousseName,td_id,imgType,page){ var tousseName = tousseName; var tousseDefinitionID = td_id; var currentPage = page; var iframeHeight = window.screen.height; - var parentPageName; - if(imgType == '器械包装配教学图片'){ - parentPageName = 'packingView'; - }else { - parentPageName = ''; - } - var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980&clientHeight='+iframeHeight+'&parentPageName='+parentPageName+'w&tousseDefinitionID='+tousseDefinitionID+'&tousseName='+encodeURIComponent(tousseName)+'&imgName='+encodeURIComponent(imgName)+'&number='+currentPage; + var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980&clientHeight='+iframeHeight+'&parentPageName=packingView&tousseDefinitionID='+tousseDefinitionID+'&tousseName='+encodeURIComponent(tousseName)+'&imgName='+encodeURIComponent(imgType)+'&number='+currentPage; openFullSizeWindowWithName(url,false,imgType); }