Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
===================================================================
diff -u -r14026 -r14059
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 14026)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 14059)
@@ -49,8 +49,8 @@
     var insertText = document.createTextNode(materialName);
     BElement.appendChild(insertText);
     document.getElementById("tousseNameID").appendChild(BElement);
-    $('#tousseOrMaterialImage').css('width','800px');
-    $('#MaterialID').remove();
+    jQuery('#tousseOrMaterialImage').css('width','800px');
+    jQuery('#MaterialID').remove();
 }
 /**
  * 材料被点击时触发
@@ -63,14 +63,14 @@
 //加载材料图片.mName:材料名称,tr:当前行对象
 function loadMaterialPic(mName , tr){
 	document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/materialDefinitionAction!getImage.do?materialName=' + mName + '&number=' + number +'&time='+new Date();
-	$("#materialTable tr").css("background" , "#FFFFFF");
-	$(tr).css("background" , "#eeeeee");
+	jQuery("#materialTable tr").css("background" , "#FFFFFF");
+	jQuery(tr).css("background" , "#eeeeee");
 }
 /**
  * 加载材料定义的注意事项
  */
 function loadMaterialNotice(mName){
-	$.ajax({
+	jQuery.ajax({
         type:'post',
         url:'${ctx}/disinfectSystem/baseData/materialDefinitionAction!getMaterialNotice.do',
         data:'materialName=' + mName,
@@ -79,7 +79,7 @@
         	if(result.success){
         		var notice = result.notice;
         		var text = notice.replace(/\r\n/g,"<p/>");
-        		$("#materialRemark").html(text);
+        		jQuery("#materialRemark").html(text);
         	}
         },
         error:function(XMLHttpRequest, textStatus, errorThrown){
@@ -88,7 +88,7 @@
 }
 //加载器械包图片
 function loadTousseImage(){
-	$("#materialTable tr").css("background" , "#FFFFFF");
+	jQuery("#materialTable tr").css("background" , "#FFFFFF");
 	document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/tousseDefinitionAction!getImage.do?id=' + tousseDefinitionID + '&name=' + tousseName + '&number=' + number +'&time='+new Date();
 }
 
@@ -104,16 +104,16 @@
 	document.getElementById('tousseOrMaterialImage').src = url;
 	if (isIE () && isIE () > 8){
 		var start,end;
-		$(document).bind("mousedown", function(e) { 
+		jQuery(document).bind("mousedown", function(e) { 
 	        e.preventDefault();
 	        start = e.pageX;
 	    });
-		$('.mfp-container',window.parent.document).bind("mousedown", function(e) { 
+		jQuery('.mfp-container',window.parent.document).bind("mousedown", function(e) { 
 	        e.preventDefault();
 	        start = e.pageX;
 	    });
 	    
-		$(document).bind("mouseup", function(e) { 
+		jQuery(document).bind("mouseup", function(e) { 
 	        e.preventDefault();
 	        end = e.pageX;
 	        if(end-start>50){
@@ -123,7 +123,7 @@
 	        }
 	    });
 		
-		$('.mfp-container',window.parent.document).bind("mouseup", function(e) { 
+		jQuery('.mfp-container',window.parent.document).bind("mouseup", function(e) { 
 	        e.preventDefault();
 	        end = e.pageX;
 	        if(end-start>50){