Index: ssts-web/src/main/webapp/homepage/portalPage.jsp
===================================================================
diff -u -r26440 -r26584
--- ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 26440)
+++ ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 26584)
@@ -415,6 +415,7 @@
 	height: 90px;
 	font-size: 16em;
 	text-align: center;
+	position: relative;
 }
 
 img {
@@ -526,7 +527,7 @@
 	<tr>
 	<!-- 图标所在地 -->
 		<td height="100%;" id="windowBox" valign="top">
-			<div id="personalDesktop" region="center" style="height:100%;overflow-y:hidden;display: block;"></div>
+			<div id="personalDesktop" region="center" style="overflow-y:auto;display: block;"></div>
 		</td>
 	</tr>
 </table>
Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r26440 -r26584
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 26440)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 26584)
@@ -109,7 +109,8 @@
 				imgElements[0].src = WWWROOT + '/images/rednumbertip/'+amount+'.gif';
 			}
 		}else{
-			insertHtml('<div id=' + tipId + ' style="top:'+getepoint(domObj).y+'px;left:'+(getepoint(domObj).x+86)+'px;float:left;position:absolute;z-index:50;display:block"><img src="'+WWWROOT+'/images/rednumbertip/'+amount+'.gif"></div>');
+			$("#"+domObj).append('<div id=' + tipId + ' style="top:0px;float:left;position:absolute;right:-20px;z-index:50;display:block"><img src="'+WWWROOT+'/images/rednumbertip/'+amount+'.gif"></div>');
+			//insertHtml('<div id=' + tipId + ' style="top:'+getepoint(domObj).y+'px;left:'+(getepoint(domObj).x+86)+'px;float:left;position:absolute;z-index:50;display:block"><img src="'+WWWROOT+'/images/rednumbertip/'+amount+'.gif"></div>',"domObj","tipId");
 			tipsEle.push(tipId);
 		}
 		if (showTipsFn){
@@ -119,7 +120,8 @@
 	else{
 		if (domIsDisplay){
 			//否则隐藏
-			domObj.style.display = "none";
+			//domObj.style.display = "none";
+			$("#"+domObj).css("display","none");
 		}
 		//如果数量为0时则移除掉提醒数字
 		if(document.getElementById(tipId)){
@@ -219,8 +221,8 @@
 	autoMaxSize();
 	
 	//设置windowBox的高度为页面总高度-87(顶部logo占用的高度)-35(中间选项卡栏占用的高度)
-	$('#windowBox').attr('height' , parseInt(document.body.offsetHeight) - 87 - 35);
-	
+//	$('#windowBox').attr('height' , parseInt(document.body.offsetHeight) - 87 - 35);
+	$('#personalDesktop').css('height' , parseInt(document.body.offsetHeight) - 87 - 35);
 	//添加个人桌面tab标签 及 个人桌面ul、li信息
 	initPersonalDestop();
 	
@@ -325,7 +327,7 @@
 	if(satisfactionSurveyTableObj){
 		sendDWRAsync(function () {
 			SatisfactionSurveyTemplateTableManager.loadSatisfactionSurveyTemplateNoticeNum(function(amount){
-				addIconTips(amount,satisfactionSurveyTableObj,'satisfactionSurveyTableTip',showSatisfactionSurveyWinTips,true);
+				addIconTips(amount,"satisfactionSurveyTable",'satisfactionSurveyTableTip',showSatisfactionSurveyWinTips,true);
 			});
 		})
 	}
@@ -336,7 +338,7 @@
 		//给个人桌面图标添加入iphone风格的数字提示信息
 		sendDWRAsync(function () {
 			ProblemTableManager.getUnAnsweredQuestion(function(amount){
-				addIconTips(amount,problemReport,'problemReportTip');
+				addIconTips(amount,"problemReport",'problemReportTip');
 			});
 		});
 	}
@@ -347,7 +349,7 @@
 	if(invoicePlanObj){
 		sendDWRAsync(function () {
 			InvoicePlanTableManager.getUnfinishedInvoicePlanAmount(function(amount){
-				addIconTips(amount,invoicePlanObj,'invoicePlanTip');
+				addIconTips(amount,"invoicePlan",'invoicePlanTip');
 			});
 		});
 	}
@@ -361,7 +363,8 @@
 					alert("借物管理查询待发货数量发生异常!");
 				}
 				else {
-					addIconTips(amount,borrowManagerObj,'borrowManagerTip');
+					//addIconTips(amount,borrowManagerObj,'borrowManagerTip');
+					addIconTips(amount,"borrowManager",'borrowManagerTip');
 				}
 			});
 		});
