Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r21064 -r21692
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 21064)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 21692)
@@ -28,13 +28,13 @@
 		if(isUndefinedOrNull(item)){
 			return;
 		}
-		addTab('packing',item.text+'装配','/disinfectsystem/packing/packingView.jsp?taskGroup='+item.text);
+		addTab('packing',item.text+'装配',encodeURI('/disinfectsystem/packing/packingView.jsp?taskGroup='+item.text));
 	});
 	reviewPackingMenu.on('click',function(menu,item,e){
 		if(isUndefinedOrNull(item)){
 			return;
 		}
-		addTab('reviewPacking',item.text+'审核','/disinfectsystem/packing/reviewView.jsp?taskGroup='+item.text);
+		addTab('reviewPacking',item.text+'审核',encodeURI('/disinfectsystem/packing/reviewView.jsp?taskGroup='+item.text));
 	});
 }
 //屏蔽回退键,防止点击backspace键时,浏览器后退
@@ -189,6 +189,10 @@
 	createMenu();
 	
 	autoMaxSize();
+	
+	//设置windowBox的高度为页面总高度-87(顶部logo占用的高度)-35(中间选项卡栏占用的高度)
+	$('#windowBox').attr('height' , parseInt(document.body.offsetHeight) - 87 - 35);
+	
 	//添加个人桌面tab标签 及 个人桌面ul、li信息
 	initPersonalDestop();
 	
@@ -205,7 +209,7 @@
 				}else{
 					setTimeout(function(){
 						if(objId!= 'packing' && objId != 'reviewPacking' && objId != 'sterilizationRecord'){
-								addTab(objId, scrObj.getAttribute("title"), encodeURIComponent(scrObj.getAttribute("href")));
+								addTab(objId, scrObj.getAttribute("title"), scrObj.getAttribute("href"));
 						}
 					}, 1); //延迟1毫秒
 				}
@@ -279,7 +283,7 @@
         	if(isUndefinedOrNull(item)){
     			return;
     		}
-        	addTab('sterilizationRecord',item.text+'灭菌','/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp?editMode=true&type=today&ownGroup='+item.text);
+        	addTab('sterilizationRecord',item.text+'灭菌',encodeURI('/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp?editMode=true&type=today&ownGroup='+item.text));
         });
     }
 	//满意度调查数字提醒
@@ -822,7 +826,6 @@
 	if(itemId==-1){//个人桌面的iframe
 		returnContent = parsePortal(jsonObj);
 	}else{
-		var url = decodeURIComponent(url);
 		if(url.indexOf((WWWROOT+"/"))==-1){
 			url = WWWROOT + url;
 		}
@@ -1092,6 +1095,11 @@
 	}
 }
 
+/**
+ * 向上收缩或向上展开
+ * @param myimgObj 所点击的图标本身对象
+ * @param secNum 要收缩或展开的td元素的id
+ */
 function swapimg(myimgObj,secNum){
 	var height = $(window).height()-35;
 	var secObj = document.getElementById(secNum);
@@ -1100,11 +1108,15 @@
 		myimgObj.src=WWWROOT+"/themes/portalPage/theme/images/ico3.gif";
 		myimgObj.title="向上收缩";
 		height-=85;
+		//设置windowBox的高度为其原高度-87-35
+		$('#windowBox').attr('height' , parseInt($('#windowBox').attr('height')) - 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);
 	}
 	//重新设置iframe高度
 	var iframeList = $("iframe.iframeClass");
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r21665 -r21692
--- ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 21665)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 21692)
@@ -172,15 +172,15 @@
 		var link1 = new Object();
 		link1.hidden = false;
 		link1.text = taskGroup[i];
-		link1.href = WWWROOT+'/disinfectsystem/packing/packingView.jsp?taskGroup='+taskGroup[i];
+		link1.href = encodeURI(WWWROOT+'/disinfectsystem/packing/packingView.jsp?taskGroup='+taskGroup[i]);
 		link1.hrefTarget = linkTarget;
 		link1.leaf = true;
 		DisinfectsystemTreeData[4].children[i] = link1;
 		
 		var link2 = new Object();
 		link2.hidden = false;
 		link2.text = taskGroup[i];
