Index: ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.jsp =================================================================== diff -u -r27463 -r27864 --- ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.jsp (.../takeVideoAndImg.jsp) (revision 27463) +++ ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.jsp (.../takeVideoAndImg.jsp) (revision 27864) @@ -1,99 +1,100 @@ -<%@ page contentType="text/html; charset=UTF-8"%> -<%@ include file="/common/taglibs.jsp"%> - - - - - - - 视频图片拍摄 - - - - - - - - - - - -
-
- - -
-
-
- - -
-

- -

-
- - -
-
-
- - +<%@ page contentType="text/html; charset=UTF-8"%> +<%@ include file="/common/taglibs.jsp"%> + + + + + + + 视频图片拍摄 + + + + + + + + + + + +
+
+ +
+
+
+ + +
+

+ + +

+
+ + +
+
+
+ + \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp =================================================================== diff -u -r27224 -r27864 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp (.../foreignTousseApplicationView.jsp) (revision 27224) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp (.../foreignTousseApplicationView.jsp) (revision 27864) @@ -109,6 +109,7 @@ //视频类型(申请采集视频) var videoType = '<%=VideoFile.VIDEO_TYPE_CAMERA_APPLICATION%>'; var foreignToussePriceOfSysParams = '<%=pageContext.getAttribute("foreignToussePriceOfSysParams")%>'; + var IMAGE_TYPE_TOUSSE = '<%=ImageFile.IMAGE_TYPE_TOUSSE %>';//器械包图片,查看图片用的参数 Index: ssts-web/src/main/webapp/common/imgAndVideo.css =================================================================== diff -u -r27172 -r27864 --- ssts-web/src/main/webapp/common/imgAndVideo.css (.../imgAndVideo.css) (revision 27172) +++ ssts-web/src/main/webapp/common/imgAndVideo.css (.../imgAndVideo.css) (revision 27864) @@ -87,12 +87,12 @@ cursor: pointer; } .camera_wrapper{ - width: 930px; - margin: 0px auto; - margin-top: 24px; + width: 100%; + /* margin: 0px auto; */ + /* margin-top: 24px; */ } .camera_content{ - height: 532px; + height: 100%; margin: 0px auto; } .camera_footer{ @@ -114,7 +114,7 @@ .camera_Btn{ width:74px; height: 74px; - margin-top: 17px; + margin-top: 10px; background:url(../images/web/imgtakephoto.png) no-repeat; display: inline-block; } @@ -227,4 +227,20 @@ border-color: #afd7af !important; background-color: #afd7af !important; color: #333 !important; +} +@-webkit-keyframes bounce-up { + 0% {-webkit-transform: translateY(0);} + 30% {-webkit-transform: translateY(10%);} +} + +@keyframes bounce-up { + 0% {-webkit-transform: translateY(0);} + 30% {-webkit-transform: translateY(10%);} +} + +.animate-bounce-up{ + width: 136px; + height: 105px; + -webkit-animation: bounce-up 0.6s linear; + animation: bounce-up 0.6s linear; } \ No newline at end of file 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 += ""; list += "
"; list += "未上传"; - // list += ""; list += ""; $("#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")) {//显示拍照图片 Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp =================================================================== diff -u -r27172 -r27864 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 27172) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 27864) @@ -283,7 +283,7 @@ var tousseType_foreignTousse = '<%=TousseDefinition.PACKAGE_TYPE_FOREIGN%>'; //外来器械包 var tousseTypeCustom = '<%=TousseDefinition.PACKAGE_TYPE_CUSTOM%>'; //自定义器械包 - +var IMAGE_TYPE_TOUSSE = '<%=ImageFile.IMAGE_TYPE_TOUSSE %>';//器械包图片,查看图片用的参数 var SSTS_RecycApplication_Create = true; SSTS_RecycApplication_Create = false; Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp =================================================================== diff -u -r27797 -r27864 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 27797) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 27864) @@ -61,7 +61,7 @@ } var trData = ""; - if(parentPageName == 'packingView'){ + if(parentPageName == 'packingView' || parentPageName == 'application'){ $('.table1').hide(); $('.table2').show(); }else { @@ -74,7 +74,7 @@ var materialAmount = json[i].amount; sumTotal+=parseFloat(materialAmount); $('#SumTotal').text(sumTotal); - if(parentPageName == 'packingView'){ + if(parentPageName == 'packingView' || parentPageName == 'application'){ trData += ''; trData += ''; trData += ''+materialName+''; @@ -792,6 +792,8 @@ $(".packing-teach,.instruction-book").show(); }else if(parentPageName == 'toussePictures'){ $(".operationGuide-book,.packing-teach,.tousse-video,.instruction-book").show(); + }else if(parentPageName == 'application'){ + $(".instruction-book").show(); }else { $(".operationGuide-book").show(); } Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r27780 -r27864 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 27780) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 27864) @@ -1820,7 +1820,14 @@ var tousseName = record.get('tousseName'); var tousseDefinitionId = record.get('tousseDefinitionId'); if(!isLeaf){ - var btnHtml = ""; + var currentPage = 1; + var materialId = ""; + var imgName = IMAGE_TYPE_TOUSSE; + var iframeHeight = window.screen.height; + var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980&clientHeight='+iframeHeight+'&parentPageName=application&tousseDefinitionID='+tousseDefinitionId+'&materialId='+materialId+'&tousseName='+encodeURIComponent(tousseName)+'&imgName='+encodeURIComponent(imgName)+'&number='+currentPage; + + //var btnHtml = ""; + var btnHtml = ""; if(sstsConfig.showCameraPhoto){ /* if(id){ //只有再次打开该单修改时,才能查看图片