Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
===================================================================
diff -u -r24086 -r24087
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 24086)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 24087)
@@ -107,12 +107,11 @@
         success:function(msg){
         	var amount = msg.count;
         	if(amount <=0){
-        		jShowResult('未找到' + imageType);
-        	}else{
-        		currentTypeMap[imageType] = {count:amount,page:1,objId:objId,imageType:imageType};
-        		currentType = imageType;
-        		document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + objId + '&imageType=' + imageType + '&page=' + number +'&time='+new Date().getTime();
+        		amount = 1;
         	}
+        	currentTypeMap[imageType] = {count:amount,page:1,objId:objId,imageType:imageType};
+    		currentType = imageType;
+    		document.getElementById('tousseOrMaterialImage').src = '${ctx}/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + objId + '&imageType=' + imageType + '&page=' + number +'&time='+new Date().getTime();
         },
         error:function(XMLHttpRequest, textStatus, errorThrown){
         }
@@ -196,20 +195,20 @@
 		getMaterial();
 	}
 	// add this code after popup JS file is included
-	window.parent.$.magnificPopup.instance.next = function() {
+	if(window.parent && window.parent.$ && window.parent.$.magnificPopup && window.parent.$.magnificPopup.instance){
+		window.parent.$.magnificPopup.instance.next = function() {
+			nextPage();
+		  // You may call parent ("original") method like so:
+		  //$.magnificPopup.proto.next.call(this /*, optional arguments */);
+		};
+		window.parent.$.magnificPopup.instance.prev = function() {
 
-		nextPage();
+			prevPage();
 
-	  // You may call parent ("original") method like so:
-	  //$.magnificPopup.proto.next.call(this /*, optional arguments */);
-	};
-	window.parent.$.magnificPopup.instance.prev = function() {
-
-		prevPage();
-
-	  // You may call parent ("original") method like so:
-	  //$.magnificPopup.proto.next.call(this /*, optional arguments */);
-	};
+		  // You may call parent ("original") method like so:
+		  //$.magnificPopup.proto.next.call(this /*, optional arguments */);
+		};
+	}
 	if (isIE () && isIE () > 8){
 		var start,end;
 		jQuery(document).bind("mousedown", function(e) { 
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js
===================================================================
diff -u -r22860 -r24087
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js	(.../interferewashAndDisinfectForm.js)	(revision 22860)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js	(.../interferewashAndDisinfectForm.js)	(revision 24087)
@@ -364,7 +364,7 @@
 								}
 								var tousseName = node.attributes.name;
 								var objectId = node.attributes.objectId;
-								window.open(WWWROOT+"/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/tousseImage.jsp?resolution=1980" + "&tousseDefinitionID=" + objectId
+								window.open(WWWROOT+"/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980" + "&tousseDefinitionID=" + objectId
 								+ "&tousseName=" + encodeURIComponent(tousseName) + "&number=" + 1,"newWindow","menubar=0,scrollbars=1,width=1110,height=600");
 								}}
 						});
@@ -416,7 +416,7 @@
 				}
 				var tousseName = node.attributes.name;
 				var objectId = node.attributes.objectId;
-				window.open(WWWROOT+"/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/tousseImage.jsp?resolution=1980" + "&tousseDefinitionID=" + objectId
+				window.open(WWWROOT+"/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980" + "&tousseDefinitionID=" + objectId
 				+ "&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/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r23653 -r24087
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 23653)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 24087)
@@ -364,7 +364,7 @@
 								}
 								var tousseName = node.attributes.name;
 								var objectId = node.attributes.objectId;
-								window.open(WWWROOT+"/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/tousseImage.jsp?resolution=1980" + "&tousseDefinitionID=" + objectId
+								window.open(WWWROOT+"/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980" + "&tousseDefinitionID=" + objectId
 								+ "&tousseName=" + encodeURIComponent(tousseName) + "&number=" + 1,"newWindow","menubar=0,scrollbars=1,width=1110,height=600");
 								}}
 						});
@@ -417,7 +417,7 @@
 				}
 				var tousseName = node.attributes.name;
 				var objectId = node.attributes.objectId;
-				window.open(WWWROOT+"/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/tousseImage.jsp?resolution=1980" + "&tousseDefinitionID=" + objectId
+				window.open(WWWROOT+"/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980" + "&tousseDefinitionID=" + objectId
 				+ "&tousseName=" + encodeURIComponent(tousseName) + "&number=" + 1,'_blank',"menubar=0,scrollbars=1,width=1110,height=600");
 //				alert('点击包名 : ' + name + '包 id : ' + objectId);
 			}}
@@ -608,7 +608,7 @@
 								}
 								var tousseName = node.attributes.name;
 								var objectId = node.attributes.objectId;
-								window.open(WWWROOT+"/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/tousseImage.jsp?resolution=1980" + "&tousseDefinitionID=" + objectId
+								window.open(WWWROOT+"/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980" + "&tousseDefinitionID=" + objectId
 								+ "&tousseName=" + encodeURIComponent(tousseName) + "&number=" + 1,'_blank',"menubar=0,scrollbars=1,width=1110,height=600");
 //								alert('点击包名 : ' + name + '包 id : ' + objectId);
 							}}
Fisheye: Tag 24087 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/tousseImage.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?