Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control into pudong

潘钊
2 parents 18e1c843 983fdbff
Showing 17 changed files with 560 additions and 35 deletions
src/main/java/com/bsth/controller/DownloadController.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/util/ReportUtils.java
src/main/resources/static/pages/base/linecast/cast.html
src/main/resources/static/pages/forms/statement/busInterval.html
src/main/resources/static/pages/forms/statement/lbStatuAnaly.html
src/main/resources/static/pages/forms/statement/lineTimeAnaly.html
src/main/resources/static/pages/forms/statement/scheduleAnaly.html
src/main/resources/static/pages/forms/statement/scheduleAnaly_sum.html
src/main/resources/static/pages/forms/statement/timeAndSpeed.html
src/main/resources/static/pages/forms/statement/waybill.html
src/main/resources/static/pages/permission/module/list.html
src/main/resources/static/pages/permission/resource/add.html
src/main/resources/static/pages/permission/resource/edit.html
src/main/resources/static/pages/permission/resource/list.html
src/main/resources/static/pages/permission/role/settings.html
src/main/resources/static/pages/report/timetable/timetable.html
@@ -19,9 +19,6 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;  
 import org.springframework.stereotype.Component;  
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.google.protobuf.UnknownFieldSet.Field;
-import com.mysql.fabric.Response;  
 /** 
  * <一句话功能简述> 
@@ -55,11 +52,12 @@ public class DownloadController
                                           headers, HttpStatus.CREATED);    
     }   
-    @RequestMapping("download")    
+    @RequestMapping("download")
     public void download(HttpServletResponse response,String fileName) 
     		throws IOException {
 //    	String fileNames=URLDecoder.decode(fileName,"UTF-8");
-    	fileName =fileName + ".xls";
+    	if(!fileName.contains(".xls"))
+    		fileName =fileName + ".xls";
     	String moudelPath = this.getClass().getResource("/").getPath()+ "static/pages/forms/export/"+fileName; 
     	File file = new File(moudelPath);// path是根据日志路径和文件名拼接出来的
 //        String filename = file.getName();// 获取日志文件名称
@@ -82,6 +80,7 @@ public class DownloadController
     public void downloadList(HttpServletResponse response,String fileName) 
     		throws IOException {
 //    	String fileNames=URLDecoder.decode(fileName,"UTF-8");
+    	File files = new File(this.getClass().getResource("/").getPath()+ "static/pages/forms/export/"+fileName);//
     	fileName = fileName + ".zip";
     	String moudelPath = this.getClass().getResource("/").getPath()+ "static/pages/forms/export/"+fileName; 
     	File file = new File(moudelPath);// path是根据日志路径和文件名拼接出来的
@@ -99,7 +98,8 @@ public class DownloadController
         os.flush();
         os.close();
         file.delete();
-    }  
+        deleteFiles(files);
+    }
     @RequestMapping("downloadModel")
@@ -125,4 +125,23 @@ public class DownloadController
     }
+    /**
+     * 删除文件夹
+     * @param files
+     * @return
+     */
+    public Boolean deleteFiles(File files){
+    	if (files.isDirectory()) {
+            String[] children = files.list();
+            //递归删除目录中的子目录下
+            for (int i=0; i<children.length; i++) {
+                boolean success = deleteFiles(new File(files, children[i]));
+                if (!success) {
+                    return false;
+                }
+            }
+        }
+    	//目录此时为空，可以删除
+    	return files.delete();
+    }
 }
@@ -4338,7 +4338,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         return new ArrayList<Map<String, Object>>();
     }
