Index: ssts-web/src/main/webapp/homepage/portalPage.jsp
===================================================================
diff -u -r31420 -r32189
--- ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 31420)
+++ ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 32189)
@@ -156,6 +156,7 @@
 <script type="text/javascript" src="${ctx}/js/showUploadImagesForExtWin.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/speech/speechRecognition.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="sterilizerUnloadMessage.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/message/messageView2Form.js?version=${svnRevision}"></script>
 <style type="text/css">
 .comboxItemCls .x-combo-list-item {
 	height: 20px;
@@ -270,9 +271,14 @@
 /**
  * 创建消息列表的Tab（看到所有发布的消息）.
  */
-function createTab(){
-    window.parent.addTab("messageView",'消息列表','${ctx}/disinfectsystem/message/message.jsp?departCode='+dirOrgCode);
-    hide();
+function createTab(type){
+	if(type == 2){
+		window.parent.addTab("messageView2",'差异消息列表','${ctx}/disinfectsystem/message/messageView2.jsp');
+    	closeLoadMessages();
+	}else {
+		window.parent.addTab("messageView",'消息列表','${ctx}/disinfectsystem/message/message.jsp?departCode='+dirOrgCode);
+    	hide();
+	}
 }
 
 /**
@@ -287,7 +293,7 @@
                 if(rs.length==1){
                 	document.getElementById("showWord").innerHTML = rs[0].content;
                 }else{
-                	document.getElementById("showWord").innerHTML = rs[0].content + "<br/>   <a style='position:absolute; right:0px; ' href='javascript:createTab()' >查看剩余消息</a>";
+                	document.getElementById("showWord").innerHTML = rs[0].content + "<br/>   <a style='position:absolute; right:0px; ' href='javascript:createTab(1)' >查看剩余消息</a>";
                 }
                  document.getElementById("title").innerHTML = rs[0].title;
                 ab = new AlertBox("idBox2",{
@@ -305,8 +311,65 @@
             }
         }
     });
+	//DGSETYY-8：显示差异情况
+	loadMessages();
 }
 
+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<length;i++){
+					html += '<div style="margin-bottom: 10px;">';
+					html += '<p class="title">';
+					html += '<a href="javascript:clickTitleFun('+result.data[i].id+',true)" style="font-size: 14px;color: #367f21">'+result.data[i].title+'</a>';
+					html += '</p>';	
+					html += '<p class="content" style="font-size: 12px;">'+result.data[i].content+'</p>';
+					html += '</div>';
+				}
+				msgAlert = new AlertBox("loadMessages",{
+					fixed:false,
+					center:true,
+					onShow: function(){
+						document.getElementById('loadMessagesWord').innerHTML = html;
+						if(result.data.length == 6){
+							document.getElementById('loadMessagesMore').innerHTML = '<a href="javascript:createTab(2)" style="color: #367f21">您还有更多未读消息</a>';
+						}
+						OverLay.show()
+					},
+					onClose: function(){
+						OverLay.close()
+					}
+				});
+				msgAlert.show(); 
+			}else {
+				if(msgAlert){
+					closeLoadMessages();
+				}
+			}
+        }
+    });
+}
+//end
+
 /**
  * 隐藏发布消息的div窗口.
  */
@@ -609,6 +672,22 @@
              <!--   当天回收物品需要在每天6:00AM之前提交申请单。 -->
     </dd>
 </dl> 
+<!-- 弹出异常差异 -->
+<dl id="loadMessages" class="lightbox" style="overflow-y:scroll; overflow-x:hidden;width: 650px;height: 300px;">
+    <dt>
+        <b id="loadMessagesTitle">申请与回收差异消息</b>
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        <input type="button" style="position:absolute; right:0px; top:5px;" value=" X " onclick="closeLoadMessages();"/>
+    </dt>
+    <dd style="font-size:14px">
+        <div id="loadMessagesWord">
+			
+		</div>
+		<p id="loadMessagesMore" style="text-align: right;">
+			
+		</p>
+    </dd>
+</dl> 
 <style>
 	.lightbox3{width:270px;height:180px;background:#FFFFFF;border:5px solid #ccc;line-height:18px;display:none; margin:0;}
 	.lightbox3 dt{background:#f4f4f4;padding:5px;word-break : break-all}