Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r26775 -r27068
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 26775)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 27068)
@@ -3618,6 +3618,17 @@
         	var showName = tousseName;
     		if (result.success){
     			processAfterPacking(printImmediately,result, showName, packAmount);
+    			//保存装配视频监控
+    			if(sstsConfig.enableVideoMonitorModule 
+    					&& setVideoWhenAddPackingRecord){
+    				if(result.packingRecordIds && result.packingRecordIds.length > 0){
+    					var packingRecordIdArray = [];
+    					for (var i = 0; i < result.packingRecordIds.length; i++) {
+    						packingRecordIdArray.push(result.packingRecordIds[i]);
+						}
+    					setVideoWhenAddPackingRecord(packingRecordIdArray);
+    				}
+    			}
     		}
     		else{
     			//如果返回失败的结果类型为stockNotEnough(即库存不足,则进行提示)
@@ -3641,6 +3652,17 @@
             					            	processAfterConfirmPacking(printImmediately,result, showName, packAmount);
             					            	printLabelsAfterConfirmPacking(result.tousses);
             					            }
+            					            //保存装配视频监控
+            				    			if(sstsConfig.enableVideoMonitorModule 
+            				    					&& setVideoWhenAddPackingRecord){
+            				    				if(result.packingRecordIds && result.packingRecordIds.length > 0){
+            				    					var packingRecordIdArray = [];
+            				    					for (var i = 0; i < result.packingRecordIds.length; i++) {
+            				    						packingRecordIdArray.push(result.packingRecordIds[i]);
+            										}
+            				    					setVideoWhenAddPackingRecord(packingRecordIdArray);
+            				    				}
+            				    			}
             							},
             						    error : function(req, textStatus) {
             						    	showResult('装配失败!' , null , sstsConfig.messagePauseTimeOnPackingPage);
@@ -4700,16 +4722,15 @@
  */
 var inactivityTime = function () {
     var t;
-    window.onload = resetTimer;
     document.onmousemove = resetTimer;
     document.onkeypress = resetTimer;
 
     function resetTimer() {
-        clearTimeout(t);
+        clearInterval(t);
         t = setInterval(reflushWaitPackingTreeGrid, 5*60*1000)
     }
+    resetTimer();
 };
-inactivityTime();
 
 if(allowPackingWhenUnSupplementMaterial){
 	var hisPackingRecordGrid = Ext4.getCmp("todayHisPackingRecordPanel");
@@ -4775,6 +4796,7 @@
 
 //查询全部丢失、报损数量
 getErrorAndDamgeCount();
-
+//空闲时刷新（每空闲5分钟刷新一次）
+inactivityTime();
 });