Index: ssts-web/src/main/webapp/disinfectsystem/packing/tousesPackingTeachingImage.js
===================================================================
diff -u -r27630 -r27640
--- ssts-web/src/main/webapp/disinfectsystem/packing/tousesPackingTeachingImage.js	(.../tousesPackingTeachingImage.js)	(revision 27630)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/tousesPackingTeachingImage.js	(.../tousesPackingTeachingImage.js)	(revision 27640)
@@ -19,11 +19,11 @@
 	var viewOriginalImg_url = "";
 	var title = "";
 	if(imgId){//器械包定义
-		url = WWWROOT + "/disinfectSystem/baseData/showImageAction!getToussePic.do?imageType=" + imgType +'&id='+td_id+'&page='+currentPage+'&isOriginalPic=true';
-		viewOriginalImg_url = WWWROOT + "/disinfectSystem/baseData/showImageAction!getToussePic.do?imageType=" + imgType +'&id='+td_id+'&page='+currentPage;
+		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='+imgType;
-		viewOriginalImg_url = WWWROOT + '/disinfectSystem/packingAction!getImage.do?id=' + td_id + '&page=' + currentPage +'&imageType='+imgType+'&originalImg=true' ;
+		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 = '双击预览图片';
 	}
 	
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
===================================================================
diff -u -r27639 -r27640
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 27639)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 27640)
@@ -217,6 +217,11 @@
 					}
 				}
 			}
+
+			$('#tousseOrMaterialImage').css({
+				left:'auto',
+				top:'auto'
+			})
         },
         error:function(XMLHttpRequest, textStatus, errorThrown){
         }
@@ -279,6 +284,11 @@
 			}
 		}
 	}
+
+	$('#tousseOrMaterialImage').css({
+		left:'auto',
+		top:'auto'
+	})
 }
 function prevPage(){
 	if(isUndefinedOrNullOrEmpty(currentType)){
@@ -302,6 +312,7 @@
 		imgUrl = '${ctx}/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + cur.objId + '&imageType=' + encodeURIComponent(cur.imageType) + '&page=' + cur.page;
 	}
 	document.getElementById('tousseOrMaterialImage').src = imgUrl;
+	
 	var img = new Image();
 	img.src = imgUrl;
 	img.onload =function(){
@@ -333,26 +344,67 @@
 			}
 		}
 	}
+
+	$('#tousseOrMaterialImage').css({
+		left:'auto',
+		top:'auto'
+	})
 }
 /**
  * 图片放大
 */
 function markBig(){
 	var width = $('#tousseOrMaterialImage').width();
 	var height= $('#tousseOrMaterialImage').height();
-	$('#tousseOrMaterialImage').width((width+width*0.1)+'px');
-	$('#tousseOrMaterialImage').height((height+height*0.1)+'px');
+	$('#tousseOrMaterialImage').width((width*1.1)+'px');
+	$('#tousseOrMaterialImage').height((height*1.1)+'px');
 }
 /**
  * 图片缩小
 */
 function markSmall(){
 	var width = $('#tousseOrMaterialImage').width();
 	var height= $('#tousseOrMaterialImage').height();
-	$('#tousseOrMaterialImage').width((width-width*0.1)+'px');
-	$('#tousseOrMaterialImage').height((height-height*0.1)+'px');
+	var w = Math.max(30,width*0.9);
+    var h = Math.max(30,height*0.9);
+	$('#tousseOrMaterialImage').width(w+'px');
+	$('#tousseOrMaterialImage').height(h+'px');
 }
 /**
+ * 拖动图片
+*/
+function dragImg(){
+	var box = document.getElementById("tousseOrMaterialImage");
+	var fa = document.getElementById('imageAndMaterialID');
+	// 图片移动效果
+	box.onmousedown=function(ev) {
+		var oEvent = ev; 
+		// 浏览器有一些图片的默认事件,这里要阻止
+		oEvent.preventDefault();
+		var disX = oEvent.clientX - box.offsetLeft;
+		var disY = oEvent.clientY - box.offsetTop;
+		fa.onmousemove=function (ev) {
+			oEvent = ev;
+			oEvent.preventDefault();
+			var x = oEvent.clientX -disX;
+			var y = oEvent.clientY -disY;
+
+			box.style.left = x + 'px';
+			box.style.top = y + 'px';
+		}
+		// 图形移出父盒子取消移动事件,防止移动过快触发鼠标移出事件,导致鼠标弹起事件失效
+		fa.onmouseleave = function () {
+			fa.onmousemove=null;
+			fa.onmouseup=null;
+		}
+		// 鼠标弹起后停止移动
+		fa.onmouseup=function() {
+			fa.onmousemove=null;
+			fa.onmouseup=null;
+		} 
+	}
+}
+/**
  * 加载材料定义的注意事项
  */
 function loadMaterialNotice(materialDefinitionId){
@@ -586,6 +638,8 @@
 	        }
 	    });
 	}
+
+	dragImg();
 }
 function checkboxMaterialAll(that){
 	var trs = $("#materialTable tr");
@@ -675,8 +729,8 @@
 						<a href="javascript:void(0)" onclick='loadTousseImage();'>查看包图片</a>
 					</div>
 				   </div>
-				   <div id="tousseOrMaterialImageDiv" style="overflow: auto;display: flex;align-items: center; justify-content: center;">
-						<img id="tousseOrMaterialImage" style="vertical-align:middle;text-align:center;"/>
+				   <div id="tousseOrMaterialImageDiv" style="overflow: auto;display: flex;align-items: center; justify-content: center;position: relative;">
+						<img id="tousseOrMaterialImage" style="vertical-align:middle;text-align:center;position: absolute;"/>
 				   </div>
 			</div>
             <div class="image-box" id="MaterialDIV">