Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/watchVideo.jsp
===================================================================
diff -u -r27051 -r27055
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/watchVideo.jsp	(.../watchVideo.jsp)	(revision 27051)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/watchVideo.jsp	(.../watchVideo.jsp)	(revision 27055)
@@ -29,7 +29,7 @@
 	var WWWROOT = '${ctx}';
 	//装配或者包定义视频
 	var name = '<%=request.getParameter("videoName")%>';
-	//视频监控装配记录或者回收记录视频
+	//视频监控装配记录或者回收记录视频url
 	var videoUrl = '<%=request.getParameter("videoUrl")%>';
 	var videoPath = WWWROOT+'/UserUpLoadFiles/packingTeacherVideo/'+name;
 	var path = '${pageContext.request.contextPath }/activeX/ckplayer/ckplayer.swf';
@@ -45,9 +45,9 @@
 -->
 <script type="text/javascript" src="${pageContext.request.contextPath }/activeX/ckplayer/ckplayer.js" charset="utf-8"></script>
 <script type="text/javascript">
-    function watch(name){    	
-    	if(videoUrl){
-    		videoPath = videoUrl;
+    function watch(name){
+    	if(videoUrl !="" && videoUrl != "null"){
+    		videoPath = videoUrl;    		
     	}else{
     		videoPath = '${pageContext.request.contextPath }/disinfectSystem/packingAction!getVideo.do?name=' + encodeURI(name) + '&a=1';//不在后面加个参数后台参数就乱码
     	}