-		link2.href = WWWROOT+'/disinfectsystem/packing/reviewView.jsp?taskGroup='+taskGroup[i];
+		link2.href = encodeURI(WWWROOT+'/disinfectsystem/packing/reviewView.jsp?taskGroup='+taskGroup[i]);
 		link2.hrefTarget = linkTarget;
 		link2.leaf = true;
 		DisinfectsystemTreeData[5].children[i] = link2;
@@ -207,7 +207,7 @@
 		var link1 = new Object();
 		link1.hidden = SSTS_Sterilization_Menu;
 		link1.text = sterilerGroupList[i];
-		link1.href = WWWROOT+'/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp?editMode=true&type=today&ownGroup='+sterilerGroupList[i];
+		link1.href = encodeURI(WWWROOT+'/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp?editMode=true&type=today&ownGroup='+sterilerGroupList[i]);
 		link1.hrefTarget = linkTarget;
 		link1.leaf = true;
 		DisinfectsystemTreeData[6].children[i] = link1;
@@ -267,17 +267,17 @@
 			singleClickExpand:singleClickExpandTree,
 			hidden:SSTS_QualityMonitoring_Config,
 			children:[
-			      {hidden :SSTS_QualityMonitoring_Config,text:"质量监测定义",href:WWWROOT+'/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.jsp?listType=lastDefinition&formType=质量监测',hrefTarget:linkTarget,leaf:true},
-			      {hidden :SSTS_QualityMonitoring_Config,text:"已部署质量监测定义",href:WWWROOT+'/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.jsp?listType=deployed&formType=质量监测',hrefTarget:linkTarget,leaf:true}
+			      {hidden :SSTS_QualityMonitoring_Config,text:"质量监测定义",href:encodeURI(WWWROOT+'/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.jsp?listType=lastDefinition&formType=质量监测'),hrefTarget:linkTarget,leaf:true},
+			      {hidden :SSTS_QualityMonitoring_Config,text:"已部署质量监测定义",href:encodeURI(WWWROOT+'/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.jsp?listType=deployed&formType=质量监测'),hrefTarget:linkTarget,leaf:true}
 		    ]
 		},
 		{
 			text:"定期监测定义管理",
 			singleClickExpand:singleClickExpandTree,
 			hidden:SSTS_routineMonitoring_Config,
 			children:[
-			      {hidden :SSTS_routineMonitoring_Config,text:"定期监测定义",href:WWWROOT+'/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.jsp?listType=definitionList&formType=定期监测',hrefTarget:linkTarget,leaf:true},
-			      {hidden :SSTS_routineMonitoring_Config,text:"已部署定期监测定义",href:WWWROOT+'/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.jsp?listType=deployed&formType=定期监测',hrefTarget:linkTarget,leaf:true}
+			      {hidden :SSTS_routineMonitoring_Config,text:"定期监测定义",href:encodeURI(WWWROOT+'/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.jsp?listType=definitionList&formType=定期监测'),hrefTarget:linkTarget,leaf:true},
+			      {hidden :SSTS_routineMonitoring_Config,text:"已部署定期监测定义",href:encodeURI(WWWROOT+'/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.jsp?listType=deployed&formType=定期监测'),hrefTarget:linkTarget,leaf:true}
 		    ]
 		}
     ]
