Index: ssts-web/src/main/webapp/disinfectsystem/packing/tousesPackingTeachingImage.js
===================================================================
diff -u -r27640 -r27654
--- ssts-web/src/main/webapp/disinfectsystem/packing/tousesPackingTeachingImage.js	(.../tousesPackingTeachingImage.js)	(revision 27640)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/tousesPackingTeachingImage.js	(.../tousesPackingTeachingImage.js)	(revision 27654)
@@ -7,101 +7,20 @@
 	}
 	loadToussePackingTeachingImage(lastLoadObj.tousseName,lastLoadObj.td_id,lastLoadObj.imgType,lastLoadObj.currentPage,"");
 }
-function loadToussePackingTeachingImage(tousseName,td_id,imgType,currentPage,imgId){
-	lastLoadObj = {
-		tousseName: tousseName,
-		td_id: td_id,
-		imgType: imgType,
-		currentPage: currentPage
+function loadToussePackingTeachingImage(tousseName,td_id,imgType,page,pageName){
+	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 = "";
-	var viewOriginalImg_url = "";
-	var title = "";
-	if(imgId){//器械包定义
-		url = WWWROOT + "/disinfectSystem/baseData/showImageAction!getToussePic.do?imageType=" + encodeURIComponent(imgType) +'&id='+td_id+'&page='+currentPage+'&isOriginalPic=true';
-		viewOriginalImg_url = WWWROOT + "/disinfectSystem/baseData/showImageAction!getToussePic.do?imageType=" + encodeURIComponent(imgType) +'&id='+td_id+'&page='+currentPage;
-	}else{//装配
-		url = WWWROOT + '/disinfectSystem/packingAction!getImage.do?id=' + td_id + '&page=' + currentPage +'&imageType='+encodeURIComponent(imgType);
-		viewOriginalImg_url = WWWROOT + '/disinfectSystem/packingAction!getImage.do?id=' + td_id + '&page=' + currentPage +'&imageType='+encodeURIComponent(imgType)+'&originalImg=true' ;
-		title = '双击预览图片';
-	}
+	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;
 	
-	Ext4.getCmp('imageName').setText(tousseName);
-    Ext4.getCmp('imageType').setValue(imgType);
-    Ext4.getCmp('currentPage').setValue(currentPage);
-    Ext4.getCmp('materialId').setValue(imgId);
-	Ext4.getCmp('td_id').setValue(td_id);
-	
-    var panel = Ext4.getCmp('imageContentPanel');
-    var image = Ext4.getCmp('browseImage');
-    panel.remove(image);
-    
-    var newImage = Ext4.create('Ext4.Img', {
-    	id : 'browseImage',
-	    fieldLabel : "预览图片",
-	    title:'双击预览图片',
-	    listeners: {
-            render: function() {
-            	var imgCmp = this;
-            	imgCmp.getEl().on("dblclick" , function(e){
-            		if(this.el.dom.src && this.el.dom.src != ''){
-						showImage(viewOriginalImg_url,tousseName,function(){
-							var obj = {
-									tousseName: tousseName,
-									td_id: td_id,
-									imgType: imgType,
-									currentPage: currentPage
-							}
-							showTousseImages_restore(obj);
-						});
-            		}
-            	});
-            	var img = this.imgEl
-            	img.on('load',function(){
-            		 var img = this;
-            		 var panel = Ext4.getCmp('imageContentPanel');
-            		 var panelSize = panel.getSize(true);
-            		 
-            		 var boundaryWidth = panelSize.width;
-            		 var boundaryHeight = panelSize.height;
-            		 var originalWidth = img.getWidth();
-            		 var originalHeight = img.getHeight();
-            		 var scaledWidth = originalWidth;
-            		 var scaledHeight = originalHeight;
-            		 var x=0,y=0;
-            		 // 计算出合适的大小
-        			var desScaleYX = boundaryHeight*1.0/boundaryWidth;	// 屏幕的高宽比
-        			var srcScaleYX = originalHeight*1.0/originalWidth;	// 图像的高宽比
-        			if(originalWidth > boundaryWidth || originalHeight > boundaryHeight)
-        			{
-        				// 任何一边大于屏幕时，等比例缩放
-        				if(srcScaleYX>desScaleYX)
-        				{
-        					scaledHeight = boundaryHeight;
-        					scaledWidth = parseInt(boundaryHeight*1.0/originalHeight*originalWidth);// 保证为2的倍数
-        				}else
-        				{
-        					scaledWidth = boundaryWidth;
-        					scaledHeight = parseInt(boundaryWidth*1.0/originalWidth*originalHeight);
-        				}
-        				x = (boundaryWidth - scaledWidth)/2;
-        				y = (boundaryHeight - scaledHeight)/2;
-        			}else{
-        				x = (boundaryWidth - scaledWidth)/2;
-        				y = (boundaryHeight - scaledHeight)/2;
-        			}
-        			imgCmp.setSize(scaledWidth,scaledHeight);
-        			imgCmp.setPosition(x,y);
-//            	     Ext.Msg.alert('x='+x+',y='+y+',w='+scaledWidth+',h='+scaledHeight+',bw='+boundaryWidth+',bh='+boundaryHeight);
-            	     
-            	});
-            }
-        },
-	    src : url
-    });
-    
-    panel.add(newImage);
+	openFullSizeWindowWithName(url,false,imgType);
 }
 function showTousseSpecificationImage(tousseName,td_id){
 	showTousseImages(tousseName,td_id,imageType_specification);
@@ -111,7 +30,7 @@
 }
 
 function showTousseImages(tousseName,td_id,imgType){
-	loadToussePackingTeachingImage(tousseName,td_id,imgType,1,"");
+	loadToussePackingTeachingImage(tousseName,td_id,imgType,1);
 }
 
 //获取器械包定义图片的行号