Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r12331 -r12511
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 12331)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 12511)
@@ -657,7 +657,9 @@
 	$div.append($iframeContent);
 	$("#windowBox").append($div);*/
 }
-//tab 标签选择变化时发生
+/**
+ * tab 标签选择变化时发生，title为新tab的标题
+ */
 function onTabChange(title){
 	//控制红色数字提醒的显示和隐藏
 	if(title == personalDesktopTitle){
@@ -677,9 +679,9 @@
 	}
 	
 	//选择tab 则显示该tab所对应打开的页面，其他页面隐藏上一个页面
-	if(previousActiveTabTitle!=title){
+	if(currentActiveTabTitle!=title){
 		//隐藏上一个tab所对应的页面
-		var previousDivObj = getElementByTitle(previousActiveTabTitle);
+		var previousDivObj = getElementByTitle(currentActiveTabTitle);
 		if(previousDivObj != null){
 			previousDivObj.style.display = "none";
 		}
@@ -692,7 +694,7 @@
 				currentDivObj.style.display = "block";
 			}
 		}
-		previousActiveTabTitle = title;
+		currentActiveTabTitle = title;
 	}else{
 		var personalDesktopDiv = getElementByTitle(personalDesktopTitle);
 		if(personalDesktopDiv){
@@ -705,7 +707,7 @@
 				nextSiblingObj = nextSiblingObj.nextSibling;
 			}
 		}
-		previousActiveTabTitle = personalDesktopTitle;
+		currentActiveTabTitle = personalDesktopTitle;
 	}
 	closeMenus_box();
 }
@@ -1025,7 +1027,7 @@
 		url: WWWROOT+"/system/systemWarningAction!getSystemWarning.do",
 		success: function(response) {
 			var result = Ext4.decode(response.responseText);
-	    	if(result.success && result.data.length > 0){
+	    	if(result.success && result.data && result.data.length > 0){
 	    		if(isFirstOnLoad){
 	    			//设置提醒数字
 	    			var container = Ext4.getBody();
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r12332 -r12511
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 12332)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 12511)
@@ -44,9 +44,14 @@
 	)
 });
 function reflushWaitPackingTreeGrid(){
-	var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
-	if (waitPackingTreeGrid != null && waitPackingTreeGrid.isVisible() == true){
-		waitPackingTreeGrid.getStore().reload();
+	var tabTitle = parent.currentActiveTabTitle;
+	var taskGroup = getURLParameter("taskGroup","") + "装配";
+	// 只有当装配界面是处于活动的Tab时，才刷新，以避免刷新后的界面为空白的问题
+	if (tabTitle == taskGroup){
+		var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
+		if (waitPackingTreeGrid != null && waitPackingTreeGrid.isVisible() == true){
+			waitPackingTreeGrid.getStore().reload();
+		}
 	}
 }
 
@@ -2473,9 +2478,23 @@
 	Ext4.getCmp('reviewer').setValue(reviewer);
 }
     
-//定时刷新（每隔五分钟刷新一次）
-setInterval("reflushWaitPackingTreeGrid();",60*1000*5);
+/**
+ * 空闲时刷新（每空闲5分钟刷新一次）
+ * 如果有鼠标或者键盘事件，则重新计时
+ */
+var inactivityTime = function () {
+    var t;
+    window.onload = resetTimer;
+    document.onmousemove = resetTimer;
+    document.onkeypress = resetTimer;
 
+    function resetTimer() {
+        clearTimeout(t);
+        t = setInterval(reflushWaitPackingTreeGrid, 5*60*1000)
+    }
+};
+inactivityTime();
+
 Ext4.create('Ext4.container.Viewport', {
     layout: 'border',
     items: [{
Index: ssts-web/src/main/webapp/homepage/portalPage.jsp
===================================================================
diff -u -r12331 -r12511
--- ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 12331)
+++ ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 12511)
@@ -149,7 +149,10 @@
 var tabsTempId = 1;
 var isDrag = false; //是否为拖拽
 var personalDesktopTitle = "个人桌面";
-var previousActiveTabTitle = "";
+/**
+ * 当前活动的Tab标签的标题
+ */
+var currentActiveTabTitle = "";
 var showOrHide = false;
 
 var cp = new Ext.state.CookieProvider();