@@ -376,15 +379,15 @@
 					alert("外来器械包申请单查询未完成数量发生异常!");
 				}
 				else {
-					addIconTips(amount,foreignTousseApplicationObj,'foreignTousseApplicationTip');
+					addIconTips(amount,"foreignTousseApplication",'foreignTousseApplicationTip');
 				}
 			});
 		});
 		//每10秒请求后台刷新一下待回收的外来器械申请单数量
 		setInterval(function(){
 			sendDWRAsync(function () {
 				ForeignTousseApplicationTableManager.getUnFinishedForeignTousseApplicationCountForSelfDepart(function(amount){
-					addIconTips(amount,foreignTousseApplicationObj,'foreignTousseApplicationTip');
+					addIconTips(amount,"foreignTousseApplication",'foreignTousseApplicationTip');
 				});
 			});
 		},10*1000);
@@ -521,16 +524,21 @@
 function showProblemReportTipIsNeed(){
 	var problemReport = document.getElementById('problemReport');
 	if(problemReport && problemReport.style.display != "none"){
-		locateTip('problemReportTip',problemReport,{x:86});
+		$("#problemReportTip").css({"right":"-20px","top":"0px"});
 		
+		//locateTip('problemReportTip',problemReport,{x:86});		
 		//$("#problemReportTip").css("left", getepoint(problemReport).x+86);
 		//$("#problemReportTip").css("top", getepoint(problemReport).y);
 	}
 }
