Index: ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js
===================================================================
diff -u -r27730 -r28037
--- ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js	(.../videoAndImg.js)	(revision 27730)
+++ ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js	(.../videoAndImg.js)	(revision 28037)
@@ -3,6 +3,8 @@
 var imageIdsData = imageIds;
 var videoIdsData = videoIds;
 var popwin = null;
+var imgHight = $(window).height()-120;
+var imgWidth = parseInt(imgHight/650*866);
 //获取图片id
 function getImageIds() {
 	var imageIdsArr=[];
@@ -165,8 +167,10 @@
 	event.stopPropagation();  //阻止冒泡
 	if(isImgVideo){//跳转视频
 		$(that).parent().children(".video_img")[0].click();
+		$('.video_show').css({'width':imgWidth+'px','height':imgHight+'px'});
 	}else{//跳转图片		
 		$(that).parent().children(".spotlight")[0].click();
+		$('.pane').find('img').css({'width':imgWidth+'px','height':imgHight+'px'});
 	}
 }