Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
===================================================================
diff -u -r17111 -r22260
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 17111)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 22260)
@@ -13,9 +13,9 @@
 <link rel="stylesheet" href="${ctx}/js/magnificPopup/magnific-popup.css"> 
 <script>
 var number = '${param.number}';
-var tousseName = '${param.tousseName}';
+var tousseName = decodeURIComponent('${param.tousseName}');
 var tousseDefinitionID = '${param.tousseDefinitionID}';
-var materialName = '${param.materialName}';
+var materialName = decodeURIComponent('${param.materialName}');
 //动态加载JS和CSS
 document.write('<link href="${ctx}/disinfectsystem/touchScreen/recycle/${param.resolution}/images/style.css" rel="stylesheet" type="text/css" />');
 
@@ -66,7 +66,7 @@
 }
 //加载材料图片.mName:材料名称,tr:当前行对象
 function loadMaterialPic(mName , tr){
-	document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/materialDefinitionAction!getImage.do?materialName=' + mName + '&number=' + number +'&time='+new Date();
+	document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/materialDefinitionAction!getImage.do?materialName=' + encodeURIComponent(mName) + '&number=' + number +'&time='+new Date();
 	jQuery("#materialTable tr").css("background" , "#FFFFFF");
 	jQuery(tr).css("background" , "#eeeeee");
 }
@@ -93,16 +93,16 @@
 //加载器械包图片
 function loadTousseImage(){
 	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();
+	document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/tousseDefinitionAction!getImage.do?id=' + tousseDefinitionID + '&name=' + encodeURIComponent(tousseName) + '&number=' + number +'&time='+new Date();
 }
 
 function initPic(){
 	var url = null;
 	if(tousseName!=null && tousseName != ''){
-	    url = '${ctx}/disinfectSystem/baseData/tousseDefinitionAction!getImage.do?id=' + tousseDefinitionID + '&name=' + tousseName + '&number=' + number +'&time='+new Date();
+	    url = '${ctx}/disinfectSystem/baseData/tousseDefinitionAction!getImage.do?id=' + tousseDefinitionID + '&name=' + encodeURIComponent(tousseName) + '&number=' + number +'&time='+new Date();
 	    getTousseMaterial();
 	}else{
-		url = '${ctx}/disinfectSystem/baseData/materialDefinitionAction!getImage.do?id=' + tousseDefinitionID + '&materialName=' + materialName + '&number=' + number +'&time='+new Date();
+		url = '${ctx}/disinfectSystem/baseData/materialDefinitionAction!getImage.do?id=' + tousseDefinitionID + '&materialName=' + encodeURIComponent(materialName) + '&number=' + number +'&time='+new Date();
 		getMaterial();
 	}
 	document.getElementById('tousseOrMaterialImage').src = url;
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
===================================================================
diff -u -r18631 -r22260
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp	(.../recyclingErrors.jsp)	(revision 18631)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp	(.../recyclingErrors.jsp)	(revision 22260)
@@ -221,13 +221,13 @@
 				var items = new Array();
 				if(amount <= 0){
 					items.push({
-						src : 'tousseImage.jsp?materialName=' + materialName + "&number=" + 1,
+						src : 'tousseImage.jsp?materialName=' + encodeURIComponent(materialName) + "&number=" + 1,
 						type : 'iframe'
 					});
 				}else{
 					for ( var i = 0; i < amount; i++) {
 						items.push({
-							src : 'tousseImage.jsp?materialName=' + materialName + "&number=" + (i+1),
+							src : 'tousseImage.jsp?materialName=' + encodeURIComponent(materialName) + "&number=" + (i+1),
 							type : 'iframe'
 						});
 					}
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r21382 -r22260
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 21382)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 22260)
@@ -330,7 +330,7 @@
 								var tousseName = node.attributes.name;
 								var objectId = node.attributes.objectId;
 								window.open(WWWROOT+"/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/tousseImage.jsp?resolution=1980" + "&tousseDefinitionID=" + objectId
-								+ "&tousseName=" + tousseName + "&number=" + 1,"newWindow","menubar=0,scrollbars=1,width=1110,height=600");
+								+ "&tousseName=" + encodeURIComponent(tousseName) + "&number=" + 1,"newWindow","menubar=0,scrollbars=1,width=1110,height=600");
 								}}
 						});
 						basket.appendChild(material);
