Index: ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js
===================================================================
diff -u -r28148 -r30460
--- ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js	(.../videoAndImg.js)	(revision 28148)
+++ ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js	(.../videoAndImg.js)	(revision 30460)
@@ -51,13 +51,9 @@
 		success : function(result) {
 			var data = JSON.parse(result);
 			if(data.success){
-				var imageCount = data.imageCount;
-				var videoCount = data.videoCount;
-			
 				if(data.imageArray.length > 0){
 					for(var i = 0;i < data.imageArray.length; i++){
-						var serialNum = data.imageArray[i].serialNum;
-						var imgUrl =  WWWROOT +'/disinfectSystem/baseData/uploadImageAndVideoAction!getImageById.do?imageId='+ data.imageArray[i].id+'&original=true';
+						var imgUrl =  WWWROOT +'/disinfectSystem/baseData/uploadImageAndVideoAction!getImageById.do?imageId='+ data.imageArray[i].id+'&original=false';
 						var imgList = "<div class='spotlight_parent' imgIds='"+data.imageArray[i].id+"'><a class='spotlight' href='"+imgUrl+"'>";
 							imgList += "<img src='"+imgUrl+"'/>";
 							imgList += "</a>";
@@ -67,7 +63,7 @@
 								imgList += "<div class='model on' onclick='triggerLookImgVideo(event,this,false);'>";
 							}							
 							imgList += "<span imageId='"+data.imageArray[i].id+"'  onclick='removeImgVideo(event,this,false,true);'></span>";
-							//imgList += "<span objectId='"+objectId+"' serialNum='"+serialNum+"' imageType='"+imageType+"' onclick='removeImgVideo(event,this,false);'></span>";
+							imgList += "<span imageId='"+data.imageArray[i].id+"' class='downloadOriginal' title='下载原图'  onclick='downOriginal(event,this,false);'></span>";
 							imgList += "</div>";
 							imgList += "<em class='imgs_form'>已上传</em>";						
 							imgList += "</div>";			
@@ -167,7 +163,7 @@
 	event.stopPropagation();  //阻止冒泡
 	if(isImgVideo){//跳转视频
 		$(that).parent().children(".video_img")[0].click();
-	}else{//跳转图片		
+	}else{//跳转图片	
 		$(that).parent().children(".spotlight")[0].click();
 	}
 }
@@ -267,6 +263,16 @@
 	
 }
 
+//下载原图
+function downOriginal(event,that,isImgVideo){
+	event.preventDefault();
+	event.stopPropagation();  //阻止冒泡
+	var imageId = $(that).attr("imageId");
+	var imgUrlOriginal =  WWWROOT +'/disinfectSystem/baseData/uploadImageAndVideoAction!getImageById.do?imageId='+ imageId+'&original=true';
+	$(that).parent().parent().children(".spotlight").attr('href',imgUrlOriginal);
+	$(that).parent().parent().children(".spotlight")[0].click();
+}
+
 function imgAndVideoBtn(){	
 	// 弹出窗口
 	var pageUrl = WWWROOT + '/disinfectsystem/test/takeVideoAndImg.jsp';