@@ -359,10 +359,10 @@
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_Warehouse_Menu || sstsConfig.hiddSyncGodownEntryParentMenu,
 	children:[
-	     {hidden :sstsConfig.hiddSyncGodownEntryMenu,text:"同步入库单",href:WWWROOT+'/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp?type=入库单',hrefTarget:linkTarget,leaf:true},
-	     {hidden :sstsConfig.hiddSyncGodownOutEntryMenu,text:"同步退库单",href:WWWROOT+'/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp?type=退库单',hrefTarget:linkTarget,leaf:true},
-	     {hidden :sstsConfig.hiddSyncGodownReturnEntryMenu,text:"同步退货单",href:WWWROOT+'/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp?type=退货单',hrefTarget:linkTarget,leaf:true},
-	     {hidden :sstsConfig.hiddSyncHisMaterialDefinitionMenu,text:"材料同步管理",href:WWWROOT+'/disinfectsystem/basedatamanager/materialDefinition/syncMaterialDefinition.jsp',hrefTarget:linkTarget,leaf:true}
+	     {hidden :sstsConfig.hiddSyncGodownEntryMenu,text:"同步入库单",href:encodeURI(WWWROOT+'/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp?type=入库单'),hrefTarget:linkTarget,leaf:true},
+	     {hidden :sstsConfig.hiddSyncGodownOutEntryMenu,text:"同步退库单",href:encodeURI(WWWROOT+'/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp?type=退库单'),hrefTarget:linkTarget,leaf:true},
+	     {hidden :sstsConfig.hiddSyncGodownReturnEntryMenu,text:"同步退货单",href:encodeURI(WWWROOT+'/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp?type=退货单'),hrefTarget:linkTarget,leaf:true},
+	     {hidden :sstsConfig.hiddSyncHisMaterialDefinitionMenu,text:"材料同步管理",href:encodeURI(WWWROOT+'/disinfectsystem/basedatamanager/materialDefinition/syncMaterialDefinition.jsp'),hrefTarget:linkTarget,leaf:true}
 
     ]
 },{
@@ -610,7 +610,7 @@
         hidden : SSTS_BaseData_Manager,
         children:[
             {hidden :SSTS_departMentApplication,text:"科室申领模版",href:WWWROOT+'/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateView.jsp',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_ShiftConfig_manager,text:"班次类型配置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=shiftType&optionName=班次参数设置',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_ShiftConfig_manager,text:"班次类型配置",href:encodeURI(WWWROOT+'/systemmanage/httpOption.mhtml?listId=shiftType&optionName=班次参数设置'),hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_RecyclePrint_Menu || (printRecyclingConfigFormVersion!=1),text:"打印发货计划设置",href:WWWROOT+'/disinfectsystem/printRecyclingConfig/printRecyclingConfigView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_RecyclePrint_Menu || (printRecyclingConfigFormVersion!=2),text:"打印发货计划设置",href:WWWROOT+'/disinfectsystem/printRecyclingConfig2/printRecyclingConfigView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_RecyclePrint_Menu || !((sstsConfig.hasOwnProperty('printInvoiceVersion')) && sstsConfig.printInvoiceVersion==2),text:"打印发货单设置",href:WWWROOT+'/disinfectsystem/printInvoiceConfig/printInvoiceConfigView.jsp',hrefTarget:linkTarget,leaf:true},
@@ -634,7 +634,7 @@
             {hidden :SSTS_Operation_manager,text:"手术名称设置",href:WWWROOT+'/systemmanage/operationNameView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_ProjectName_manager,text:"设备维护项目名称设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=projectName',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_PackType_manager,text:"包装类型设置",href:WWWROOT+'/systemmanage/httpOptionByValue.mhtml?listId=packType',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_Tousse_Update,text:"器械包重量设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=tousseWeight&optionName=器械包重量设置',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_Tousse_Update,text:"器械包重量设置",href:encodeURI(WWWROOT+'/systemmanage/httpOption.mhtml?listId=tousseWeight&optionName=器械包重量设置'),hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_DiposableGoodsType_manager,text:"一次性物品类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=diposableGoodsType',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Container,text:"容器管理",href:WWWROOT+'/disinfectsystem/basedatamanager/container/containerView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Supplier,text:"供应商管理",href:WWWROOT+'/disinfectsystem/basedatamanager/supplier/supplierView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},