Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r36169 -r36250
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 36169)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 36250)
@@ -10,6 +10,7 @@
 var useRecordMenu ;
 //用来判断Ext4.onReady执行完没有(selenium自动测试需要用到这个变量,请不要删除)
 var windowOnLoaded = false;
+var problemWarningWin;
 var tabs;     //tabPanel
 //tips提示的元素,在addIconTips()方法中添加
 var tipsEle = [];
@@ -357,6 +358,9 @@
 	//维修信息提醒
 	initShowInstrumentRepairManagementWin();
 
+	//CDSLQYQYYY-117:弹窗提醒功能
+	getProblemWarningWin();
+
 	//CDSLQYQYYY-113：定期监测提醒
 	if(sstsConfig.enableThePeriodicMonitoringRemindersFunction){
 		Ext4.Ajax.request({
@@ -1828,6 +1832,70 @@
 	}
 }
 
+//CDSLQYQYYY-117:弹窗提醒功能
+function getProblemWarningWin(){
+	var problemWarningStore = new Ext.data.Store({
+		proxy : new Ext.data.HttpProxy({
+			url : WWWROOT + '/system/systemWarningAction!getProblemWarning.do',
+			method : 'POST'
+		}),
+		reader : new Ext.data.JsonReader({
+			totalProperty : 'totalCount',
+			root : 'data'
+		}, [
+			{name : 'id',mapping : 'id'},
+			{name : 'title',mapping : 'title'},
+			{name : 'orgUnitName',mapping : 'orgUnitName'},
+			{name : 'registerPerson',mapping : 'registerPerson'}
+		]),
+		listeners:{
+			load:function(store,records) {
+				if(records.length > 0){
+					problemWarningWin.show();
+				}
+			}
+		}
+	});
+	problemWarningStore.load();
+	var problemWarningGrid = new Ext.grid.GridPanel({
+		store:problemWarningStore,
+		columns: [
+			{header: "标题", width: 200, dataIndex: 'title'},
+			{header: "登记科室", width: 100,dataIndex: 'orgUnitName'},
+			{header: "登记用户", width: 60,dataIndex: 'registerPerson'},
+			{header: "操作", width: 70,dataIndex: 'id',renderer : function(v, p, record){
+				var message = "查看详细";
+				return "<a href=\"#\" onclick=\"gopageForProblemWarning('"+ v +"');return false;\">"+message+"</a>";
+			}}
+		],
+		stripeRows: true,
+		viewConfig: {
+			forceFit:true
+		},
+		bbar: new Ext.PagingToolbar({
+			pageSize: 10,
+			store: problemWarningStore,
+			displayInfo: true
+		}),
+		height:200,
+		width:600
+	});
+	problemWarningStore.load({params: {start: 0, limit: 10}});
+	problemWarningWin = new Ext.Window({
+		autoHeight:true,
+		title : '科室问题反馈提醒',
+		width:615,
+		draggable:true,
+		modal:true,
+		closeAction:'close',
+		items:[problemWarningGrid],
+		close: function() {
+			problemWarningWin.hide();
+		}
+   });
+   Ext.QuickTips.init();
+}
+
 /**
  * 显示未归还告警
  */
@@ -2209,6 +2277,11 @@
 	instrumentRepairWindow.close();
 }
 
+function gopageForProblemWarning(id){
+	addTab('problemWarning','科室问题反馈提醒',WWWROOT + '/disinfectsystem/problemReport/problemReport.jsp?id='+id);
+	problemWarningWin.close();
+}
+
 /**
  * 弹出告警提示筐
  * @param warningItemType 告警类型