Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r31642 -r31911
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 31642)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 31911)
@@ -1715,36 +1715,14 @@
 		showResult("视频正在录制中，不能播放!");
 		return false;
 	}
-	Ext.Ajax.request({
-		url : WWWROOT + '/disinfectSystem/baseData/videoRecordAction!getRecordList.do',
-		params: {
-		    deviceId:deviceId,
-			startTime:beginTime,
-			endTime:endTime
-		},
-		success: function(response, options) {
-			var result = Ext.decode(response.responseText);
-		    var data = result.data;
-			data = JSON.stringify(data);
-			var urls = WWWROOT + "/disinfectsystem/videoMonitor/videoFile.jsp";
-			var playVideoWin = new top.Ext.Window({
-				id : 'playVideoWin',
-				layout : 'fit',
-				title : '视频播放',
-				width : 740,
-				height:430,
-				modal : true,
-				border : false,
-				html:"<iframe src="+urls+" height='100%' width='100%' id='RecyclingRecordIframe' name='RecyclingRecordIframe'  frameborder='no' border='0'></iframe>",
-				plain : true
-			});
-			playVideoWin.show(); 
-			document.getElementById('videoMsg').value = data;
-			document.getElementById('formRecyclingRecordVideo').action = WWWROOT + "/disinfectsystem/videoMonitor/videoFile.jsp";
-			document.getElementById('formRecyclingRecordVideo').submit();
-		},
-		failure: function(result) {
-	
-		}
-	});
+	var params = {
+		deviceId:deviceId,
+		startTime:encodeURIComponent(beginTime),
+		endTime:encodeURIComponent(endTime)
+	}
+	if(isIE()){
+		openModalWindow(WWWROOT + "/disinfectsystem/videoMonitor/videoFile.jsp?deviceId="+deviceId+'&startTime='+encodeURIComponent(beginTime)+'&endTime='+encodeURIComponent(endTime), '', "740", "390");
+	}else {
+		openModalWindowForExt(WWWROOT + "/disinfectsystem/videoMonitor/videoFile.jsp",params, "视频播放", "740", "390");
+	}
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/videoMonitor/videoManage.js
===================================================================
diff -u -r27195 -r31911
--- ssts-web/src/main/webapp/disinfectsystem/videoMonitor/videoManage.js	(.../videoManage.js)	(revision 27195)
+++ ssts-web/src/main/webapp/disinfectsystem/videoMonitor/videoManage.js	(.../videoManage.js)	(revision 31911)
@@ -64,63 +64,16 @@
 		showResult("视频正在录制中，不能播放!");
 		return false;
 	}
-	Ext.Ajax.request({		
-		url : WWWROOT + '/disinfectSystem/baseData/videoRecordAction!getRecordList.do',
-		params: {
-			deviceId:deviceId,
-			startTime:startTime,
-			endTime:endTime
-		},
-		success: function(response, options) {
-			var result = Ext.decode(response.responseText);
-			var data = result.data;	
-			if(data.length == 0){
-				showResult("视频不存在，请检查!");
-				return;
-			}
-		/* 	var data = [{
-					"url": "eb9ff8738ac24b9c9e3551ec61eb56b6_1.mp4",
-					"name": "视频1"
-				},
-				{
-					"url": "fe9760daa62844cdbe0c40bbbb6eea77_丁香消毒供应追溯系统介绍视频.mp4",
-					"name": "视频2"
-				},
-				{
-					"url": "8d10a26ab87348819162a249ca7c2a8d_2.mp4",
-					"name": "视频3"
-				},
-				{
-					"url": "300c482916914b149877c5ca9adc97f3_3.mp4",
-					"name": "视频4"
-				},
-				{
-					"url": "300c482916914b149877c5ca9adc97f3_3.mp4",
-					"name": "视频5"
-				}	
-			] */
-			data = JSON.stringify(data);
-			var urls = WWWROOT + "/disinfectsystem/videoMonitor/videoFile.jsp";
-			var playVideoWin = new top.Ext.Window({
-				id : 'playVideoWin',
-				layout : 'fit',
-				title : '视频播放',
-				width : 740,
-				height:430,
-				modal : true,
-				border : false,
-				html:"<iframe src="+urls+" height='100%' width='100%' id='thisIframe' name='thisIframe'  frameborder='no' border='0'></iframe>",
-				plain : true
-			});
-			playVideoWin.show(); 
-			document.getElementById('videoMsg').value = data;
-			document.getElementById('formVideoManage').action = WWWROOT + "/disinfectsystem/videoMonitor/videoFile.jsp";
-			document.getElementById('formVideoManage').submit();
-		},
-		failure: function(result) {
-
-		}
-	});
+	var params = {
+		deviceId:deviceId,
+		startTime:encodeURIComponent(startTime),
+		endTime:encodeURIComponent(endTime)
+	}
+	if(isIE()){
+		openModalWindow(WWWROOT + "/disinfectsystem/videoMonitor/videoFile.jsp?deviceId="+deviceId+'&startTime='+encodeURIComponent(startTime)+'&endTime='+encodeURIComponent(endTime), '', "740", "390");
+	}else {
+		openModalWindowForExt(WWWROOT + "/disinfectsystem/videoMonitor/videoFile.jsp",params, "视频播放", "740", "390");
+	}
 };
 
 function modify() {
@@ -279,4 +232,4 @@
 			items: grid
 		}]
 	});
