Index: ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.jsp
===================================================================
diff -u -r37893 -r38847
--- ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.jsp	(.../takeVideoAndImg.jsp)	(revision 37893)
+++ ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.jsp	(.../takeVideoAndImg.jsp)	(revision 38847)
@@ -9,14 +9,14 @@
 	<title>视频图片拍摄</title>
 	<link rel="stylesheet" type="text/css" href="${ctx}/common/imgAndVideo.css?version=${svnRevision}"></link>
 	<script type="text/javascript" src="../../../js/jquery/jquery-3.3.1.min.js?version=${svnRevision}"></script>
-	<!-- layer -->
-	<script type="text/javascript"
-		src="${ctx}/disinfectsystem/touchScreen/recycle/layer-v3.0.3/layer/layer.js?version=${svnRevision}"></script>
+	<script type="text/javascript" src="${ctx}/disinfectsystem/touchScreen/recycle/layer-v3.0.3/layer/layer.js?version=${svnRevision}"></script>
+	<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
 	<script type="text/javascript" src="takeVideoAndImg.js?version=${svnRevision}"></script>
 	<script type="text/javascript">
 		var WWWROOT = "${ctx}";
 		var showVideo = '${param.showVideo}'; 
 		var hiddenImage = '${param.hiddenImage}'; 
+		var imageType = '${param.imageType}'; 
 	</script>
 </head>
 
@@ -71,18 +71,13 @@
 		}
 	</style>
 	<canvas id="canvasBig" style="display:none;"></canvas>
-	<div class="camera_wrapper">
-		<div class="camera_content" id="cameraContent" style="position: relative;">
-			<video id="video" autoplay style="display: hide;">
-<!-- 			<video id="video"  autoplay style="float: left;width:70%;height:100%;position: absolute; top: 0; left: 50%;margin-left: -35%;"> -->
-			<!-- <video id="video"  autoplay style="object-fit: fill;height:100%;"> -->
-			</video>
-			<video id="videoShow" autoplay style="height:100%;width:100%;"></video>
+	<div class="camera_wrapper" style="text-align:center">
+		<div class="camera_content" id="cameraContent" style="position: relative;overflow: hidden;z-index: -10;">
+			<video id="videoShow" autoplay style="height:100%;position: absolute;"></video>
 		</div>
 		<div class="camera_footer">
-			<div style="width: 27%;height: 109px;float:left;text-align: center;">
-				<canvas id="canvas" width="136" height="105" >
-				</canvas>
+			<div style="width: 27%;height: 109px;float:left;text-align: right;" id="preImg">
+				
 			</div>
 			<div style="float: left;width: 15%;height: 109px;line-height: 109px;">
 				<span>选择分辨率：</span>