Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp =================================================================== diff -u -r27641 -r27643 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 27641) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 27643) @@ -161,7 +161,7 @@ } var currentType = ''; var currentTypeMap = {}; -function loadImage(objId,imageType,td){ +function loadImage(objId,imageType,td,imgName){ $.ajax({ type:'post', url:'${ctx}/disinfectSystem/baseData/showImageAction!getToussePictureAmount.do', @@ -176,7 +176,7 @@ currentType = imageType;//器械包图片 var imgUrl; - if(parentImgName == '器械包装配教学图片'){ + if(imgName == '器械包装配教学图片'){ if(td == undefined || td == ''){ imgUrl = '${ctx}/disinfectSystem/packingAction!getImage.do?id='+objId+'&page='+number+'&imageType='+encodeURIComponent(parentImgName)+'&originalImg=true'; }else { @@ -462,13 +462,13 @@ }); } //加载器械包图片 -function loadTousseImage(){ +function loadTousseImage(imgName){ loadTousseBagNotice(); if(isUndefinedOrNullOrEmpty(tousseDefinitionID)){ return; } var imageType = '<%=ImageFile.IMAGE_TYPE_TOUSSE%>'; - loadImage(tousseDefinitionID,imageType); + loadImage(tousseDefinitionID,imageType,'',imgName); jQuery("#materialTable tr").css("background","#FFFFFF"); } function getMaterialNameWithAmount(that){ @@ -519,7 +519,8 @@ } }); }else { - loadTousseImage(); + var imgName = parentImgName || ''; + loadTousseImage(imgName); } getTousseMaterial(); }else{