Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r27654 -r27658
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 27654)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 27658)
@@ -1055,7 +1055,6 @@
     }
     barcodeField.setValue();
 }
-
 var imagePanel = new Ext4.Panel({
 	id : 'imagePanel',
 	colspan: 2,
@@ -2082,13 +2081,7 @@
 	var materialId = row.materialId;
 	var imgName = row.type;
 	var iframeHeight = window.screen.height;
-	var parentPageName;
-	if(imgName == '器械包装配教学图片'){
-		parentPageName = 'packingView';
-	}else {
-		parentPageName = '';
-	}
-	var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980&clientHeight='+iframeHeight+'&parentPageName='+parentPageName+'&tousseDefinitionID='+tousseDefinitionID+'&materialId='+materialId+'&tousseName='+encodeURIComponent(tousseName)+'&imgName='+encodeURIComponent(imgName)+'&number='+currentPage;
+	var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980&clientHeight='+iframeHeight+'&parentPageName=packingView&tousseDefinitionID='+tousseDefinitionID+'&materialId='+materialId+'&tousseName='+encodeURIComponent(tousseName)+'&imgName='+encodeURIComponent(imgName)+'&number='+currentPage;
 	openFullSizeWindowWithName(url,false,imgName);
 }
 function loadGoodsImage(tousseName,type,materialId,currentPage,vedioName,td_id){