Index: ssts-web/src/main/webapp/disinfectsystem/message/messageView2Form.js =================================================================== diff -u -r32189 -r32223 --- ssts-web/src/main/webapp/disinfectsystem/message/messageView2Form.js (.../messageView2Form.js) (revision 32189) +++ ssts-web/src/main/webapp/disinfectsystem/message/messageView2Form.js (.../messageView2Form.js) (revision 32223) @@ -124,7 +124,8 @@ readStatus: '已查阅' }, success: function (response, options) { - loadMessages(); + msgIndex = 0; + loadMessagesStore.load(); } }); } Index: ssts-web/src/main/webapp/homepage/portalPage.js =================================================================== diff -u -r32168 -r32223 --- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 32168) +++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 32223) @@ -1567,6 +1567,66 @@ tousseGoodsStockWarningWin.hide(); } +var loadMessagesWin; +var loadMessagesStore; +var msgIndex = 0; +//DGSETYY-8:显示申请与回收差异消息 +function loadMessages(){ + loadMessagesStore = new Ext.data.JsonStore({ + autoDestroy: true, + fields: ['id', 'title', 'content'], + url : WWWROOT + '/disinfectSystem/systemMessageAction!loadMessages.do', + root: 'data', + baseParams: { + departCode:dirOrgCode, + location:'个人桌面', + messageType:'申请与回收差异消息', + maxSize:6 + } + }); + loadMessagesStore.load(); + var gridPanel = new Ext.grid.GridPanel({ + store: loadMessagesStore, + columns: [{ + header: "告警类型", width: 360, dataIndex: 'title',renderer : function(v,p,record){ + var html = ''; + if(msgIndex < 5){ + html += '
'; + html += '

'; + html += ''+record.data.title+''; + html += '

'; + html += '

'+record.data.content+'

'; + html += '
'; + }else { + html += '
'; + html += '

'; + html += '您还有更多未读消息'; + html += '

'; + html += '
'; + } + return html; + } + }], + stripeRows: true, + viewConfig: { + forceFit:true + }, + hideHeaders: true, + height:380, + width:705 + }); + loadMessagesWin = new Ext.Window({ + autoHeight:true, + title : '申请与回收差异消息', + width:720, + draggable:true, + modal:true, + closeAction:'close', + items:[gridPanel] + }); + loadMessagesWin.show(); +} + function showWarningWin(){ var time = parseInt(sstsConfig.setTheAlarmReminderTimeIntervalForTheEquipmentPackageInventor); setTimeout(function(){ Index: ssts-web/src/main/webapp/homepage/portalPage.jsp =================================================================== diff -u -r32190 -r32223 --- ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 32190) +++ ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 32223) @@ -274,7 +274,7 @@ function createTab(type){ if(type == 2){ window.parent.addTab("messageView2",'差异消息列表','${ctx}/disinfectsystem/message/messageView2.jsp'); - closeLoadMessages(); + loadMessagesWin.hide(); }else { window.parent.addTab("messageView",'消息列表','${ctx}/disinfectsystem/message/message.jsp?departCode='+dirOrgCode); hide(); @@ -317,61 +317,6 @@ } } -var msgAlert; -function closeLoadMessages(){ - if(msgAlert){ - msgAlert.close(); - } -} - -//加载异常情况 -function loadMessages(){ - Ext4.Ajax.request({ - url : WWWROOT + '/disinfectSystem/systemMessageAction!loadMessages.do', - params : { - departCode:dirOrgCode, - location:'个人桌面', - messageType:'申请与回收差异消息', - maxSize:6 - }, - success : function(response, options) { - var result = Ext4.decode(response.responseText,true); - if(result.data.length > 0){ - var html = ''; - var length = (result.data.length == 6) ? 5 : result.data.length; - for(var i=0;i'+result.data[i].title+''; - html += '

'; - html += '

'+result.data[i].content+'

'; - html += ''; - } - msgAlert = new AlertBox("loadMessages",{ - fixed:false, - center:true, - onShow: function(){ - document.getElementById('loadMessagesWord').innerHTML = html; - if(result.data.length == 6){ - document.getElementById('loadMessagesMore').innerHTML = '您还有更多未读消息'; - } - OverLay.show() - }, - onClose: function(){ - OverLay.close() - } - }); - msgAlert.show(); - }else { - if(msgAlert){ - closeLoadMessages(); - } - } - } - }); -} -//end - /** * 隐藏发布消息的div窗口. */ @@ -674,22 +619,6 @@ - -