Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r27500 -r27731 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 27500) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 27731) @@ -927,6 +927,7 @@ var imageIds = document.getElementById("imageIds").value; var videoIds = document.getElementById("videoIds").value; + if(imageIds == ""){ imageIds = null; } @@ -938,18 +939,11 @@ tousseDefinitionId = ""; } - - var urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp'; - var params = { - goodsName:tousseName, - imageType:imageTypeCameraApplication, - videoType:videoType, - objectId:tousseDefinitionId, - videoIds:videoIds, - imageIds:imageIds, - isLook:isLook + var urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName='+ tousseName +'&imageType='+imageTypeCameraApplication+'&videoType='+videoType+'&objectId='+tousseDefinitionId+'&videoIds='+videoIds+'&imageIds='+imageIds+'&isLook='+isLook; + var videoImgWin = openFullSizeWindowWithName(urls,true,'图片视频拍摄'); + if(videoImgWin != null ){ + videoImgWin.focus(); } - var videoImgWin = openModalWindowForExt(urls,params,'图片视频拍摄',1020,600); } /* function takeImgAndVideo(tousseName,tousseDefinitionId,isLook){