-    public  void exportWaybill_pl(List<ScheduleRealInfo> listpl,String date,String jName, String clZbh,String lpName) {
+    public void exportWaybill_pl(List<ScheduleRealInfo> listpl,
+    		String date, String jName, String clZbh, String lpName) {
         ReportUtils ee = new ReportUtils();
         ReportRelatedUtils rru = new ReportRelatedUtils();
         List<Iterator<?>> list = new ArrayList<Iterator<?>>();
@@ -4361,7 +4362,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 //		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
 //		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
       //计算里程和班次数，并放入Map里
-      Map<String, Object>  map = this.MapById(scheduleRealInfos.get(0).getId());
+      Map<String, Object> map = this.MapById(scheduleRealInfos.get(0).getId());
       map.put("jhlc",Arith.add(culateMieageService.culateJhgl(scheduleRealInfos),culateMieageService.culateJhJccgl(scheduleRealInfos)));
       map.put("remMileage",culateMieageService.culateLbgl(scheduleRealInfos));
@@ -4508,7 +4509,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-
         list.add(listMap.iterator());
         String xls="";
         if(map.get("type").toString().equals("0")){
@@ -4516,15 +4516,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }else{
         	xls="waybill_minhang_dl.xls";
         }
+        map.put("sheetName", jName + "-" + clZbh + "-" + lpName);
         ee.excelReplace(list, new Object[]{map}, path + "mould/"+xls,
                 path + "export/" + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls");
-//        return scheduleRealInfos;
     }
     @Override
     public Map<String, Object> exportWaybillMore(Map<String, Object> map) {
         String date = map.get("date").toString();
         String line = map.get("line").toString();
+        ReportUtils ee = new ReportUtils();
         List<List> lists = JSON.parseArray(map.get("strs").toString(), List.class);
         String path = this.getClass().getResource("/").getPath() + "static/pages/forms/export/";
         SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
@@ -4534,16 +4535,19 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         try {
             while (true) {
                 String fileUrl = path + "行车路单" + sdfSimple.format(sdfMonth.parse(date));
-                file = new File(fileUrl + (num == 0 ? "/" : "(" + num + ")/"));
-                if (file.exists()) {
+//                file = new File(fileUrl + (num == 0 ? "/" : "(" + num + ")/"));	//新建文件夹
+                file = new File(fileUrl + (num == 0 ? ".xls" : "(" + num + ").xls"));	//新建excel文件
+                if (file.exists()) {	//判断是否已存在重名
                     num++;
                 } else {
                     break;
                 }
             }
-            file.mkdirs();
+//            file.mkdirs();	//创建
             List<ScheduleRealInfo> lists_line=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
-            for (List<String> list : lists) {
+            
+            List<File> files = new ArrayList<File>();
+            for (List<String> list : lists){
                 List<ScheduleRealInfo> newList=new ArrayList<ScheduleRealInfo>();
                 String jName = list.get(0);
                 String clZbh = list.get(1);
@@ -4558,26 +4562,37 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 this.exportWaybill_pl(newList, date, jName, clZbh, lpName);
                 File temp = new File(path + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls");
                 String fileName = file.getName();
-                temp.renameTo(new File(path + fileName + "/" + temp.getName()));
-
-                File[] listFiles = file.listFiles();
-                ZipOutputStream zos = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(path + file.getName() + ".zip")));
-//				zos.setEncoding("gbk");
-//				zos.putNextEntry(new ZipEntry(fileName + "/"));
-                for (int i = 0; i < listFiles.length; i++) {
-                    zos.putNextEntry(new ZipEntry(fileName + "/" + listFiles[i].getName()));
-                    BufferedInputStream bis = new BufferedInputStream(new FileInputStream(listFiles[i]));
-                    BufferedOutputStream bos = new BufferedOutputStream(zos);
-                    int bytesRead = 0;
-                    for (byte[] buffer = new byte[BUF_SIZE]; ((bytesRead = bis.read(buffer, 0, BUF_SIZE)) != -1); ) {
-//						zos.write(buffer, 0, bytesRead);
-//						zos.flush();
-                        bos.write(buffer, 0, bytesRead);
-                        bos.flush();
-                    }
-                }
-                zos.close();
-            }
+                files.add(temp);
+            }
+            for(int i = 1; i < files.size(); i++){
+            	File file1 = files.get(0);
+            	File file2 = files.get(i);
+            	ee.copySheetByFile(file2, file1, 0, 145);
+            }
+            File newFile = files.get(0);
+            newFile.renameTo(file);
+            
+//                temp.renameTo(new File(path + fileName + "/" + temp.getName()));
+//                File[] listFiles = file.listFiles();
+//                ZipOutputStream zos = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(path + file.getName() + ".zip")));
+////				zos.setEncoding("gbk");
+////				zos.putNextEntry(new ZipEntry(fileName + "/"));
+//                for (int i = 0; i < listFiles.length; i++) {
+//                    zos.putNextEntry(new ZipEntry(fileName + "/" + listFiles[i].getName()));
+//                    BufferedInputStream bis = new BufferedInputStream(new FileInputStream(listFiles[i]));
+//                    BufferedOutputStream bos = new BufferedOutputStream(zos);
+//                    int bytesRead = 0;
+//                    for (byte[] buffer = new byte[BUF_SIZE]; ((bytesRead = bis.read(buffer, 0, BUF_SIZE)) != -1); ) {
+////						zos.write(buffer, 0, bytesRead);
+////						zos.flush();
+//                        bos.write(buffer, 0, bytesRead);
+//                        bos.flush();
+//                    }
+////					bos.close();
+//                    bis.close();
+//                }
+//                zos.close();
+//            }
         } catch (Exception e) {
             // TODO: handle exception
@@ -18,6 +18,7 @@ import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.util.CellRangeAddress;
 import com.bsth.entity.Line;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -114,6 +115,145 @@ public class ReportUtils {
 		}
 	}
+	/**
+	 * 将file1中的一页sheet复制到file2中
+	 * 
+	 * @param file1
+	 * 				原sheet所在的excel文件
+	 * @param file2
+	 * 				目标excel文件
+	 * @param page
+	 * 				原excel中要被复制的sheet的位置（从0开始）
+	 * @param rate
+	 * 				调整复制后的缩放倍率（列如：145，则为缩放145%）
+	 */
+	public void copySheetByFile(File file1, File file2, int page, int rate) {
+		try {
+			// 把源文件放入流中
+			POIFSFileSystem fs1 = new POIFSFileSystem(new FileInputStream(file1));
+			HSSFWorkbook wb1 = new HSSFWorkbook(fs1);
+			HSSFSheet sheet = wb1.getSheetAt(page);
+			POIFSFileSystem fs2 = new POIFSFileSystem(new FileInputStream(file2));
+			HSSFWorkbook wb2 = new HSSFWorkbook(fs2);
+			HSSFSheet createSheet = wb2.createSheet(sheet.getSheetName());
+			HSSFCellStyle createCellStyle = wb2.createCellStyle();
+			HSSFRow row;
+			
+			createSheet.setZoom(rate, 100);
+			for(int i = 0; i < sheet.getRow(0).getPhysicalNumberOfCells(); i++){
+				createSheet.setColumnWidth(i, sheet.getColumnWidth(i));
+			}
+
+				List<CellRangeAddress> mergedRegions = sheet.getMergedRegions();
+				for(int l = 0; l < mergedRegions.size(); l++){
+					//复制源表中的合并单元格
+					createSheet.addMergedRegion(mergedRegions.get(l));
+				}
+				int firstRow = sheet.getFirstRowNum();
+				int lastRow = sheet.getLastRowNum();
+				for(int k = firstRow; k <= lastRow; k++){
+					// 创建新建excel Sheet的行
+					HSSFRow rowCreat = createSheet.createRow(k);
+					// 取得源有excel Sheet的行
+					row = sheet.getRow(k);
+//					rowCreat.setHeight(row.getHeight());	//设置行高
+					// 单元格式样
+					int firstCell = row.getFirstCellNum();
+					int lastCell = row.getLastCellNum();
+					for (int j = firstCell; j < lastCell; j++) {
+						// 自动适应列宽 貌似不起作用
+//						createSheet.autoSizeColumn(j);
+//						System.out.println(row.getCell(j));
+						rowCreat.createCell(j);
+						String strVal = "";
+						if (row.getCell(j)==null) {
+							
+						} else {
+							strVal = row.getCell(j).getStringCellValue();
+							rowCreat.getCell(j).setCellValue(strVal);
+							copyCellStyle(wb1, row.getCell(j).getCellStyle(), createCellStyle);
+							createCellStyle.setBorderTop((short)1);
+							createCellStyle.setBorderLeft((short)1);
+							createCellStyle.setBorderRight((short)1);
+							createCellStyle.setBorderBottom((short)1);
+							rowCreat.getCell(j).setCellStyle(createCellStyle);
+						}
+					}
+				}
+			
+//			int firstRowNum = createSheet.getFirstRowNum();
+//			int lastRowNum = createSheet.getLastRowNum();
+//			int test = 0;
+//			for(int k = firstRowNum; k <= lastRowNum; k++){
+//				HSSFRow createRow = createSheet.getRow(k);
+//				int firstCellNum = createRow.getFirstCellNum();
+//				int lastCellNum = createRow.getLastCellNum();
+//				for(int i = firstCellNum; i < lastCellNum; i++){
+//					HSSFCell cell = createRow.getCell(i);
+//					cell.getCellStyle().setBorderTop(HSSFCellStyle.BORDER_THIN);
+//					cell.getCellStyle().setBorderLeft(HSSFCellStyle.BORDER_THIN);
+//					cell.getCellStyle().setBorderRight(HSSFCellStyle.BORDER_THIN);
+//					cell.getCellStyle().setBorderBottom(HSSFCellStyle.BORDER_THIN);
+//					test ++;
+//				}
+//			}
+//			System.out.println("test = " + test);
+
+			FileOutputStream fileOut = new FileOutputStream(file2);
+			wb2.write(fileOut);
+			fileOut.close();
+			wb2.close();
+			wb1.close();
+			fs2.close();
+			fs1.close();
+			file1.delete();
+//			// 创建目标文件夹
+//			createFolder(targetPath);
+			// 输出文件
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+	
+	public void test(File file){
+		POIFSFileSystem fs;
+		try {
+			fs = new POIFSFileSystem(new FileInputStream(file));
+			HSSFWorkbook wb = new HSSFWorkbook(fs);
+			for(int j = 0; j < wb.getNumberOfSheets(); j++){
+				HSSFSheet sheet = wb.getSheetAt(j);
+				int firstRowNum = sheet.getFirstRowNum();
+				int lastRowNum = sheet.getLastRowNum();
+				int test = 0;
+				for(int k = firstRowNum; k <= lastRowNum; k++){
+					HSSFRow createRow = sheet.getRow(k);
+					int firstCellNum = createRow.getFirstCellNum();
+					int lastCellNum = createRow.getLastCellNum();
+					for(int i = firstCellNum; i < lastCellNum; i++){
+						HSSFCell cell = createRow.getCell(i);
+						HSSFCellStyle cellStyle = wb.createCellStyle();
+						
+						cellStyle.setBorderTop(HSSFCellStyle.BORDER_THIN);
+						cellStyle.setBorderLeft(HSSFCellStyle.BORDER_THIN);
+						cellStyle.setBorderRight(HSSFCellStyle.BORDER_THIN);
+						cellStyle.setBorderBottom(HSSFCellStyle.BORDER_THIN);
+						cell.setCellStyle(cellStyle);
+						test ++;
+					}
+				}
+				System.out.println("test = " + test);
+				
+				FileOutputStream fileOut = new FileOutputStream(file);
+				wb.write(fileOut);
+				fileOut.close();
+			}
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+	}
+
 	public String getCellValue(HSSFCell cell) {
 		int cellType = 0;
 		String result = "";
@@ -166,6 +166,33 @@ function getTreeData(cb){
 	});
 }
+/**
+ * 将模块List 转换为树结构
+ * @param arr
+ * @returns {Array}
+ */
+function createTreeData(arr){
+	var treeData = [];
+	var len = arr.length;
+	for(var i = 0; i < len; i ++){
+		var pId = arr[i].pId;
+		arr[i].text = arr[i].name;
+		if(!pId){
+			treeData.push(arr[i]);
+		}
+
+		for(var j = 0; j < len; j ++){
+			if(pId == arr[j].id){
+				if(!arr[j].children)
+					arr[j].children = [];
+				arr[j].children.push(arr[i]);
+				break;
+			}
+		}
+	}
+	return treeData;
+}
+
 function getModuleTreeData(userId){
@@ -412,6 +412,32 @@
 			});
 		}
+		/**
+		 * 将模块List 转换为树结构
+		 * @param arr
+		 * @returns {Array}
+		 */
+		function createTreeData(arr){
+			var treeData = [];
+			var len = arr.length;
+			for(var i = 0; i < len; i ++){
+				var pId = arr[i].pId;
+				arr[i].text = arr[i].name;
+				if(!pId){
+					treeData.push(arr[i]);
+				}
+
+				for(var j = 0; j < len; j ++){
+					if(pId == arr[j].id){
+						if(!arr[j].children)
+							arr[j].children = [];
+						arr[j].children.push(arr[i]);
+						break;
+					}
+				}
+			}
+			return treeData;
+		}
 		function _w_table_rowspan(_w_table_id, _w_table_colnum){
 		    _w_table_firsttd = "";
@@ -438,6 +438,32 @@
 			});
 		}
+		/**
+		 * 将模块List 转换为树结构
+		 * @param arr
+		 * @returns {Array}
+		 */
+		function createTreeData(arr){
+			var treeData = [];
+			var len = arr.length;
+			for(var i = 0; i < len; i ++){
+				var pId = arr[i].pId;
+				arr[i].text = arr[i].name;
+				if(!pId){
+					treeData.push(arr[i]);
+				}
+
+				for(var j = 0; j < len; j ++){
+					if(pId == arr[j].id){
+						if(!arr[j].children)
+							arr[j].children = [];
+						arr[j].children.push(arr[i]);
+						break;
+					}
+				}
+			}
+			return treeData;
+		}
 		function _w_table_rowspan(_w_table_id, _w_table_colnum){
 		    _w_table_firsttd = "";
@@ -478,6 +478,32 @@
 			});
 		}
