报表

src/main/java/com/minpay/common/constant/Constant.java

@@ -363,7 +363,7 @@ public class Constant implements IMINBusinessConstant{
 	 */
 	public static final String REPORT_TYPE_10 = "DDYZRXZ";
 	/**
-	 * 报表类型  DDYZRXZ 低电压昨日新增考核
+	 * 报表类型  DDYZB 低电压周报
 	 */
 	public static final String REPORT_TYPE_11 = "DDYZB";
 	/**

src/main/java/com/minpay/common/service/impl/ReportServiceImpl.java

@@ -121,7 +121,6 @@ public class ReportServiceImpl implements IReportService {
 	public Map<String, Object> reportNeedDetail(Map<String, String> param)
 			throws MINBusinessException, ParseException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
 		String range = param.get("range");
-		String monthChoose = param.get("monthChoose");
 		String timeRange = param.get("timeRange");
 		String reportTypeId = param.get("reportTypeId");
 		String firstFileId = param.get("firstFileId");
@@ -175,9 +174,9 @@ public class ReportServiceImpl implements IReportService {
     	} else if (Constant.REPORT_TYPE_10.equals(reportTypeId)) {
     		List<List<String>> resList = reportTypeDDYZRXZ(ddyFxbId);
     		resMap.put("resList", resList);
-    	// 低电压昨日新增
+    	// 低电压周报
 		} else if (Constant.REPORT_TYPE_11.equals(reportTypeId)) {
-			return reportTypeDDYZB(yearChoose, monthChoose, range);
+			return reportTypeDDYZB(ddyFxbId, range);
 		// 低电压超30天
 		} else if (Constant.REPORT_TYPE_12.equals(reportTypeId)) {
 			List<List<String>> resList = reportTypeDDY30T(ddyFxbId);
@@ -2439,37 +2438,38 @@ public class ReportServiceImpl implements IReportService {
 	
 	/**
 	 * 低电压周报
-	 * @param yearChoose		年范围
-	 * @param monthChoose		月范围
-	 * @param range				周范围
+	 * @param ddyFxbId
+	 * @param range
 	 * @return
 	 * @throws MINBusinessException
 	 * @throws ParseException
-	 * @throws InvocationTargetException 
-	 * @throws IllegalArgumentException 
-	 * @throws IllegalAccessException 
-	 * @throws SecurityException 
-	 * @throws NoSuchMethodException 
+	 * @throws NoSuchMethodException
+	 * @throws SecurityException
+	 * @throws IllegalAccessException
+	 * @throws IllegalArgumentException
+	 * @throws InvocationTargetException
 	 */
-	public Map<String, Object> reportTypeDDYZB(String yearChoose, String monthChoose, String range) throws MINBusinessException, ParseException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException{
+	public Map<String, Object> reportTypeDDYZB(String ddyFxbId, String range) throws MINBusinessException, ParseException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException{
 		IMINDataBaseService db = Service.lookup(IMINDataBaseService.class);
 		
 		Map<String, Object> resMap = new HashMap<String, Object>();
-		// 全年开始时间和结束时间
-		yearChoose = yearChoose.replaceAll(" ", "");
-		String yearBegin = yearChoose.split("-")[0];
-//		String yearEnd = yearChoose.split("-")[1];
-		
-		// 当月开始时间和结束时间
-		monthChoose = monthChoose.replaceAll(" ", "");
-		String monthBegin = monthChoose.split("-")[0];
-//		String monthEnd = monthChoose.split("-")[1];
 		
 		// 本周开始时间和结束时间
 		range = range.replaceAll(" ", "");
 		String weekBegin = range.split("-")[0];
 		String weekEnd = range.split("-")[1];
 		
+		DwReportInf reportInf = db.selectByPrimaryKey(DwReportInfMapper.class, ddyFxbId);
+		// 当月开始时间和结束时间
+		String monthBegin = reportInf.getDayInterval().split("-")[0];
+		
+		// 全年开始时间和结束时间
+		String yearBegin = CommonUtil.subtract(monthBegin.substring(0,  4), "1") + "1226";
+		// 
+		if ("12".equals(monthBegin.substring(4,6))) {
+			yearBegin = monthBegin.substring(0,  4) + "1226";
+		}
+		
 		// 全年累计考核数
 		Map<String, Object> param = new HashMap<String, Object>();
 		param.put("beginTime", yearBegin);
@@ -2529,6 +2529,8 @@ public class ReportServiceImpl implements IReportService {
 						descMap.put("name", "景区");
 					} else if (xgsmc.contains("肥城")) {
 						descMap.put("name", "肥城");
+					} else {
+						continue;
 					}
 					descMap.put("num", "1");
 					bzzxmxDescList.add(descMap);
@@ -2546,7 +2548,10 @@ public class ReportServiceImpl implements IReportService {
 				danweiDesc += (name + num + "户，");
 			}
 		}
-		String desc = "本月新增受考核低电压客户${benyueXZ}户，其中本周新增${benzhouXZ}户，按单位分${danweiDesc}";
+		
+		// 正在治理用户
+		
+		String desc = "本月新增受考核低电压客户${benyueXZ}户，其中本周新增${benzhouXZ}户，按单位分${danweiDesc}截至目前未治理完成150户，141户正在治理；3户治理后再次出现，其中新泰、泰山、高新各1户；6户未开始治理，其中景区4户，高新2户。";
 		
 		Map<String, String> reportMap = new HashMap<String, String>();
 		reportMap.put("benyueXZ", String.valueOf(benyueXZ));

src/main/java/com/minpay/dianwang/util/ReportExcelUtil.java

@@ -13,11 +13,7 @@ import org.apache.poi.hssf.usermodel.HSSFCellStyle;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.BorderStyle;
 import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.ss.util.CellRangeAddress;
 
 import com.minpay.common.util.CommonUtil;
 
@@ -65,4 +61,82 @@ public class ReportExcelUtil {
 //		  sheet.setColumnWidth(fieldArray.length, 20 * 256);
 		  return wb;
 	 }
+	 
+	 public static <T> HSSFWorkbook export(HttpServletResponse response, String fileName, String[] excelHeader,
+			   Collection<T> dataList) throws Exception {
+			  // 设置请求
+			  response.setContentType("application/application/vnd.ms-excel");
+			  response.setHeader("Content-disposition",
+			    "attachment;filename=" + URLEncoder.encode(fileName + ".xls", "UTF-8"));
+			  // 创建一个Workbook，对应一个Excel文件
+			  HSSFWorkbook wb = new HSSFWorkbook();
+			  // 设置标题样式
+			  HSSFCellStyle titleStyle = wb.createCellStyle();
+			  // 设置字体样式
+			  Font titleFont = wb.createFont();
+			  titleFont.setFontHeightInPoints((short) 12); // 字体高度
+			  titleFont.setFontName("黑体"); // 字体样式
+			  titleStyle.setFont(titleFont);
+			  // 在Workbook中添加一个sheet,对应Excel文件中的sheet
+			  HSSFSheet sheet = wb.createSheet(fileName);
+			  // 标题数组
+			  String[] titleArray = new String[excelHeader.length];
+			  // 字段名数组
+			  String[] fieldArray = new String[excelHeader.length];
+			  for (int i = 0; i < excelHeader.length; i++) {
+				  String[] tempArray = excelHeader[i].split("#");// 临时数组 分割#
+				  titleArray[i] = tempArray[0];
+				  fieldArray[i] = tempArray[1];
+			  }
+			  // 在sheet中添加标题行
+			  HSSFRow row = sheet.createRow((int) 0);// 行数从0开始
+			  HSSFCell sequenceCell = row.createCell(0);// cell列 从0开始 第一列添加序号
+			  sequenceCell.setCellValue("序号");
+			  sequenceCell.setCellStyle(titleStyle);
+			  sheet.autoSizeColumn(0);// 自动设置宽度
+			  // 为标题行赋值
+			  for (int i = 0; i < titleArray.length; i++) {
+				  HSSFCell titleCell = row.createCell(i + 1);// 0号位被序号占用，所以需+1
+				  titleCell.setCellValue(titleArray[i]);
+				  titleCell.setCellStyle(titleStyle);
+				  sheet.autoSizeColumn(i + 1);// 0号位被序号占用，所以需+1
+				  sheet.setColumnWidth(i+1,titleArray[i].getBytes().length*256+200);
+			  }
+			  // 数据样式 因为标题和数据样式不同 需要分开设置 不然会覆盖
+			  HSSFCellStyle dataStyle = wb.createCellStyle();
+			  // 设置数据字体
+			  Font dataFont = wb.createFont();
+			  dataFont.setFontHeightInPoints((short) 10); // 字体高度
+			  dataFont.setFontName("宋体"); // 字体
+			  dataStyle.setFont(dataFont);
+			  // 遍历集合数据，产生数据行
+			  Iterator<T> it = dataList.iterator();
+			  int index = 0;
+			  while (it.hasNext()) {
+				  index++;
+				  row = sheet.createRow(index);
+				  // 为序号赋值
+				  HSSFCell sequenceCellValue = row.createCell(0);// 序号值永远是第0列
+				  sequenceCellValue.setCellValue(index);
+				  sequenceCellValue.setCellStyle(dataStyle);
+//					  sheet.autoSizeColumn(0);
+				  T t = (T) it.next();
+				  Map<String, Object> map = (Map<String, Object> )t;
+				  HSSFCell dataCell = null;
+				  for (int i = 0; i < fieldArray.length; i++) {
+					  dataCell = row.createCell(i + 1);
+					  dataCell.setCellStyle(dataStyle);
+					  String fieldName = fieldArray[i];
+					  String value = CommonUtil.objToString(map.get(fieldName));
+					  if (CommonUtil.isEmpty(value)) {
+						  dataCell.setCellValue("");					// 为当前列赋值
+					  } else {
+						  dataCell.setCellValue(CommonUtil.objToString(value));// 为当前列赋值
+					  }
+					  
+				  }
+			  }
+			  sheet.setColumnWidth(fieldArray.length, 20 * 256);
+			  return wb;
+		 }
 }

src/main/java/com/minpay/reportManage/action/ReportManageAction.java

@@ -94,6 +94,9 @@ public class ReportManageAction implements IMINAction {
     /** 低电压分析表编辑 */
     public final static String DDY_REPORT_INF_UPDATE = "ddyReportInfUpdate";
     
+    /** 低电压分析表下载*/
+    public final static String DDY_REPORT_INF_DOWNLOAD = "ddyReportInfDownload";
+    
     /**
      * 报表查询 
      * @param page
@@ -637,6 +640,20 @@ public class ReportManageAction implements IMINAction {
     	return res;
     }
     
+    /**
+     * 低电压编辑
+     * @param id
+     * @param ddyzymc
+     * @param jtyy
+     * @param zlcs
+     * @param sfzl
+     * @param zlwcsj
+     * @param sfxc
+     * @param session
+     * @return
+     * @throws MINBusinessException
+     * @throws ParseException
+     */
     @MINAction(value = DDY_REPORT_INF_UPDATE, transaction = IMINTransactionEnum.CMT)
     public MINActionResult ddyReportInfUpdate(
     		@MINParam(key = "id") String id,
@@ -674,4 +691,119 @@ public class ReportManageAction implements IMINAction {
     	
     	return res;
     }
+    
+    @MINAction(value = DDY_REPORT_INF_DOWNLOAD)
+    public HttpServletResponse ddyReportInfDownload(
+    		@MINParam(key = "reportId") String reportId,
+    		HttpServletResponse response
+    		) throws Exception {
+    	
+    	db = Service.lookup(IMINDataBaseService.class);
+    	
+    	DwReportInf reportInf = db.selectByPrimaryKey(DwReportInfMapper.class, reportId);
+    	
+		
+    	int page = 1;
+    	int limit = 1000;
+    	
+    	int count = 0;
+    	List<Map<String, String>> resList = new ArrayList<Map<String, String>>();
+    	while (true) {
+    		
+    		MINRowBounds rows = new MINRowBounds(page, limit);
+    		rows.setSeparateSql(true);
+    		
+    		DwDdyFxbExample ddyFxbExample = new DwDdyFxbExample();
+    		ddyFxbExample.createCriteria().andReportIdEqualTo(reportId);
+    		ddyFxbExample.setOrderByClause("DDF_ID");
+    		List<DwDdyFxb> ddyFxbList = db.selectByExample(DwDdyFxbMapper.class, ddyFxbExample, rows);
+    		
+    		count = rows.getCount();
+    		
+    		List<String> fxbIdList = CommonUtil.getIdFromList(ddyFxbList, "id");
+    		
+    		DwDdyFxbDetailExample ddyFxbDetailExample = new DwDdyFxbDetailExample();
+    		ddyFxbDetailExample.createCriteria().andFxbIdIn(fxbIdList);
+    		ddyFxbDetailExample.setOrderByClause("DDFD_FXB_ID");
+    		List<DwDdyFxbDetail> detailList = db.selectByExample(DwDdyFxbDetailMapper.class, ddyFxbDetailExample);
+    		
+    		for (DwDdyFxb ddyFxb : ddyFxbList) {
+    			Map<String, String> child = new HashMap<String, String>();
+    			child.put("id", ddyFxb.getId());
+    			child.put("xh", ddyFxb.getXh());
+    			child.put("xgsmc", ddyFxb.getXgsmc());
+    			child.put("yhgldwmc", ddyFxb.getYhgldwmc());
+    			child.put("xlmc", ddyFxb.getXlmc());
+    			child.put("tqid", ddyFxb.getTqid());
+    			child.put("byqmc", ddyFxb.getByqmc());
+    			child.put("yhbh", ddyFxb.getYhbh());
+    			child.put("ddysj", String.valueOf(ddyFxb.getDdysj()));
+    			child.put("ljts", String.valueOf(ddyFxb.getLjts()));
+    			child.put("ddyzymc", ddyFxb.getDdyzymc());
+    			child.put("jtyy", ddyFxb.getJtyy());
+    			child.put("zlcs", ddyFxb.getZlcs());
+    			child.put("sfzl", ddyFxb.getSfzl());
+    			child.put("zlwcsj", ddyFxb.getZlwcsj());
+    			child.put("sfxc", ddyFxb.getSfxc());
+    			
+    			for (int i = 0; i < detailList.size(); i++) {
+    				// 分析表id一致
+    				if (ddyFxb.getId().equals(detailList.get(i).getFxbId())) {
+    					String sjrq = detailList.get(i).getDate();
+    					child.put(sjrq, detailList.get(i).getSc());
+    					detailList.remove(i);
+    					i --;
+    				} else {
+    					break;
+    				}
+    			}
+    			resList.add(child);
+    		}
+    		if (limit*page >= count) {
+    			break;
+    		}
+    		page ++;
+    	}
+    	
+    	//导出Excel
+		OutputStream out=null;
+		try {
+			String beginTime = reportInf.getDayInterval().split("-")[0];
+	    	String endTime = reportInf.getDayInterval().split("-")[1];
+	    	int dayNum = DateUtil.diffDate(beginTime, endTime);
+	    	String[] excelHeader = new String[dayNum + 15];
+	    	excelHeader[0] = "县公司名称#xgsmc";
+	    	excelHeader[1] = "用户管理单位名称#yhgldwmc";
+	    	excelHeader[2] = "线路名称#xlmc";
+	    	excelHeader[3] = "台区ID#tqid";
+	    	excelHeader[4] = "变压器名称#byqmc";
+	    	excelHeader[5] = "用户编号#yhbh";
+	    	excelHeader[6] = "低电压时长#ddysj";
+	    	excelHeader[7] = "累计天数#ljts";
+	    	excelHeader[8] = "低电压主要原因#ddyzymc";
+	    	excelHeader[9] = "具体原因#jtyy";
+	    	excelHeader[10] = "治理措施#zlcs";
+	    	excelHeader[11] = "是否治理#sfzl";
+	    	excelHeader[12] = "治理完成时间#zlwcsj";
+	    	excelHeader[13] = "是否消除#sfxc";
+	    	
+	    	int index = 14;
+	    	while (CommonUtil.compare(endTime, beginTime) != -1) {
+	    		excelHeader[index] = endTime + "#" + endTime;
+	    		index ++;
+	    		endTime = DateUtil.dateAddDay(endTime, -1);
+	    	}
+			out = response.getOutputStream();
+			HSSFWorkbook wb = ReportExcelUtil.export(response, reportInf.getFileName(), excelHeader, resList);
+			if(wb != null){
+				wb.write(out);
+			}
+			out.flush();
+			out.close();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+    	
+    	return response;
+    }
 }

src/main/webapp/admin/ddy/reportManageDdy.html

@@ -40,8 +40,8 @@
 	</div>
 	<script type="text/html" id="barDemo">
 		<a class="layui-btn layui-btn-xs" lay-event="detail">详情查看</a>
-		<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
-     	<!-- <a class="layui-btn layui-btn-xs" lay-event="downLoad">下载</a> -->
+		<!--<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>-->
+     	<a class="layui-btn layui-btn-xs" lay-event="downLoad">下载</a>
 		<a class="layui-btn layui-btn-xs" lay-event="delete">删除</a>
    	</script>
 	<script type="text/html" id="algorithmBar">
@@ -103,7 +103,7 @@
 		    if (layEvent === 'detail'){ //查看
 		    	showDetail(data);
 		    } else if(layEvent === 'downLoad'){
-		    	window.open("../../ReportManageAction/reportDownLoad?reportId=" + data.id);
+		    	window.open("../../ReportManageAction/ddyReportInfDownload?reportId=" + data.id);
 		    } else if(layEvent === 'delete'){
 		    	layer.confirm('确认删除？', function(index){
 	        		layer.close(index);

src/main/webapp/admin/ddy/reportProduceZb.html

@@ -59,8 +59,7 @@
 	<div name = "step" style = "width: 80%; margin-left : 10%;height : 300px; display : none; text-align : center;">
 		<form class="layui-form" style = "text-align : center;">
 			<div style = "width: 80%; margin-left : 0px; height : 200px" class = "layui-upload-drag" >
-				<input type="text" class="layui-input" id="yearChoose" placeholder="请选择年范围" style = "display: inline-block;">
-				<input type="text" class="layui-input" id="monthChoose" placeholder="请选择月范围" style = "display: inline-block;">
+				<input id = "chooseFenxiReport" type="text" style = "display : inline-block" class="layui-input" placeholder="请选择分析表">
 				<input type="text"  class="layui-input" id="weekRange" placeholder="请选择周范围" style = "display: inline-block;">
 			</div>
 			<div style="margin-top : 50px;">
@@ -99,78 +98,60 @@
     	    $step = $("#step_demo").step();
 		})
 		
+		$("#chooseFenxiReport").click(function(){
+			var openPageId = pageId + "-01";
+    	  	openMainTabPage(openPageId, "报表生成", "common/chooseDdyFxb.html?pageId="+openPageId, '', pageId, chooseBack);
+		})
+		
+		var weekChoose = null;
 		layui.use('laydate', function(){
-			var myDate = new Date();
-			var nowYear = myDate.getFullYear();
-			var initYearRange = (nowYear-1) + "1226" + " - " + nowYear + "1225";
-			
 			var laydate = layui.laydate;
-			laydate.render({
-				elem: '#yearChoose'
-				,format : 'yyyyMMdd'
-				,value: initYearRange
-				,range : true
-				,trigger: 'click' //采用click弹出
-				,done: function(value, date, endDate){
-					var minDate = value.replace(" ", "").replace(" ", "").split("-")[0];
-					var maxDate = value.replace(" ", "").replace(" ", "").split("-")[1];
-					$("#monthChoose").val('');
-					monthChoose.config.min = {
-							year : minDate.substring(0,4),
-							month : parseInt(minDate.substring(4, 6)) - 1,
-							date : minDate.substring(6, 8),
-							hours : 0,
-							minutes : 0,
-							seconds : 0
-					}
-					monthChoose.config.max = {
-							year : maxDate.substring(0,4),
-							month : parseInt(maxDate.substring(4, 6)) - 1,
-							date : maxDate.substring(6, 8),
-							hours : 0,
-							minutes : 0,
-							seconds : 0
-					}
-				}
-			});
-			
-			var monthChoose = laydate.render({
-				elem: '#monthChoose'
-				,format : 'yyyyMMdd'
-				,range : true
-				,trigger: 'click' //采用click弹出
-				,done: function(value, date, endDate){
-					var minDate = value.replace(" ", "").replace(" ", "").split("-")[0];
-					var maxDate = value.replace(" ", "").replace(" ", "").split("-")[1];
-					$("#weekRange").val('');
-					weekChoose.config.min = {
-							year : minDate.substring(0,4),
-							month : parseInt(minDate.substring(4, 6)) - 1,
-							date : minDate.substring(6, 8),
-							hours : 0,
-							minutes : 0,
-							seconds : 0
-					}
-					weekChoose.config.max = {
-							year : maxDate.substring(0,4),
-							month : parseInt(maxDate.substring(4, 6)) - 1,
-							date : maxDate.substring(6, 8),
-							hours : 0,
-							minutes : 0,
-							seconds : 0
-					}
-				}
-				,min : (nowYear-1) + "-12-26"
-				,max : nowYear + "-12-25"
-			});
-			
-			var weekChoose = laydate.render({
+			weekChoose = laydate.render({
 				elem: '#weekRange'
 				,format : 'yyyyMMdd'
 				,range : true
 				,trigger: 'click' //采用click弹出
 			});
 		})
+		// 选择分析表返回
+		var fxbReport;
+		function chooseBack() {
+			fxbReport = getTempVal("fxbReport");
+			$("#chooseFenxiReport").val(fxbReport.fileName);
+			var dayInterval = fxbReport.dayInterval;
+				
+			var minDateStr = dayInterval.split("-")[0];
+			var maxDateStr = dayInterval.split("-")[1];
+			var diff = dateDiff(maxDateStr, minDateStr);
+			
+			var initDate = '';
+			if (diff < 6) {
+				initDate = minDateStr +  " - " + maxDateStr;
+			} else {
+				var maxDate = strToDate(maxDateStr);
+				var minDate = new Date(maxDate.getFullYear(), maxDate.getMonth(), maxDate.getDate() - 6, 0, 0, 0);
+				initDate = dateToString(minDate) + " - " + dateToString(maxDate);
+			}
+			
+			$("#weekRange").val(initDate);
+			weekChoose.config.min = {
+					year : minDateStr.substring(0,4),
+					month : parseInt(minDateStr.substring(4, 6)) - 1,
+					date : minDateStr.substring(6, 8),
+					hours : 0,
+					minutes : 0,
+					seconds : 0
+			}
+			weekChoose.config.max = {
+					year : maxDateStr.substring(0,4),
+					month : parseInt(maxDateStr.substring(4, 6)) - 1,
+					date : maxDateStr.substring(6, 8),
+					hours : 0,
+					minutes : 0,
+					seconds : 0
+			}
+		}
+		
 		// 范围类型
 		layui.use('form', function(){
 			var form = layui.form;
@@ -319,15 +300,10 @@
 		// 预览
 		function tableYulan() {
 			var reportInf = $("#reportTypeDiv").find("select option:selected").val();
-			var yearChoose = $("#yearChoose").val();
-			var monthChoose = $("#monthChoose").val();
 			var weekRange = $("#weekRange").val();
-			if (isEmpty(yearChoose)) {
-				$.ErrorAlert("请选择年范围!");
-				return;
-			}
-			if (isEmpty(monthChoose)) {
-				$.ErrorAlert("请选择月范围!");
+			
+			if (isEmpty(fxbReport)) {
+				$.ErrorAlert("请选择分析表!");
 				return;
 			}
 			if (isEmpty(weekRange)) {
@@ -340,14 +316,12 @@
 				action : 'ReportManageAction/reportNeedDataDetail',
 				data : {
 					reportInf : reportInf,
-					yearChoose : yearChoose,
 					range : weekRange,
-					monthChoose : monthChoose
+					ddyFxbId : fxbReport.id
 				},
 				success : function(data) {
 					if (data.code == 0) {
 						reportData = data.data;
-						
 						var reportMap = data.data.reportMap;
 						var descStr = data.data.descStr;
 						for(var key in reportMap){

src/main/webapp/admin/index.html

@@ -299,10 +299,6 @@
 					menuHtml = menuHtml + '<div class="w-line"></div>';
 					menuHtml = menuHtml + '</li>';
 				}
-				menuHtml = menuHtml + '<li id="otherThis'+data.oneMenuList.length+'" name="otherThis" class="layui-nav-item">'
-				menuHtml = menuHtml + '<a href="#" onclick =indexPage("dataMap/main.html")>数据地图</a>';
-				menuHtml = menuHtml + '<div class="w-line"></div>';
-				menuHtml = menuHtml + '</li>';
 				
 				$('#oneMenu').html(menuHtml);
 				if(data.oneMenuList.length > 0) {

src/main/webapp/js/min.js

@@ -1210,3 +1210,11 @@ function dateToString (date){
    var  dateTime = year + month + day;
    return  dateTime; 
 }
+
+function dateDiff(firstDate,secondDate){
+	firstDate = strToDate(firstDate);
+	secondDate = strToDate(secondDate);
+	var diff = Math.abs(firstDate.getTime() - secondDate.getTime())
+	var result = parseInt(diff / (1000 * 60 * 60 * 24));
+	return result
+}