Index: ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js =================================================================== diff -u -r28143 -r28147 --- ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js (.../videoAndImg.js) (revision 28143) +++ ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js (.../videoAndImg.js) (revision 28147) @@ -187,7 +187,7 @@ var num = $(that).attr("num"); if(isLoading){ var bigVideoUrls = $(that).attr("bigVideoUrl"); - result.innerHTML = result.innerHTML + ''; + result.innerHTML = result.innerHTML + ''; $("#videoShow").show(); }else{ var simpleFile = new File([blobs[num]], 'msr-' + (new Date).toISOString().replace(/:|\./g, '-') + '.mp4', { @@ -197,7 +197,7 @@ // 将文件以Data URL形式进行读入页面 reader.readAsDataURL(simpleFile); reader.onload = function(e){ - result.innerHTML = result.innerHTML + ''; + result.innerHTML = result.innerHTML + ''; $("#videoShow").show(); } } Index: ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.js =================================================================== diff -u -r28143 -r28147 --- ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.js (.../takeVideoAndImg.js) (revision 28143) +++ ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.js (.../takeVideoAndImg.js) (revision 28147) @@ -101,6 +101,8 @@ } function openCamera() { + var cameraHeight = $(window).height()-$(".camera_footer").height()-20; + var cameraWidth = parseInt(cameraHeight/480*640); var video = document.getElementById('video'); var videoWidth = cameraWidth; var videoHeight = cameraHeight;