-});
+});
Index: ssts-web/src/main/webapp/disinfectsystem/videoMonitor/videoFile.jsp
===================================================================
diff -u -r29513 -r31911
--- ssts-web/src/main/webapp/disinfectsystem/videoMonitor/videoFile.jsp	(.../videoFile.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/videoMonitor/videoFile.jsp	(.../videoFile.jsp)	(revision 31911)
@@ -3,22 +3,74 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
 <title></title>
-<script type="text/javascript" src="${ctx}/disinfectsystem/touchScreen/recycle/js/jquery-min.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/touchScreen/recycle/js/jquery-min.js"></script>
 <style type="text/css">
 	*{margin:0px;padding:0px;}
 	body {overflow: hidden;}
-	.videoBox{width:750px;height:400px;}
-	.videoBox div{height:400px;float:left;}
-	.videoBtn {width: 140px; overflow-y: auto;margin-left: 5px;}
-	.videoBtn button{height: 31px;width: 120px;border: none;border-bottom: 1px solid #ccc;cursor: pointer;text-align:left;padding-left: 23px;display: block;padding-right: 10px;white-space:nowrap;}
-	.videoBtn button.on{color:red;font-weight: bold;}
-	.videoHtml{width:600px;}
+	.videoBox {
+		width: 835px;
+		height: 400px;
+	}
+
+	.videoBox div {
+		height: 400px;
+		float: left;
+	}
+
+	.videoBtn {
+		width: 225px;
+		overflow-y: auto;
+		overflow-x: hidden;
+		margin-left: 8px;
+	}
+
+	.videoBtn a {
+		height: 31px;
+		width: 225px;
+		border: 0;
+		border-bottom: 1px solid #ccc;
+		cursor: pointer;
+		text-align: left;
+		display: block;
+		padding:0 10px;
+		white-space: nowrap;
+		line-height: 31px;
+		display: block;
+    	font-size: 12px;
+		text-decoration: none;
+	}
+
+	.videoBtn a img {
+		margin-bottom: -3px;
+		margin-right: 5px;
+	}
+
+	.videoBtn a.on {
+		color: red;
+		font-weight: bold;
+	}
+
+	.videoHtml {
+		width: 600px;
+		text-align: center;
+	}
+
+	.videoHtml img {
+		height: 100%;
+	}
+
+	.x-window-body {
+		height: 400px !important;
+	}
 </style>
 
 <script type="text/javascript">
 	var WWWROOT = '${ctx}';
-	var data = '<%=request.getParameter("videoMsg")%>';
+	var deviceId = '${param.deviceId}';
+	var startTime = '${param.startTime}';
+	var endTime = '${param.endTime}';
 </script>
 </head>
 <body>
@@ -28,75 +80,62 @@
 	  	<div  id="videoBtn" class="videoBtn">
 	  	</div>
 	</div>
-<script type="text/javascript" src="${pageContext.request.contextPath }/activeX/ckplayer/ckplayer.js" charset="utf-8"></script>
+	<input type="hidden" id="videoMsg" value="" />
+<script type="text/javascript" src="${ctx }/js/common.js?version=${svnRevision}"></script>
 <script type="text/javascript">
-	function videoHref(url,name){
-		$("#everyBtnIds_"+name).addClass("on").siblings().removeClass("on");
-		//替换参数中的?与&符号,防止参数丢失
-		url = url.replace(/\&/g,"YUHAO");
-		url = url.replace(/\?/g,"WENHAO");
-		var urls = WWWROOT+"/disinfectsystem/basedatamanager/tousse/watchVideo.jsp?videoUrl="+encodeURI(url);
-		$("#videoHtml iframe").remove();
-		$("#videoHtml").append("<iframe  src='"+urls+"' frameborder='0' align='left' width='600' height='400' scrolling='no'></iframe>");
-	}
-	$(function(){
-		function defaultPlayFirstVideo() {
-				var $tempButton = $("#videoBtn button").eq(0);
-				var urls = $tempButton.attr("urls");
-				var name = $tempButton.attr("name");			
-				videoHref(urls,name);
-				document.title = "【"+name+"】";
-				$tempButton.addClass("on").siblings().removeClass("on");
+	function videoHref(url,name,that,isFirst){
+		if(isIE()){
+			var urls = WWWROOT+"/disinfectsystem/basedatamanager/tousse/watchVideo.jsp?videoUrl="+encodeURI(url);
+			$("#videoHtml iframe").remove();
+			$("#videoHtml").append("<iframe  src='"+urls+"' frameborder='0' align='left' width='600' height='400' scrolling='no'></iframe>");
+		}else {
+			$('#videoHtml').html('<video id="myVideo" src="'+url+'" controls width="600" height="400"></video>');
 		}
-		data = JSON.parse(data);
-		/*var data = [
-		 	           {
-		 	              "name": "204819开始",
-		 	              "url": "http://192.168.2.143:5000/webapi/entry.cgi?api=SYNO.SurveillanceStation.Recording&method=Stream&version=6&recordingId=17&_sid=IwwGa3QmXsLNMB1J4N01072"
-		 	          },
-		 	          {
-		 	              "name": "204919开始",
-		 	              "url": "http://192.168.2.143:5000/webapi/entry.cgi?api=SYNO.SurveillanceStation.Recording&method=Stream&version=6&recordingId=18&_sid=IwwGa3QmXsLNMB1J4N01072"
-		 	          },
-		 	          {
-		 	              "name": "205019开始",
-		 	              "url": "http://192.168.2.143:5000/webapi/entry.cgi?api=SYNO.SurveillanceStation.Recording&method=Stream&version=6&recordingId=19&_sid=IwwGa3QmXsLNMB1J4N01072"
-		 	          },
-		 	          {
-		 	              "name": "205119开始",
-		 	              "url": "http://192.168.2.143:5000/webapi/entry.cgi?api=SYNO.SurveillanceStation.Recording&method=Stream&version=6&recordingId=20&_sid=IwwGa3QmXsLNMB1J4N01072"
-		 	          },
-		 	          {
-		 	              "name": "205219开始",
-		 	              "url": "http://192.168.2.143:5000/webapi/entry.cgi?api=SYNO.SurveillanceStation.Recording&method=Stream&version=6&recordingId=21&_sid=IwwGa3QmXsLNMB1J4N01072"
-		 	          },
-		 	          {
-		 	              "name": "205320开始",
-		 	              "url": "http://192.168.2.143:5000/webapi/entry.cgi?api=SYNO.SurveillanceStation.Recording&method=Stream&version=6&recordingId=22&_sid=IwwGa3QmXsLNMB1J4N01072"
-		 	          },
-		 	          {
-		 	              "name": "205420开始",
-		 	              "url": "http://192.168.2.143:5000/webapi/entry.cgi?api=SYNO.SurveillanceStation.Recording&method=Stream&version=6&recordingId=23&_sid=IwwGa3QmXsLNMB1J4N01072"
-		 	          },
-		 	          {
-		 	              "name": "20时55分20开始",
-		 	              "url": "http://192.168.2.143:5000/webapi/entry.cgi?api=SYNO.SurveillanceStation.Recording&method=Stream&version=6&recordingId=24&_sid=IwwGa3QmXsLNMB1J4N01072"
-		 	          }
-		 	      ];*/
 		
-		var btnHtml = "";
-		for(var i = 0;i < data.length;i++){
-			var urls = data[i].url;
-			//接口返回的视频名称是包含英文冒号的
-			var originalName = data[i].name;
-			//将英文冒号替换成减号，否则button元素的id中包含英文冒号会报错
-			var name = originalName.replace(/\:/g,"-");
-			//button元素的各项属性如id、name、title等都是减号，以免页面报错；但其显示名称仍为原始名称（包含英文冒号）
-			btnHtml += "<button  name='"+name+"' urls='"+urls+"' id ='everyBtnIds_"+name+"'  onclick=\"videoHref('"+urls+"','"+name+"')\" title='"+name+"' style='background:url("+WWWROOT+"/images/web/play.png) no-repeat 2px center'>"+originalName+"</button>";
+		if(isFirst){
+			if(that){
+				$('a').removeClass('on');
+				$(that).addClass('on');
+			}else {
+				$('a').removeClass('on');
+				$('a').first().addClass('on');
+			}
 		}
-		$("#videoBtn").append(btnHtml);
-		defaultPlayFirstVideo();//默认打开第一个
-	})
+	}
+	$(function(){
+		$.ajax({
+			type:'post',
+			dataType:'json',
+			url : WWWROOT + '/disinfectSystem/baseData/videoRecordAction!getRecordList.do',
+			data:{
+				deviceId:deviceId,
+				startTime:startTime,
+				endTime:endTime
+			},
+			success : function(result) {
+				var resultData = result.data;
+				if (resultData.length > 0) {
+					var btnHtml = "";
+					for (var i = 0; i < resultData.length; i++) {
+						var name = resultData[i].name;
+						var urls = resultData[i].url;
+						var videoNamesSub = name;
+						if (name.length > 25) {
+							videoNamesSub = name.substring(0, 25) + "...";
+						} else {
+							videoNamesSub = name;
+						}
+						btnHtml += "<a href='javascript:void(0)' onclick=\"videoHref('"+urls+"','"+name+"',this,true)\" title='" + name + "'><img src= '"+WWWROOT+"/images/web/play.png' />" + videoNamesSub + "</a>";
+					}
+					$("#videoBtn").append(btnHtml);
+					videoHref(resultData[0].url,resultData[0].name,'',true);
+					$(".videoBox").css({ "background": "none" });
+				} else {
+					$(".videoHtml").html('<img src="'+WWWROOT+'/images/web/noVideo.png" />');
+				}
+			}
+		})
+	});
 
 </script>
 </body>