@@ -537,7 +537,7 @@
 								var tousseName = node.attributes.name;
 								var objectId = node.attributes.objectId;
 								window.open(WWWROOT+"/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/tousseImage.jsp?resolution=1980" + "&tousseDefinitionID=" + objectId
-								+ "&tousseName=" + tousseName + "&number=" + 1,'_blank',"menubar=0,scrollbars=1,width=1110,height=600");
+								+ "&tousseName=" + encodeURIComponent(tousseName) + "&number=" + 1,'_blank',"menubar=0,scrollbars=1,width=1110,height=600");
 //								alert('点击包名 : ' + name + '包 id : ' + objectId);
 							}}
 					});
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
===================================================================
diff -u -r18631 -r22260
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp	(.../recyclingDamage.jsp)	(revision 18631)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp	(.../recyclingDamage.jsp)	(revision 22260)
@@ -199,13 +199,13 @@
             var items = new Array();
             if(amount <= 0){
             	items.push({
-                    src:'tousseImage.jsp?materialName='+materialName+"&number="+1,
+                    src:'tousseImage.jsp?materialName='+encodeURIComponent(materialName)+"&number="+1,
                     type :'iframe'
                 });
 			}else{
 				for(var i = 0;i < amount;i++){
 	                items.push({
-	                    src:'tousseImage.jsp?materialName='+materialName+"&number="+i,
+	                    src:'tousseImage.jsp?materialName='+encodeURIComponent(materialName)+"&number="+i,
 	                    type :'iframe'
 	                });
 	            }
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r22114 -r22260
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 22114)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 22260)
@@ -1597,7 +1597,7 @@
                 }
                 for(var i = 0;i < amount;i++){
                     items.push({
-                        src:'tousseImage.jsp?resolution='+resolution+'&tousseDefinitionID='+tousseDefinitionID+'&tousseName='+tousseName+'&number='+(i+1),
+                        src:'tousseImage.jsp?resolution='+resolution+'&tousseDefinitionID='+tousseDefinitionID+'&tousseName='+encodeURIComponent(tousseName)+'&number='+(i+1),
                         type :'iframe'
                     });
             	}
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/tousseImage.jsp
===================================================================
diff -u -r18423 -r22260
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/tousseImage.jsp	(.../tousseImage.jsp)	(revision 18423)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/tousseImage.jsp	(.../tousseImage.jsp)	(revision 22260)
@@ -13,9 +13,9 @@
 <link rel="stylesheet" href="${ctx}/js/magnificPopup/magnific-popup.css"> 
 <script>
 var number = '${param.number}';
-var tousseName = '${param.tousseName}';
+var tousseName = decodeURIComponent('${param.tousseName}');
 var tousseDefinitionID = '${param.tousseDefinitionID}';
-var materialName = '${param.materialName}';
+var materialName = decodeURIComponent('${param.materialName}');
 //动态加载JS和CSS
 document.write('<link href="${ctx}/disinfectsystem/touchScreen/recycle/${param.resolution}/images/style.css" rel="stylesheet" type="text/css" />');
 
@@ -66,7 +66,7 @@
 }
 //加载材料图片.mName:材料名称,tr:当前行对象
 function loadMaterialPic(mName , tr){
-	document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/materialDefinitionAction!getImage.do?materialName=' + mName + '&number=' + number +'&time='+new Date();
+	document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/materialDefinitionAction!getImage.do?materialName=' + encodeURIComponent(mName) + '&number=' + number +'&time='+new Date();
 	jQuery("#materialTable tr").css("background" , "#FFFFFF");
 	jQuery(tr).css("background" , "#eeeeee");
 }
@@ -93,16 +93,16 @@
 //加载器械包图片
 function loadTousseImage(){
 	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();
+	document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/tousseDefinitionAction!getImage.do?id=' + tousseDefinitionID + '&name=' + encodeURIComponent(tousseName) + '&number=' + number +'&time='+new Date();
 }
 
 function initPic(){
 	var url = null;
 	if(tousseName!=null && tousseName != ''){
-	    url = '${ctx}/disinfectSystem/baseData/tousseDefinitionAction!getImage.do?id=' + tousseDefinitionID + '&name=' + tousseName + '&number=' + number +'&time='+new Date();
+	    url = '${ctx}/disinfectSystem/baseData/tousseDefinitionAction!getImage.do?id=' + tousseDefinitionID + '&name=' + encodeURIComponent(tousseName) + '&number=' + number +'&time='+new Date();
 	    getTousseMaterial();
 	}else{
-		url = '${ctx}/disinfectSystem/baseData/materialDefinitionAction!getImage.do?id=' + tousseDefinitionID + '&materialName=' + materialName + '&number=' + number +'&time='+new Date();
+		url = '${ctx}/disinfectSystem/baseData/materialDefinitionAction!getImage.do?id=' + tousseDefinitionID + '&materialName=' + encodeURIComponent(materialName) + '&number=' + number +'&time='+new Date();
 		getMaterial();
 	}
 	document.getElementById('tousseOrMaterialImage').src = url;
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionGoodsRecycleForTouchScreen.jsp
===================================================================
diff -u -r15530 -r22260
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionGoodsRecycleForTouchScreen.jsp	(.../disinfectionGoodsRecycleForTouchScreen.jsp)	(revision 15530)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionGoodsRecycleForTouchScreen.jsp	(.../disinfectionGoodsRecycleForTouchScreen.jsp)	(revision 22260)
@@ -637,7 +637,7 @@
                 var items = new Array();
                 for(var i = 0;i < amount;i++){
                     items.push({
-                        src:'tousseImage.jsp?resolution=${param.resolution}&tousseName='+tousseName+"&number="+(i+1),
+                        src:'tousseImage.jsp?resolution=${param.resolution}&tousseName='+encodeURIComponent(tousseName)+"&number="+(i+1),
                         type :'iframe'
                     });
                 }