+		/**
+		 * 将模块List 转换为树结构
+		 * @param arr
+		 * @returns {Array}
+		 */
+		function createTreeData(arr){
+			var treeData = [];
+			var len = arr.length;
+			for(var i = 0; i < len; i ++){
+				var pId = arr[i].pId;
+				arr[i].text = arr[i].name;
+				if(!pId){
+					treeData.push(arr[i]);
+				}
+
+				for(var j = 0; j < len; j ++){
+					if(pId == arr[j].id){
+						if(!arr[j].children)
+							arr[j].children = [];
+						arr[j].children.push(arr[i]);
+						break;
+					}
+				}
+			}
+			return treeData;
+		}
 	});
@@ -327,6 +327,32 @@
 			});
 		}
+		/**
+		 * 将模块List 转换为树结构
+		 * @param arr
+		 * @returns {Array}
+		 */
+		function createTreeData(arr){
+			var treeData = [];
+			var len = arr.length;
+			for(var i = 0; i < len; i ++){
+				var pId = arr[i].pId;
+				arr[i].text = arr[i].name;
+				if(!pId){
+					treeData.push(arr[i]);
+				}
+
+				for(var j = 0; j < len; j ++){
+					if(pId == arr[j].id){
+						if(!arr[j].children)
+							arr[j].children = [];
+						arr[j].children.push(arr[i]);
+						break;
+					}
+				}
+			}
+			return treeData;
+		}
 		function showPagination(data){
 			//分页
@@ -335,6 +335,33 @@
 			});
 		}