+
+
 function showInvoicePlanTipIsNeed(){
 	var invoicePlanObj = document.getElementById('invoicePlan');
 	if(invoicePlanObj && invoicePlanObj.style.display != "none"){
-		locateTip('invoicePlanTip',invoicePlanObj,{x:86});
+		$("#invoicePlanTip").css({"right":"-20px","top":"0px"});
+		
+		//locateTip('invoicePlanTip',invoicePlanObj,{x:86});
 		//$("#invoicePlanTip").css("left", getepoint(invoicePlanObj).x+86);
 		//$("#invoicePlanTip").css("top", getepoint(invoicePlanObj).y);
 	}
@@ -539,7 +547,9 @@
 function showSatisfactionSurveyTableTipIsNeed(){
 	var satisfactionSurveyTableObj = document.getElementById("satisfactionSurveyTable");
 	if(satisfactionSurveyTableObj && satisfactionSurveyTableObj.style.display != "none"){
-		locateTip('satisfactionSurveyTableTip',satisfactionSurveyTableObj,{x:86});
+		$("#satisfactionSurveyTableTip").css({"right":"-20px","top":"0px"});
+		
+		//locateTip('satisfactionSurveyTableTip',satisfactionSurveyTableObj,{x:86});
 		//$("#satisfactionSurveyTableTip").css("left", getepoint(satisfactionSurveyTableObj).x+86);
 		//$("#satisfactionSurveyTableTip").css("top", getepoint(satisfactionSurveyTableObj).y);
 	}
@@ -548,7 +558,9 @@
 function showSystemWarningTipIsNeed(){
 	var systemWarningObj = document.getElementById("systemWarning");
 	if(systemWarningObj && systemWarningObj.style.display != "none"){
-		locateTip('systemWarningTip',systemWarningObj,{x:90,y:-4});
+		$("#systemWarningTip").css({"right":"-20px","top":"0px"});
+		
+		//locateTip('systemWarningTip',systemWarningObj,{x:90,y:-4});
 		//$("#systemWarningTip").css("left", getepoint(systemWarningObj).x + 90);
 		//$("#systemWarningTip").css("top", getepoint(systemWarningObj).y -4);
 	}
@@ -1228,14 +1240,16 @@
 		myimgObj.title="向上收缩";
 		height-=85;
 		//设置windowBox的高度为其原高度-87-35
-		$('#windowBox').attr('height' , parseInt($('#windowBox').attr('height')) - 87 - 35);
+		//$('#windowBox').attr('height' , parseInt(iframe) - 87 - 35);		
+		$('#personalDesktop').css('height' , parseInt(document.body.offsetHeight) - 87 - 35);
 	}else{
 		//打开
 		myimgObj.title="向下展开";
 		secObj.className="top_content_off";
 		myimgObj.src=WWWROOT+"/themes/portalPage/theme/images/ico4.gif";
 		//设置windowBox的高度为为其原高度+87+35
-		$('#windowBox').attr('height' , parseInt($('#windowBox').attr('height')) + 87 + 35);
+		//$('#windowBox').attr('height' , parseInt($('#windowBox').attr('height')) + 87 + 35);
+		$('#personalDesktop').css('height' , parseInt( document.body.offsetHeight) + 87 + 35);
 	}
 	//重新设置iframe高度
 	var iframeList = $("iframe.iframeClass");
@@ -1382,12 +1396,15 @@
 	    		if(isFirstOnLoad){
 	    			//设置提醒数字
 	    			var container = Ext4.getBody();
-	    			if(result.data.length<11){
-	    				container.insertHtml('beforeEnd','<div id="systemWarningTip" style="top:'+(getepoint(systemWarningObj).y-4)+'px;left:'+(getepoint(systemWarningObj).x+90)+'px;float:left;position:absolute;z-index:-1;display:block"><img src="'+WWWROOT+'/images/rednumbertip/'+result.data.length+'.gif"></div>');
+					if(result.data.length<11){
+						//container.insertHtml('beforeEnd','<div id="systemWarningTip" style="top:'+(getepoint(systemWarningObj).y-4)+'px;left:'+(getepoint(systemWarningObj).x+90)+'px;float:left;position:absolute;z-index:-1;display:block"><img src="'+WWWROOT+'/images/rednumbertip/'+result.data.length+'.gif"></div>');
+						$("#systemWarning").append('<div id="systemWarningTip" style="top:0px;z-index:-1;float:left;position:absolute;display:block;right:-20px;"><img src="'+WWWROOT+'/images/rednumbertip/'+result.data.length+'.gif"></div>')
 					}else{
-						container.insertHtml('beforeEnd','<div id="systemWarningTip" style="top:'+(getepoint(systemWarningObj).y-4)+'px;left:'+(getepoint(systemWarningObj).x+90)+'px;float:left;position:absolute;z-index:-1;display:block"><img src="'+WWWROOT+'/images/rednumbertip/10+.gif"></div>');
+						$("#systemWarning").append('<div id="systemWarningTip" style="top:0px;float:left;position:absolute;z-index:-1;display:block;right:-20px;"><img src="'+WWWROOT+'/images/rednumbertip/10+.gif"></div>');
+						//container.insertHtml('beforeEnd','<div id="systemWarningTip" style="top:'+(getepoint(systemWarningObj).y-4)+'px;left:'+(getepoint(systemWarningObj).x+90)+'px;float:left;position:absolute;z-index:-1;display:block"><img src="'+WWWROOT+'/images/rednumbertip/10+.gif"></div>');
 					}
 	    			
+	    			
 //	    			if(!result.isPopWin){
 //	    				doSync = false;
 //	    				return false;//用户设置了首页禁止自动弹窗