Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r26923 -r26942
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 26923)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 26942)
@@ -1433,12 +1433,25 @@
 	    		var warningGrid = new Ext.grid.GridPanel({
 	                   store: new Ext.data.Store({
 	                       reader : new Ext.data.JsonReader({
-	                           fields : ["warningItemType", "warningAmount"]
+	                           fields : ["warningItemType", "warningAmount", "remark"]
 	                       })
 	                   }),
 	                   columns: [
-	                       {header: "告警类型", width: 300, dataIndex: 'warningItemType'},
-	                       {header: "告警数量", width: 60,dataIndex: 'warningAmount'},
+	                       {header: "告警类型", width: 300, dataIndex: 'warningItemType',renderer:function(v , p , record){
+							   //如果告警类型为设备维护过期告警,则字体调整为红色
+	                    	   if(v == warningDeviceMaintenanceOutDate){
+	                    		   return "<font color='red'>" + v + "<font>";
+	                    	   }
+	                    	   return v;
+	                       }},
+	                       {header: "告警数量", width: 60,dataIndex: 'warningAmount',renderer:function(v , p , record){
+	                    	   //如果为设备维护的告警
+	                    	   if(record.data.warningItemType == warningDeviceMaintenance
+	                    		  || record.data.warningItemType == warningDeviceMaintenanceOutDate){
+	                    		   return "<a href=\"#\" onclick=\"warningAlert('"+ warningItemType +"' , '"+ record.data.remark +"');\">"+ v +"</a>"
+	                    	   }
+	                    	  return v;
+	                       }},
 	                       {header: "操作", width: 70,dataIndex: 'warningItemType',renderer : hrefPage}
 	                   ],
 	                   stripeRows: true,
@@ -1537,16 +1550,32 @@
 		addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/basedatamanager/supplier/supplierView.jsp?warningStatus=true');
 	}else if(v == warningContract){
 		addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/assestManagement/contract/contractWarningView.jsp');
+	}else if(v == warningDeviceMaintenance || v == warningDeviceMaintenanceOutDate){//设备维护提前预警及过期告警管理点击后进入设备维护列表页面
+		addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsView.jsp?warningItemType=' + v);
 	}
 	warningWindow.close();
 }
 
+/**
+ * 弹出告警提示筐
+ * @param warningItemType 告警类型
+ * @param messageContent 消息内容
+ * @returns
+ */
+function warningAlert(warningItemType , messageContent){
+	if(warningItemType == warningDeviceMaintenance){
+		alert('以下设备维护信息即将到期:\n' + messageContent);
+	}else if(record.data.warningItemType == warningDeviceMaintenanceOutDate){
+		alert('以下设备维护信息已过期:\n' + messageContent);
+	}
+}
+
 function hrefPage(v, p, record){
 	var mess = "查看详细";
 	if(v != null && v.indexOf("生物监测") != -1){
 		mess = "&nbsp;";
 	}
-	return "<a href=\"#\" onclick=\"gopage('"+v+"');return false;\">"+mess+"</a>";
+	return "<a href=\"#\" onclick=\"gopage('"+ v +"');return false;\">"+mess+"</a>";
 }
 
 /**