+		/**
+		 * 将模块List 转换为树结构
+		 * @param arr
+		 * @returns {Array}
+		 */
+		function createTreeData(arr){
+			var treeData = [];
+			var len = arr.length;
+			for(var i = 0; i < len; i ++){
+				var pId = arr[i].pId;
+				arr[i].text = arr[i].name;
+				if(!pId){
+					treeData.push(arr[i]);
+				}
+
+				for(var j = 0; j < len; j ++){
+					if(pId == arr[j].id){
+						if(!arr[j].children)
+							arr[j].children = [];
+						arr[j].children.push(arr[i]);
+						break;
+					}
+				}
+			}
+			return treeData;
+		}
+		
 		function initCl(){
 			$('#nbbm').select2({
 				placeholder: '搜索车辆...',
@@ -480,6 +480,33 @@
 			});
 		}
+		/**
+		 * 将模块List 转换为树结构
+		 * @param arr
+		 * @returns {Array}
+		 */
+		function createTreeData(arr){
+			var treeData = [];
+			var len = arr.length;
+			for(var i = 0; i < len; i ++){
+				var pId = arr[i].pId;
+				arr[i].text = arr[i].name;
+				if(!pId){
+					treeData.push(arr[i]);
+				}
+
+				for(var j = 0; j < len; j ++){
+					if(pId == arr[j].id){
+						if(!arr[j].children)
+							arr[j].children = [];
+						arr[j].children.push(arr[i]);
+						break;
+					}
+				}
+			}
+			return treeData;
+		}
+		
 		function _w_table_rowspan(_w_table_id, _w_table_colnum){
 		    _w_table_firsttd = "";
 		    _w_table_currenttd = "";
@@ -359,7 +359,8 @@
 				});
 			});
 			$get('/realSchedule/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){
-				window.open("/downloadFile/downloadList?fileName="+result.fileName);
+// 				window.open("/downloadFile/downloadList?fileName="+result.fileName);	//下载压缩包
+				window.open("/downloadFile/download?fileName="+result.fileName);
 			});
 		});
