Index: ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.js
===================================================================
diff -u -r27463 -r27864
--- ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.js	(.../takeVideoAndImg.js)	(revision 27463)
+++ ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.js	(.../takeVideoAndImg.js)	(revision 27864)
@@ -176,8 +176,10 @@
 	}
 };
 
-// 这段代 主要是获取摄像头的视频流并显示在Video 签中
+// 这段代码主要是获取摄像头的视频流并显示在Video 签中
 $(function () {
+	var cameraHeight = $(window).height()-$(".camera_footer").height()-20;
+	$(".camera_wrapper").css({"height":cameraHeight+"px"});
 	var canvas = document.getElementById("canvas");
 	var context = canvas.getContext("2d");
 
@@ -217,6 +219,10 @@
 		}
 
 		if ($("#takePhotos").prop("checked")) {//拍图片
+			/*拍图片的下滑效果  */
+			$("#canvas").removeClass("animate-bounce-up");
+			$("#canvas").hide(0).slideDown("normal");
+			$("#canvas").addClass("animate-bounce-up");
 			context.drawImage(video, 0, 0, imgWidth, imgHeight);
 			contextBig.drawImage(video, 0, 0, 1024, 650);
 			/* 显示在多图片页面 */
@@ -231,7 +237,6 @@
 			list += "</a>";
 			list += "<div class='model on' onclick='triggerLookImgVideo(event,this,false);'><span onclick='removeImgVideo(event,this,false,false);'></span></div>";
 			list += "<em class='imgs_form'>未上传</em>";
-			//	list += "<span class='on' onclick='removeImgVideo(event,this,false);'></span>";	
 			list += "</div>";
 			$("#imgVideoBtn", window.opener.document).before(list);//子窗口给父窗口元素赋值			
 			updateParentImgVideoNum();
@@ -271,6 +276,9 @@
 						$("#cameraBtn").removeClass("stop");
 						$("#cameraBtn").addClass("on");
 						layer.msg("录制成功,视频录制不能超过5分钟!", { icon: 7 });
+						$("#canvas").removeClass("animate-bounce-up");
+						$("#canvas").hide(0).slideDown("normal");
+						$("#canvas").addClass("animate-bounce-up");
 						context.drawImage(video, 0, 0, imgWidth, imgHeight);
 						contextBig.drawImage(video, 0, 0, 1024, 650);
 						//预览大图
@@ -290,11 +298,15 @@
 				//预览大图
 				base64DataBig2 = canvasBig.toDataURL('image/jpeg', 1.0);
 				layer.msg("录制成功!", { icon: 1 });
+				$("#canvas").removeClass("animate-bounce-up");
+				$("#canvas").hide(0).slideDown("normal");
+				$("#canvas").addClass("animate-bounce-up");
 			}
 		}
+	
 	});
+    	
 
-
 	// 点击拍照单选框
 	$("#takePhotos").click(function () {
 		if ($(this).prop("checked")) {//显示拍照图片