Index: ssts-web/src/main/webapp/expensivegoodshomepage/portalPage.js
===================================================================
diff -u -r23307 -r23458
--- ssts-web/src/main/webapp/expensivegoodshomepage/portalPage.js	(.../portalPage.js)	(revision 23307)
+++ ssts-web/src/main/webapp/expensivegoodshomepage/portalPage.js	(.../portalPage.js)	(revision 23458)
@@ -79,7 +79,11 @@
 		//如果数量为0时则移除掉提醒数字
 		if(document.getElementById(tipId)){
 			var imgElements = document.getElementById(tipId).getElementsByTagName("img");
-			document.getElementById(tipId).remove(imgElements);
+			//谷歌兼容但不兼容ie,所以先注释掉
+			//document.getElementById(tipId).remove(imgElements);
+			if(imgElements && imgElements.length > 0){
+				imgElements[0].parentNode.removeChild(imgElements[0]);
+			}
 		}
 	}
 }
@@ -128,7 +132,7 @@
 	});//console.log('time9=' + new Date().format('y-m-d H:i:s') + '.' + new Date().getMilliseconds());
 	
 	//系统告警
-	//initShowSystemWarningWin();//console.log('time10=' + new Date().format('y-m-d H:i:s') + '.' + new Date().getMilliseconds());
+	initShowSystemWarningWin();//console.log('time10=' + new Date().format('y-m-d H:i:s') + '.' + new Date().getMilliseconds());
 
 	windowOnLoaded = true;//console.log('time20=' + new Date().format('y-m-d H:i:s') + '.' + new Date().getMilliseconds());
 	
@@ -204,9 +208,7 @@
 		//$("#systemWarningTip").css("top", getepoint(systemWarningObj).y -4);
 	}
 }
-function showProblemReportWin(){
-	
-}
+
 function createMenu(){
 	var menuArr = DisinfectsystemTreeData;
 	if(typeof(menuArr)=='undefined'|| menuArr.length < 1)return '';
@@ -448,10 +450,10 @@
 		if (notInWhiteList2(itemId)) {
 			return returnContent;
 		}
-		//只显示高值耗材的几个图标和高级视图
+		//只显示高值耗材的几个图标和高级视图(因为需要登录时提示有关的告警信息,所以系统告警图标也需要显示)
 		if(itemId == 'expensiveGoodsApplication' || itemId == 'expensiveGodownEntryPurchase' || itemId == 'expensiveGodownEntryPrepareIn'
 			|| itemId == 'expensiveInvoicePlan' || itemId == 'expensiveInvoice' || itemId == 'expensiveBill' || itemId == 'expensiveStockTake' 
-				|| itemId == 'useRecord' || itemId == 'myUnFinishedTask' || itemId == 'myFinishedTask' || itemId == 'expensiveEnterpriseView'){
+				|| itemId == 'useRecord' || itemId == 'myUnFinishedTask' || itemId == 'myFinishedTask' || itemId == 'expensiveEnterpriseView' || itemId == 'systemWarning'){
 			returnContent += '<li id="'+itemId+'" class="'+portalPage['itemStyleClass']+'" title="'+item['title']+'" href="'+item['itemLinkUrl']+'">';
 			returnContent += '<div class="imgDvi"><p><a href="#" ><span><img width=86 height=86 src="' + itemUrl + '"></span></a></P></div>';
 			returnContent += '<a class="icon-text" href="javascript:void(0);"><span>'+item['title']+'</span></a></li>';
@@ -881,6 +883,7 @@
 		async: true,
 		dataType:"json",
 		url: WWWROOT+"/system/systemWarningAction!getSystemWarning.do",
+		params : {warningTypes : allExpensiveGoodsWarningTypes.join(";")},
 		success: function(response) {
 			var result = Ext4.decode(response.responseText);
 	    	if(result.success && result.data && result.data.length > 0){