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){
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
===================================================================
diff -u -r27657 -r27658
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 27657)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 27658)
@@ -381,7 +381,7 @@
 	var fa = document.getElementById('imageAndMaterialID');
 	// 图片移动效果
 	box.onmousedown=function(ev) {
-		var oEvent = ev;
+		var oEvent = ev || window.event;
 		// 浏览器有一些图片的默认事件,这里要阻止
 		if(oEvent.preventDefault) {
 			oEvent.preventDefault();
@@ -391,10 +391,15 @@
 		var disX = oEvent.clientX - box.offsetLeft;
 		var disY = oEvent.clientY - box.offsetTop;
 		fa.onmousemove=function (ev) {
-			oEvent = ev;
+			var oEvent = ev || window.event;
+			// 浏览器有一些图片的默认事件,这里要阻止
+			if(oEvent.preventDefault) {
+				oEvent.preventDefault();
+			}else{
+				oEvent.returnValue = false;
+			}
 			var x = oEvent.clientX -disX;
 			var y = oEvent.clientY -disY;
-
 			box.style.left = x + 'px';
 			box.style.top = y + 'px';
 			box.style.position = 'absolute';