@@ -192,4 +192,31 @@ function getTreeData(cb){
 	});
 }
+/**
+ * 将模块List 转换为树结构
+ * @param arr
+ * @returns {Array}
+ */
+function createTreeData(arr){
+	var treeData = [];
+	var len = arr.length;
+	for(var i = 0; i < len; i ++){
+		var pId = arr[i].pId;
+		arr[i].text = arr[i].name;
+		if(!pId){
+			treeData.push(arr[i]);
+		}
+
+		for(var j = 0; j < len; j ++){
+			if(pId == arr[j].id){
+				if(!arr[j].children)
+					arr[j].children = [];
+				arr[j].children.push(arr[i]);
+				break;
+			}
+		}
+	}
+	return treeData;
+}
+
 </script>
 \ No newline at end of file
@@ -169,5 +169,33 @@ $(function(){
 			cb && cb(treeData)
 		});
 	}
+	
+	/**
+	 * 将模块List 转换为树结构
+	 * @param arr
+	 * @returns {Array}
+	 */
+	function createTreeData(arr){
+		var treeData = [];
+		var len = arr.length;
+		for(var i = 0; i < len; i ++){
+			var pId = arr[i].pId;
+			arr[i].text = arr[i].name;
+			if(!pId){
+				treeData.push(arr[i]);
+			}
+
+			for(var j = 0; j < len; j ++){
+				if(pId == arr[j].id){
+					if(!arr[j].children)
+						arr[j].children = [];
+					arr[j].children.push(arr[i]);
+					break;
+				}
+			}
+		}
+		return treeData;
+	}
+	
 });
 </script>
 \ No newline at end of file
