Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r27180 -r27189
--- ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 27180)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 27189)
@@ -696,6 +696,147 @@
     ]
 }];
 
+var parentTree = {
+	text:"自定义报表",
+	singleClickExpand:singleClickExpandTree,
+	hidden:false,
+	children:[
+  	    {hidden :false,text:"报表定义",href:WWWROOT+'/disinfectsystem/customizedreports/reportList.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :false,text:"文件夹定义",href:WWWROOT+'/disinfectsystem/customizedreports/folderList.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :false,text:"报表列表",singleClickExpand:singleClickExpandTree}
+   	]
+}
+
+ManagementTreeData.push(parentTree);
+
+folderList();
+
+//获取文件夹
+function folderList() {
+	Ext.Ajax.request({
+		url: WWWROOT + '/disinfectSystem/customizedReports/folderController/getAllFolders.mhtml',
+		success: function(response, options) {
+			var result = response.responseText;
+
+			if (result != "" && result != "{}") {
+				var res = Ext.util.JSON.decode(result);
+				var rows = res.rows || [];
+				
+				var folderArr = [];
+
+				for (var i = 0; i < rows.length; i++) {
+					folderArr[i] = {
+						text:rows[i].folderName,
+						singleClickExpand:singleClickExpandTree,
+						hidden:false,
+						children:[]
+					}
+				}
+				
+				reportList(folderArr);
+			}
+		}
+	});
+};
+
+//获取报表列表
+function reportList(folderArr){
+	Ext.Ajax.request({
+		url: WWWROOT + '/disinfectSystem/customizedReports/reportController/getAllReportDefinitions.mhtml',
+		params: {
+			isDraft: 0
+		},
+		success: function(response, options) {
+			var result = response.responseText;
+	
+			if (result != "" && result != "{}") {
+				var res = Ext.util.JSON.decode(result);
+				var rows = res.rows || [];
+	
+				var newStore = buildTree(rows);
+	
+				var storeIndex = 0;
+				var parentStore = [];
+				
+				for(var key in newStore){
+					var child = [];
+					
+					for(var k = 0;k<newStore[key].children.length;k++){
+						var reportName = newStore[key].children[k].reportName;
+						var reportId = newStore[key].children[k].reportId;
+						
+						child[k] = {
+							hidden :false,
+							text:reportName,
+							href:WWWROOT + '/disinfectsystem/customizedreports/reportView.jsp?id=' + reportId + '&position=left',
+							hrefTarget:linkTarget,
+							leaf:true
+						}
+					}
+					
+					parentStore[storeIndex] = {
+						text:key,
+						singleClickExpand:singleClickExpandTree,
+						hidden:false,
+						children:child
+					}
+					
+					storeIndex++
+				}
+				
+				var noFolder = [];
+				
+				for(var i=0;i<folderArr.length;i++){
+					for(var j=0;j<parentStore.length;j++){
+						if(folderArr[i].text == parentStore[j].text){
+							folderArr[i].children = parentStore[j].children;
+						}
+						if(parentStore[j].text == '未命名'){
+							noFolder = parentStore[j];
+						}
+					}
+				}
+				
+				if(noFolder.length != 0){
+					folderArr.push(noFolder);
+				}
+				
+				parentTree.children[2].children = folderArr;
+				
+				ManagementTreeData[24] = parentTree;
+				
+				if(window.viewport){
+					var trees = window.viewport.getComponent(0).getComponent(1).root;
+        			
+        			trees.childNodes[24].reload();
+				}
+			}
+		}
+	});
+}
+
+//扁平数组转换为树状
+function buildTree(list){	
+	var temp = {};	
+	
+	for(var i=0;i<list.length;i++){
+		var folderName = list[i].folderName || '未命名';
+		
+		if(!temp[folderName]){
+			temp[folderName] = {
+				text:folderName,
+				singleClickExpand:singleClickExpandTree,
+				hidden:SSTS_CustomizeReport_FolderList,
+				children:[]
+			}
+		}
+		
+		temp[folderName].children.push(list[i]);
+	}
+	
+	return temp;
+}
+
 var printRecyclingConfigFormVersion = getIntValueFromJs('sstsConfig.printRecyclingConfigFormVersion',1);
 //控制面版菜单
 ControlCenterTreeData = [{