Index: ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js =================================================================== diff -u -r27185 -r27463 --- ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js (.../videoAndImg.js) (revision 27185) +++ ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js (.../videoAndImg.js) (revision 27463) @@ -266,21 +266,9 @@ } function imgAndVideoBtn(){ - var winowW = 1024; - var winowH = 666; - var winTop = (window.screen.availHeight -winowW)/2; - var winLeft = (window.screen.availWidth -winowH)/2; - if(window.screen.height == 768){ - lefts = 0; - tops = 0; - } // 弹出窗口 var pageUrl = WWWROOT + '/disinfectsystem/test/takeVideoAndImg.jsp'; - var style = "resizable=yes,top="+winTop+",left="+winLeft+",width="+winowW+",height="+winowH+",status=no,menubar=no,toolbar=no,Scrollbars=no,Location=no,Direction=no,resizable=no"; - popwin=window.open(pageUrl,"_blank",'图片视频拍摄',style); - if(popwin != null ){ - popwin.focus(); - } + openFullSizeWindowWithName(pageUrl,true,'拍摄视频图片'); } /* 上传视频或者图片 */ @@ -329,7 +317,7 @@ success : function(result) { var data = JSON.parse(result); if(data.success){ - var imageIds = data.imageIds; + var imageIds = data.imageIds; var videoIds = data.videoIds; //置空 @@ -406,7 +394,7 @@ }else{ $("#loading").hide(); layer.msg(data.message, {icon: 2}); - } + } } }) } @@ -427,5 +415,5 @@ window.onunload = function () { if(popwin != null) { popwin.close(); - } + } } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.jsp =================================================================== diff -u -r27172 -r27463 --- ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.jsp (.../takeVideoAndImg.jsp) (revision 27172) +++ ssts-web/src/main/webapp/disinfectsystem/test/takeVideoAndImg.jsp (.../takeVideoAndImg.jsp) (revision 27463) @@ -2,40 +2,98 @@ <%@ include file="/common/taglibs.jsp"%> +
- - -