Index: ssts-web/src/main/webapp/disinfectsystem/packing/tousesPackingTeachingImage.js
===================================================================
diff -u -r22320 -r22601
--- ssts-web/src/main/webapp/disinfectsystem/packing/tousesPackingTeachingImage.js	(.../tousesPackingTeachingImage.js)	(revision 22320)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/tousesPackingTeachingImage.js	(.../tousesPackingTeachingImage.js)	(revision 22601)
@@ -1,6 +1,6 @@
 
 var lastLoadObj = null;
-
+var tousesPackingTeachingImage_window = null;
 function viewOriginalImg(){
 	if(lastLoadObj == null){
 		return;
@@ -16,6 +16,7 @@
 	}
 	var viewOriginalImgPressed = top.Ext4.getCmp('pt_view_originalImg').pressed;
 	var url = WWWROOT + '/disinfectSystem/packingAction!getImage.do?id=' + td_id + '&page=' + currentPage +'&imageType='+imgType+'&originalImg='+viewOriginalImgPressed ;
+	var viewOriginalImg_url = WWWROOT + '/disinfectSystem/packingAction!getImage.do?id=' + td_id + '&page=' + currentPage +'&imageType='+imgType+'&originalImg=true' ;
 //    var image = top.Ext4.getCmp('pt_browseImage');
 //    image.setSrc('');
 //    image.setSrc(url);// 覆盖原来的图片
@@ -29,17 +30,27 @@
     var newImage = top.Ext4.create('Ext4.Img', {
     	id : 'pt_browseImage',
 	    fieldLabel : "预览图片",
-//	    title:'双击预览图片',
+	    title:'双击预览图片',
 //	    autoScroll: true,
 	    listeners: {
             render: function() {
             	var imgCmp = this;
             	var imgEl = this.getEl();
-//            	imgCmp.getEl().on("dblclick" , function(e){
-//            		if(this.el.dom.src && this.el.dom.src != ''){
-//            			showImage(this.el.dom.src,tousseName);
-//            		}
-//            	});
+            	imgCmp.getEl().on("dblclick" , function(e){
+            		if(this.el.dom.src && this.el.dom.src != ''){
+//            			alert(this.el.dom.src)
+            			showImage(viewOriginalImg_url,tousseName,function(){
+            				var obj = {
+            						tousseName: tousseName,
+            						td_id: td_id,
+            						imgType: imgType,
+            						currentPage: currentPage
+            				}
+            				showTousseImages_restore(obj);
+            			});
+            			tousesPackingTeachingImage_window.close();
+            		}
+            	});
             	imgEl.on('load',function(){
             		 var img = this;
             		 var panel = top.Ext4.getCmp('pt_imageContentPanel');
@@ -107,6 +118,11 @@
 
 function showTousseImages(tousseName,td_id,imgType){
 	
+	showTousseImages_newWindow(tousseName,td_id,imgType);
+    
+    loadToussePackingTeachingImage(tousseName,td_id,imgType,1);
+}
+function showTousseImages_newWindow(tousseName,td_id,imgType){
 	var totalPage = 0;
 	Ext.Ajax.request({
          url : WWWROOT + '/disinfectSystem/packingAction!getUploadPicTotalPage.do',
@@ -129,7 +145,7 @@
 		items : [{
 			xtype : 'panel',  
 	        layout:'absolute',
-	        autoScroll: true,
+//	        autoScroll: true,
 	        id: 'pt_imageContentPanel',
 	        items: [{
 	    	    xtype : 'image',
@@ -143,7 +159,7 @@
 		       { id:'pt_imageName'},
 		       {xtype:'hidden',id:'pt_currentPage'},
 		       '->',
-		       {xtype:'button',id:'pt_view_originalImg',text:'查看原图',tooltip :"查看原图", 
+		       {xtype:'button',id:'pt_view_originalImg',text:'查看原图',tooltip :"查看原图", hidden: true,
 		    	   enableToggle: true,
 		    	   handler : function(){
 		    		   viewOriginalImg();
@@ -170,7 +186,7 @@
 		]
 	});
 	
-	var window = new top.Ext4.Window({
+	tousesPackingTeachingImage_window = new top.Ext4.Window({
         id : 'packageImg',
         title : imgType,
         width : document.body.clientHeight > 768 ? 1024 : 800, // 动态计算窗口大小，支持在1024x768分辨率下的显示
@@ -186,7 +202,10 @@
             items : imagePanel
         }]
     });
-    window.show();
+	tousesPackingTeachingImage_window.show();
+}
+function showTousseImages_restore(lastLoadObj){
+	showTousseImages_newWindow(lastLoadObj.tousseName,lastLoadObj.td_id,lastLoadObj.imgType);
     
-    loadToussePackingTeachingImage(tousseName,td_id,imgType,1);
+    loadToussePackingTeachingImage(lastLoadObj.tousseName,lastLoadObj.td_id,lastLoadObj.imgType,lastLoadObj.currentPage);
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/imageShow/imageShow.js
===================================================================
diff -u -r15164 -r22601
--- ssts-web/src/main/webapp/imageShow/imageShow.js	(.../imageShow.js)	(revision 15164)
+++ ssts-web/src/main/webapp/imageShow/imageShow.js	(.../imageShow.js)	(revision 22601)
@@ -139,7 +139,7 @@
     Ext.Toast = function() { }; Ext.Toast.LongTime = 4000; Ext.Toast.MiddleTime = 1000; Ext.Toast.ShortTime = 100; Ext.Toast.show = function(msgText, time) { Ext.MessageBox.show({ msg : msgText, closable : false }); setTimeout(function() { Ext.MessageBox.hide(); }, time); };
 });
 
-var showImage = function(url,tousseName){
+var showImage = function(url,tousseName,closeHandler){
 	currentScalePercent = 100;//当前缩放百分比
 	//示例数据(传多张图可实现前后翻页浏览)
 	/*var img1 = new ImgView({
@@ -196,5 +196,10 @@
 			text:'逆转'
 		}*/]
 	});
+	imageWin.on('close',function(w){
+		if(closeHandler){
+			closeHandler();
+		}
+	});
 	imageWin.show();
 }
\ No newline at end of file