@@ -187,5 +187,33 @@ $(function(){
 			cb && cb(treeData)
 		});
 	}
+	
+	/**
+	 * 将模块List 转换为树结构
+	 * @param arr
+	 * @returns {Array}
+	 */
+	function createTreeData(arr){
+		var treeData = [];
+		var len = arr.length;
+		for(var i = 0; i < len; i ++){
+			var pId = arr[i].pId;
+			arr[i].text = arr[i].name;
+			if(!pId){
+				treeData.push(arr[i]);
+			}
+
+			for(var j = 0; j < len; j ++){
+				if(pId == arr[j].id){
+					if(!arr[j].children)
+						arr[j].children = [];
+					arr[j].children.push(arr[i]);
+					break;
+				}
+			}
+		}
+		return treeData;
+	}
+	
 });
 </script>
 \ No newline at end of file
@@ -281,6 +281,33 @@ $(function(){
 		});
 	}
+	/**
+	 * 将模块List 转换为树结构
+	 * @param arr
+	 * @returns {Array}
+	 */
+	function createTreeData(arr){
+		var treeData = [];
+		var len = arr.length;
+		for(var i = 0; i < len; i ++){
+			var pId = arr[i].pId;
+			arr[i].text = arr[i].name;
+			if(!pId){
+				treeData.push(arr[i]);
+			}
+
+			for(var j = 0; j < len; j ++){
+				if(pId == arr[j].id){
+					if(!arr[j].children)
+						arr[j].children = [];
+					arr[j].children.push(arr[i]);
+					break;
+				}
+			}
+		}
+		return treeData;
+	}
+	
 	//删除
 	$('#removeButton').on('click', function(){
 		if($(this).attr('disabled'))
@@ -215,5 +215,33 @@ $(function(){
 			cb && cb(treeData)
 		});
 	}
+	
+	/**
+	 * 将模块List 转换为树结构
+	 * @param arr
+	 * @returns {Array}
+	 */
+	function createTreeData(arr){
+		var treeData = [];
+		var len = arr.length;
+		for(var i = 0; i < len; i ++){
+			var pId = arr[i].pId;
+			arr[i].text = arr[i].name;
+			if(!pId){
+				treeData.push(arr[i]);
+			}
+
+			for(var j = 0; j < len; j ++){
+				if(pId == arr[j].id){
+					if(!arr[j].children)
+						arr[j].children = [];
+					arr[j].children.push(arr[i]);
+					break;
+				}
+			}
+		}
+		return treeData;
+	}
+	
 });
 </script>
@@ -298,6 +298,33 @@
 			});
 		}
+		/**
+		 * 将模块List 转换为树结构
+		 * @param arr
+		 * @returns {Array}
+		 */
+		function createTreeData(arr){
+			var treeData = [];
+			var len = arr.length;
+			for(var i = 0; i < len; i ++){
+				var pId = arr[i].pId;
+				arr[i].text = arr[i].name;
+				if(!pId){
+					treeData.push(arr[i]);
+				}
+
+				for(var j = 0; j < len; j ++){
+					if(pId == arr[j].id){
+						if(!arr[j].children)
+							arr[j].children = [];
+						arr[j].children.push(arr[i]);
+						break;
+					}
+				}
+			}
+			return treeData;
+		}
+		
 		$("#line").on("change", function(){
 			line = $("#line").val();
 			updateTtinfo();