日期查询条件不可用

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

@@ -297,7 +297,7 @@ public class ReportServiceImpl implements IReportService {
 			map.put("end",end);
 			map.put("type","1");
 			List<Map<String, String>>  DDYZLFXBList = db.getMybatisMapper(IReportBatchMapper.class).selectXlgzzData(map);
-			//重载
+			//线路重载
 			Float maxZzsc = 0f;//
 			String maxXlName = "";//最长时长线路
 			Map<String,Object> ttMap = new HashMap();
@@ -329,7 +329,7 @@ public class ReportServiceImpl implements IReportService {
 				}
 			}
 			map.put("type",null);
-			//过载
+			//线路过载
 			List<Map<String, String>>  DDYZLFXBList2 = db.getMybatisMapper(IReportBatchMapper.class).selectXlgzzData(map);
 			Float maxZzsc2 = 0f;//
 			String maxXlName2 = "";//最长时长线路
@@ -363,9 +363,6 @@ public class ReportServiceImpl implements IReportService {
 			}
 			//配变
 			List<Map<String, String>>  pbgzzList = db.getMybatisMapper(IReportBatchMapper.class).selectPbgzzData(map);
-
-			Float maxPb = 0f;
-			String maxPbName = "";
 			Map<String,Object> pbTemp = new HashMap<String,Object>();
 			Map<String,Object> pbTemp2 = new HashMap<String,Object>();
 
@@ -377,7 +374,7 @@ public class ReportServiceImpl implements IReportService {
 				int size = pbgzzList.size();
 				for (int i = 0; i < pbgzzList.size(); i++) {
 					Map<String,String> temp = pbgzzList.get(i);
-					String fzl = temp.get("DFD9_FZL");
+					Object fzl = temp.get("DFD9_FZL");
 					String key = temp.get("KEYSS");
 					if(StringUtil.ObjToFloat(fzl) > 100){//过载
 						if(pbTemp.containsKey(key)){
@@ -390,7 +387,7 @@ public class ReportServiceImpl implements IReportService {
 							jo3.put("avg",ArithUtils.div(str.get("pjfzl"),str.get("xlts")));
 							ja3.add(jo3);
 						}
-					}else{//重载
+					}else if(StringUtil.ObjToFloat(fzl) <= 100 && StringUtil.ObjToFloat(fzl) >= 80){//重载
 						if(pbTemp2.containsKey(key)){
 							continue;
 						}else{
@@ -404,19 +401,21 @@ public class ReportServiceImpl implements IReportService {
 					}
 				}
 			}
-
-			rstMap.put("result2",ja2);
-			rstMap.put("result",ja);
+			rstMap.put("result",ja);//线路重载
+			rstMap.put("result2",ja2);//线路过载
+			rstMap.put("result3",ja3);//配变过载
+			rstMap.put("result4",ja4);//配变重载
 			Map<String,Object> param = new HashMap<String,Object>();
 			param.put("maxZzsc",maxZzsc);
 			param.put("maxXlName",maxXlName);
+
 			param.put("maxZzsc2",maxZzsc2);
 			param.put("maxXlName2",maxXlName2);
 			//获取配变过载数据最大值
-			this.getMaxPbByParam(ja,ja2,param);
+			this.getMaxPbByParam(pbgzzList,param);
 			//获取配变重载数据最大值
 			rstMap.put("descStr",this.getXlgzzDesc(ja,ja2,param));
-//			rstMap.put("descStr2",this.getXlPbgzzDesc(ja3,ja4,param2));
+			rstMap.put("descStr2",this.getXlPbgzzDesc(ja3,ja4,param));
 
 
 		}
@@ -424,34 +423,162 @@ public class ReportServiceImpl implements IReportService {
 	}
 
 	/**
-	 *
-	 * @param ja
-	 * @param ja2
+	 * 获取配变描述信息
+	 * @param ja3 过载
+	 * @param ja4 重载
 	 * @param param
+	 * @return
 	 */
-	private void getMaxPbByParam(JSONArray ja, JSONArray ja2, Map<String, Object> param) {
-		//获取配变数据最大值
-		float maxPb1 = 0;
-		String gbmc = "";
-		String reason = "";
-		String cs = "";
-		if(ja != null && !ja.isEmpty()){
-			int size = ja.size();
+	private List<String> getXlPbgzzDesc(JSONArray ja3, JSONArray ja4, Map<String, Object> param) {
+		List<String> list = new ArrayList<String>();
+		StringBuffer descStr = new StringBuffer();
+		//过载
+		String maxGb = StringUtil.ObjectToString(param.get("maxPbName1"));
+		String avg = "";
+		if(ja3 != null && !ja3.isEmpty()){
+			descStr.append("监测发现公变过载")
+					.append(ja3.size())
+					.append("个，");
+			int size = ja3.size();
+			Map<String,Object> temp = new HashMap<String,Object>();
 			for (int i = 0; i < size; i++) {
-				JSONObject jo = ja.getJSONObject(i);
-				float fzl = StringUtil.ObjToFloat(jo.getString("DFD10_GZSC"));
-				if(maxPb1 < fzl){
-					maxPb1 = fzl;
-					gbmc = jo.getString("DFD9_GBMC");
-					reason =  jo.getString("DFD9_JTYY");
-					cs = jo.getString("DFD9_JTJJCS");
-
+				JSONObject jo = ja3.getJSONObject(i);
+				String key = jo.getString("KEYSS");
+				if(key.equals(maxGb)){
+					avg = jo.getString("avg");
+					maxGb = jo.getString("DFD9_GBMC");
 				}
+				String unit = jo.getString("DFD9_UNIT");
+				if(temp.containsKey(unit)){
+					temp.put(unit,Integer.valueOf(String.valueOf(temp.get(unit))) + 1);
+				}else{
+					temp.put(unit,1);
+				}
+			}
+			if(!temp.isEmpty()){
+				descStr.append("分别为");
 			}
+			for (Map.Entry<String, Object> entry : temp.entrySet()) {
+				descStr.append(entry.getKey())
+						.append(entry.getValue())
+						.append("个，");
+			}
+			descStr.append("其中").append(maxGb).append(",");
+			descStr.append("过载时长最长" + StringUtil.ObjToFloat(param.get("maxPb1")) + "小时，平均负载率为" + avg + "%。")
+			.append("原因为:")
+			.append(param.get("reason1"))
+			.append("。")
+			.append("措施为:")
+			.append(param.get("cs1"))
+			.append("。");
+			descStr.append("不涉及电采暖线路。");
 		}else{
+			descStr.append("监测发现公变过载。");
+		}
+		//重载
+		StringBuffer descStr2 = new StringBuffer();
+		String maxGb2 = StringUtil.ObjectToString(param.get("maxPbName2"));
+		String avg2 = "";
+		if(ja4 != null && !ja4.isEmpty()){
+			descStr2.append("监测发现公变重载")
+					.append(ja4.size())
+					.append("个，");
+			int size = ja4.size();
+			Map<String,Object> temp = new HashMap<String,Object>();
+			for (int i = 0; i < size; i++) {
+				JSONObject jo = ja4.getJSONObject(i);
+				String key = jo.getString("KEYSS");
+				if(key.equals(maxGb2)){
+					avg2 = jo.getString("avg");
+					maxGb2 = jo.getString("DFD9_GBMC");
+				}
+				String unit = jo.getString("DFD9_UNIT");
+				if(temp.containsKey(unit)){
+					temp.put(unit,Integer.valueOf(String.valueOf(temp.get(unit))) + 1);
+				}else{
+					temp.put(unit,1);
+				}
+			}
+			if(!temp.isEmpty()){
+				descStr2.append("分别为");
+				for (Map.Entry<String, Object> entry : temp.entrySet()) {
+					descStr2.append(entry.getKey())
+							.append(entry.getValue())
+							.append("个，");
+				}
+			}
 
+			descStr2.append("其中").append(maxGb2).append(",");
+			descStr2.append("重载时长最长" + StringUtil.ObjToFloat(param.get("maxPb2")) + "小时，平均负载率为" + avg2 + "%。")
+					.append("原因为:")
+					.append(param.get("reason1"))
+					.append("。")
+					.append("措施为:")
+					.append(param.get("cs1"))
+					.append("。");
+			descStr2.append("不涉及电采暖线路。");
+		}else{
+			descStr2.append("监测发现公变过载。");
 		}
+		list.add(descStr.toString());
+		list.add(descStr2.toString());
+		return list;
+	}
 
+	/**
+	 * 查找最大值详情
+	 * @param list
+	 * @param param
+	 */
+	private void getMaxPbByParam(List<Map<String, String>> list, Map<String, Object> param) {
+		List<Map<String, String>> tempList1 = new ArrayList<Map<String, String>>();
+		List<Map<String, String>> tempList2 = new ArrayList<Map<String, String>>();
+		if(list != null && !list.isEmpty()){
+			for (int i = 0; i < list.size(); i++) {
+				Map<String, String> temp = list.get(i);
+				Object fzl = temp.get("DFD9_FZL");
+				if(StringUtil.ObjToFloat(fzl) > 100){
+					tempList1.add(temp);
+				}else if(StringUtil.ObjToFloat(fzl) <= 100 && StringUtil.ObjToFloat(fzl) >= 80){
+					tempList2.add(temp);
+				}
+			}
+		}
+		//获取配变数据最大值
+		float maxPb1 = 0f;
+		float maxPb2 = 0f;
+		//过载
+		if(tempList1 != null && !tempList1.isEmpty()){
+			int size = tempList1.size();
+			for (int i = 0; i < size; i++) {
+				Map<String, String> temp = tempList1.get(i);
+				float fzl = StringUtil.ObjToFloat(temp.get("DFD9_GZSC"));
+				if(maxPb1 < fzl){
+					maxPb1 = fzl;
+					param.put("gbmc1",temp.get("DFD9_GBMC"));//公变名称
+					param.put("reason1",temp.get("DFD9_JTYY"));//具体原因
+					param.put("cs1",temp.get("DFD9_JTJJCS"));//具体解决措施
+					param.put("maxPbName1",temp.get("KEYSS"));
+				}
+			}
+			param.put("maxPb1",maxPb1);
+		}
+		//重载
+		if(tempList2 != null && !tempList2.isEmpty()){
+			int size = tempList2.size();
+			for (int i = 0; i < size; i++) {
+				Map<String, String> temp = tempList2.get(i);
+				float fzl = StringUtil.ObjToFloat(temp.get("DFD9_ZZSC"));
+				if(maxPb2 < fzl){
+					maxPb2 = fzl;
+					param.put("gbmc2",temp.get("DFD9_GBMC"));//公变名称
+					param.put("reason2",temp.get("DFD9_JTYY"));//具体原因
+					param.put("cs2",temp.get("DFD9_JTJJCS"));//具体解决措施
+					param.put("maxPbName2",temp.get("KEYSS"));
+				}
+			}
+			param.put("maxPb2",maxPb2);
+		}
 	}
 
 	/**
@@ -474,19 +601,19 @@ public class ReportServiceImpl implements IReportService {
 			int index = 0;
 			for (int i = 0; i < size; i++) {
 				Map<String,String> temp = pbgzzList.get(i);
-				String fzl = temp.get("DFD10_FZL");
+				Object fzl = temp.get("DFD9_FZL");
 				if("1".equals(type) && StringUtil.ObjToFloat(fzl) > 100){//过载
 					String tempkey = temp.get("KEYSS");//单位
 					if(tempkey.equals(key)){
-						sum =  ArithUtils.add(String.valueOf(sum),String.valueOf(temp.get("DFD10_GZSC")));
-						avg = ArithUtils.add(String.valueOf(avg),String.valueOf(temp.get("DFD10_FZL")));
+						sum =  ArithUtils.add(String.valueOf(sum),String.valueOf(temp.get("DFD9_GZSC")));
+						avg = ArithUtils.add(String.valueOf(avg),String.valueOf(temp.get("DFD9_FZL")));
 						index ++;
 					}
 				}else if("2".equals(type) && StringUtil.ObjToFloat(fzl) <= 100 && StringUtil.ObjToFloat(fzl) >= 80) {//重载
 					String tempkey = temp.get("KEYSS");//单位
 					if(tempkey.equals(key)){
-						sum =  ArithUtils.add(String.valueOf(sum),String.valueOf(temp.get("DFD10_GZSC")));
-						avg = ArithUtils.add(String.valueOf(avg),String.valueOf(temp.get("DFD10_FZL")));
+						sum =  ArithUtils.add(String.valueOf(sum),String.valueOf(temp.get("DFD9_ZZSC")));
+						avg = ArithUtils.add(String.valueOf(avg),String.valueOf(temp.get("DFD9_FZL")));
 						index ++;
 					}
 				}

src/main/java/com/minpay/common/util/ArithUtils.java

@@ -59,6 +59,10 @@ public class ArithUtils {
     public static float div(String v1,String v2){
         BigDecimal b1 = new BigDecimal(v1);
         BigDecimal b2 = new BigDecimal(v2);
+        BigDecimal b0 = new BigDecimal(0) ;//把 0 转为 BigDecimal
+        if(b2.compareTo(b0) == 0){
+            return 0f;
+        }
         return b1.divide(b2, DEF_DIV_SCALE, BigDecimal.ROUND_HALF_UP).floatValue();
     }
 }

src/main/java/com/minpay/common/util/StringUtil.java

@@ -86,6 +86,8 @@ public class StringUtil extends StringUtils {
     }
     /**
      * obj转date
+     * 入参格式yyyy/MM/dd hh:mm:ss
+     * 入参格式yyyy/mm/dd
      * @param obj
      * @return
      */
@@ -125,7 +127,7 @@ public class StringUtil extends StringUtils {
     }
 
     /**
-     * 入参格式yyyyMMdd
+     * 入参格式yyyyMMdd hh:mm:ss
      * @param obj
      * @return
      */
@@ -154,4 +156,34 @@ public class StringUtil extends StringUtils {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//注意月份是MM
         return simpleDateFormat.parse(dateStr.toString());
     }
+
+    /**
+     * 日期格式补全
+     * @param obj
+     * @return
+     */
+    public static String ObjDateRangeCompletion(Object obj){
+        if(obj == null || "".equals(obj)){
+            return "";
+        }
+        String start ="";
+        String end = "";
+        String temp = obj.toString();
+        temp = temp.replaceAll(" ","").replaceAll("-","").replaceAll("/","");
+        if(temp.length() == 16){
+            start = temp.substring(0,8)+"000000";
+            end = temp.substring(8,16)+"235959";
+        }
+        return start+end;
+    }
+
+    public static void main(String[] args) {
+        String str = "2021-04-01 - 2021-04-30";
+        str = str.replaceAll(" ","").replaceAll("-","").replaceAll("/","");
+        if(str.length() == 16){
+            System.out.println(str.substring(0,8)+"000000");
+            System.out.println(str.substring(8,16)+"235959");
+        }
+
+    }
 }

src/main/java/com/minpay/db/table/model/DwFileDetail08Example.java

@@ -35,7 +35,7 @@ public class DwFileDetail08Example {
      * @mbg.generated
      */
     public DwFileDetail08Example() {
-        oredCriteria = new ArrayList<>();
+        oredCriteria = new ArrayList();
     }
 
     /**
@@ -158,7 +158,7 @@ public class DwFileDetail08Example {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<>();
+            criteria = new ArrayList();
         }
 
         public boolean isValid() {

src/main/java/com/minpay/db/table/model/DwFileDetail09Example.java

@@ -37,7 +37,7 @@ public class DwFileDetail09Example {
      * @mbg.generated
      */
     public DwFileDetail09Example() {
-        oredCriteria = new ArrayList<>();
+        oredCriteria = new ArrayList();
     }
 
     /**
@@ -160,7 +160,7 @@ public class DwFileDetail09Example {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<>();
+            criteria = new ArrayList();
         }
 
         public boolean isValid() {
@@ -207,7 +207,7 @@ public class DwFileDetail09Example {
             if (values == null || values.size() == 0) {
                 throw new RuntimeException("Value list for " + property + " cannot be null or empty");
             }
-            List<java.sql.Date> dateList = new ArrayList<>();
+            List<java.sql.Date> dateList = new ArrayList();
             Iterator<Date> iter = values.iterator();
             while (iter.hasNext()) {
                 dateList.add(new java.sql.Date(iter.next().getTime()));

src/main/java/com/minpay/db/table/model/DwFileDetail10Example.java

@@ -37,7 +37,7 @@ public class DwFileDetail10Example {
      * @mbg.generated
      */
     public DwFileDetail10Example() {
-        oredCriteria = new ArrayList<>();
+        oredCriteria = new ArrayList();
     }
 
     /**
@@ -160,7 +160,7 @@ public class DwFileDetail10Example {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<>();
+            criteria = new ArrayList();
         }
 
         public boolean isValid() {
@@ -207,7 +207,7 @@ public class DwFileDetail10Example {
             if (values == null || values.size() == 0) {
                 throw new RuntimeException("Value list for " + property + " cannot be null or empty");
             }
-            List<java.sql.Date> dateList = new ArrayList<>();
+            List<java.sql.Date> dateList = new ArrayList();
             Iterator<Date> iter = values.iterator();
             while (iter.hasNext()) {
                 dateList.add(new java.sql.Date(iter.next().getTime()));

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

@@ -523,7 +523,7 @@ public class DataWareManageAction implements IMINAction {
 		}else if(Constant.FILE_DETAIL_TYPE_08.equals(fileType)){
 			//标题对应key
 			String[] titleKey = new String[]{"SEQU","MONTH","UNIT","BZMC","XLMC","GBMC","FZL","ZDFZL","ZDFZLFSSK","EDRL","GZZYYFL","JTYY",
-					"JJCSFL","JTJJCS","WCSJ","SXBPHL","AXDL","BXDL","CXDL","GZSC","YHSL","ZZSC","PMSID","YXID"};
+					"JJCSFL","JTJJCS","WCSJ","SXBPHL","AXDL","BXDL","CXDL","YHSL","GZSC","ZZSC","PMSID","YXID"};
 			String[] titleValue = new String[]{
 					"序号","月份","单位","维护班组","所属线路","公变名称","负载率(%)",
 					"最大负载率(%)","最大负载率发生时刻时间","额定容量(kVA)","重载原因分类",

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

@@ -14,6 +14,7 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.minpay.common.util.StringUtil;
 import com.minpay.db.table.mapper.*;
 import com.minpay.db.table.model.*;
 import org.apache.commons.fileupload.FileItem;
@@ -138,8 +139,8 @@ public class ReportManageAction implements IMINAction {
 		MINRowBounds rows = new MINRowBounds(page, limit);
 		rows.setSeparateSql(true);
 		Map<String, Object> param = new HashMap<String, Object>();
-
-		param.put("date", date);
+		//去空格
+		param.put("date", StringUtil.ObjectToString(date).replaceAll("-",""));
 		param.put("fileName", fileName);
 		param.put("timeType", timeType);
 		param.put("reportType", reportType);

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

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+import com.minpay.common.util.StringUtil;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 
@@ -82,8 +83,9 @@ public class UtilDataManageAction implements IMINAction {
 		MINRowBounds rows = new MINRowBounds(page, limit);
 		rows.setSeparateSql(true);
 		Map<String, Object> param = new HashMap<String, Object>();
-		
-		param.put("date", date);
+		//date处理
+
+		param.put("date", StringUtil.ObjectToString(date).replaceAll("-",""));
 		param.put("fileName", fileName);
 		
 		User user = session.getUser();
@@ -97,7 +99,6 @@ public class UtilDataManageAction implements IMINAction {
 			List<DwBranchReportType> branchReportTypeList = db.selectByExample(DwBranchReportTypeMapper.class, branchReportTypeExample);
 			param.put("branchReportTypeList", branchReportTypeList);
 		}
-		
 		List<Map<String, String>> list = db.getMybatisMapper(UtilDataManageMapper.class).selectUtilData(param, rows);
 		
 		if (list.size() == 0) {

src/main/resources/com/minpay/db/table/own/mapper/ReportBatchMapper.xml

@@ -112,7 +112,7 @@
             DFD10_XLMC
     </select>
     <!--配变重过载查询-->
-    <select id="selectPbgzzData" resultType="map" parameterMap="map">
+    <select id="selectPbgzzData" resultType="map" parameterType="map">
         SELECT
             DFD9_UNIT,
             DFD9_BZMC,

src/main/resources/com/minpay/db/table/own/mapper/UtilDataManageMapper.xml

@@ -18,7 +18,7 @@
 		    	and DUDI_FILE_NAME like concat('%', #{fileName,jdbcType=VARCHAR} ,'%')
 		   	</if>
 			<if test="date != null  and date != ''">
-		    	and DUDI_UPLOAD_DATE between substring(#{date,jdbcType=VARCHAR},1,8) and substring(#{date,jdbcType=VARCHAR},9,16)
+		    	and substring(DUDI_CREAT_TIME,1,8) between substring(#{date,jdbcType=VARCHAR},1,8) and substring(#{date,jdbcType=VARCHAR},9,16)
 		   	</if>
 		   	<if test="branchReportTypeList != null">
 				and a.DUDI_REPORT_TYPE_ID in

src/main/webapp/admin/tqtd/reportManageDetailTqtd.html

@@ -152,6 +152,9 @@
 		var data = {reportId : reportId};
 		exportExcel("../../TQTDReportAction/reportInfFujian",data);
 	}
+	function goBack() {
+		deleteTabPageParent(pageId);
+	}
     </script>
 </body>
 

src/main/webapp/admin/xlgzz/reportProduceXlgzz.html

@@ -24,6 +24,7 @@
 		}
 		.desc_label{
 			font-size: 2rem;
+			line-height: 3rem;
 		}
     </style>
 </head>
@@ -54,7 +55,7 @@
 					<div id = "reportTypeDiv" class="layui-inline">
 					</div>
 				</div>
-				<div style="margin-top : 200px;">
+				<div style="margin-top : 200px; margin-bottom: 20px;">
 			      <button type="button" class="layui-btn" style = "width : 214px" onclick = "goStep(2)">下一步</button>
 			    </div>
 			</div>
@@ -80,11 +81,13 @@
 -->		  <div class="layui-tab" lay-filter="demo"  style="min-height: 400px;">
 			<ul class="layui-tab-title">
 				<li class="layui-this" lay-id="11">线路重载明细</li>
+				<li lay-id="11x">线路过载明细</li>
 				<li lay-id="22">公变重载明细</li>
+				<li lay-id="22">公变过载明细</li>
 				<li lay-id="33">抢修类工单报表</li>
-
 			</ul>
 			<div class="layui-tab-content">
+				<!--线路重载-->
 				<div class="layui-tab-item layui-show">
 					<p id ="desc1" class="desc_label"></p>
 					<br>
@@ -92,15 +95,27 @@
 					<br>
 					<p class="desc_label" style="color: #ff0000;">注：线路负载率持续1小时在70%-100%为重载，持续1小时在100%以上为过载。</p>
 					<br>
-					<table id="demo" lay-filter="test"></table>
+					<table id="demo1" lay-filter="test"></table>
+				</div>
+				<!--线路过载-->
+				<div class="layui-tab-item">
+					<table id="demo1x" lay-filter="test"></table>
 				</div>
+				<!--配变重载-->
 				<div class="layui-tab-item">
 					<p id ="desc2"  class="desc_label"></p>
 					<br>
+					<p id ="desc22" class="desc_label"></p>
+					<br>
 					<p  class="desc_label"  style="color: #ff0000;">注：配变负载率连续2小时在80%-100%之间为重载，连续2小时在100%以上为过载。</p>
 					<br>
 					<table id="demo2" lay-filter="test"></table>
 				</div>
+				<!--配变过载-->
+				<div class="layui-tab-item">
+
+					<table id="demo2x" lay-filter="test"></table>
+				</div>
 				<div class="layui-tab-item">
 					<p  id ="desc3"  class="desc_label"></p>
 					<br>
@@ -341,17 +356,10 @@
 		var resJsonStr = null;
 		// 预览
 		function tableYulan() {
-			var data = [];
-			for (var i =0;i<100;i++){
-				data.push({id:i,username:'2',sex:'3',city:'4',sign:'5'});
-			}
-
-
 			var reportInf = $("#reportTypeDiv").find("select option:selected").val();//所选报表类型
 			var dayRange = $("#dayRange").val();//日报-年月日
 			var dateRange = $("#dateRange").val();//周报-年月日-年月日
 			var timeRange = $("#timeRange").val();//日报-时分秒
-			
 			// 日报
 			if (timeType == '00') {
 				if (isEmpty(dayRange)) {
@@ -364,7 +372,6 @@
 					return;
 				}
 			}
-			
 			// 日报
 			var range = null;
 			if (timeType == '00') {
@@ -384,16 +391,16 @@
 					monthNum : monthNum,//无用
 					countNum : countNum//无用
 				},
-				success : function(data) {debugger
+				success : function(data) {
 					if (data.code == 0) {//查询结果集成功
 						// 日报
 						if (timeType == '00') {
 							$("#gongjubiao").hide();
 							$("#reportTable").show();
-							$element.tabDelete('demo', '22');
+							// $element.tabDelete('demo', '22');
 							//渲染表格
 							$table.render({
-								elem: '#demo'
+								elem: '#demo1'
 								,limit:100
 								,cols: [[ //表头
 									{field: 'DFD10_XGSMC', title: '单位', width:120}
@@ -404,11 +411,51 @@
 								]],
 								data:data.data.resList.result
 							});
-
+							$table.render({
+								elem: '#demo1x'
+								,limit:100
+								,cols: [[ //表头
+									{field: 'DFD10_XGSMC', title: '单位', width:120}
+									,{field: 'DFD10_BZMC', title: '供电所', width:120}
+									,{field: 'DFD10_XLMC', title: '线路名称', width:120}
+									,{field: 'sum', title: '过载时长(h)', width:120}
+									,{field: 'avg', title: '平均负载率(%)', width: 120}
+								]],
+								data:data.data.resList.result2
+							});
+							$table.render({
+								elem: '#demo2'
+								,limit:100
+								,cols: [[ //表头
+									{field: 'DFD9_UNIT', title: '单位', width:120}
+									,{field: 'DFD9_BZMC', title: '供电所', width:120}
+									,{field: 'DFD9_GBMC', title: '公变名称', width:120}
+									,{field: 'DFD9_ZZSC', title: '重载时长(h)', width:120}
+									,{field: 'avg', title: '平均负载率(%)', width: 120}
+									,{field: 'DFD9_JTYY', title: '原因', width: 120}
+									,{field: 'DFD9_JTJJCS', title: '解决措施', width: 120}
+								]],
+								data:data.data.resList.result4
+							});
+							$table.render({
+								elem: '#demo2x'
+								,limit:100
+								,cols: [[ //表头
+									{field: 'DFD9_UNIT', title: '单位', width:120}
+									,{field: 'DFD9_BZMC', title: '供电所', width:120}
+									,{field: 'DFD9_GBMC', title: '公变名称', width:120}
+									,{field: 'DFD9_GZSC', title: '过载时长(h)', width:120}
+									,{field: 'avg', title: '平均负载率(%)', width: 120}
+									,{field: 'DFD9_JTYY', title: '原因', width: 120}
+									,{field: 'DFD9_JTJJCS', title: '解决措施', width: 120}
+								]],
+								data:data.data.resList.result3
+							});
+							//描述
 							$("#desc1").html("&nbsp;&nbsp;&nbsp;"+data.data.resList.descStr[0]);
-
 							$("#desc11").html("&nbsp;&nbsp;&nbsp;"+data.data.resList.descStr[1]);
-
+							$("#desc2").html("&nbsp;&nbsp;&nbsp;"+data.data.resList.descStr2[0]);
+							$("#desc22").html("&nbsp;&nbsp;&nbsp;"+data.data.resList.descStr2[1]);
 							goStep(3);
 						// 月报 或 周报
 						} else if (timeType == '02' || timeType == '01') {
@@ -432,24 +479,28 @@
 							elem: '#demo3'
 							,limit:100
 							,cols: [[ //表头
-								{field: 'id', title: '单位\\分类', width:150,rowspan:2}
-								,{field: 'username', title: '客户总量（户）', width:150,rowspan:2}
-								,{field: 'sex', title: '平均到达现场时间（分）', width:150,rowspan:2}
-								,{field: 'city', title: '工单处理平均时长（分）', width:150,rowspan:2}
-								,{field: 'city', title: '到达现场超时数', width:150,rowspan:2}
-								,{field: 'city', title: '工单时长超70分钟数', width:150,rowspan:2}
-								,{field: 'city', title: '故障类型', width:600,colspan:4}
-								,{field: 'city', title: '疑似虚假回单', width:150}
-								,{field: 'city', title: '工单总数', width:150}
-								,{field: 'city', title: '万户报修率', width:150}
+								{field: '1', title: '单位\\分类', width:150,rowspan:2}
+								,{field: '2', title: '客户总量（户）', width:150,rowspan:2}
+								,{field: '3', title: '平均到达现场时间（分）', width:150,rowspan:2}
+								,{field: '4', title: '工单处理平均时长（分）', width:150,rowspan:2}
+								,{field: '5', title: '到达现场超时数', width:150,rowspan:2}
+								,{field: '6', title: '工单时长超70分钟数', width:150,rowspan:2}
+								,{field: '', title: '故障类型',colspan:4}
+								,{field: '8', title: '疑似虚假回单', width:150,rowspan:2}
+								,{field: '9', title: '工单总数', width:150,rowspan:2}
+								,{field: '10', title: '万户报修率', width:150,rowspan:2}
 							],
 								[
-									{field: 'username', title: '客户内部故障', width:150}
-									,{field: 'username', title: '低压故障', width:150}
-									,{field: 'username', title: '非电力故障', width:150}
-									,{field: 'username', title: '电能质量等故障', width:150}
+									{field: '11', title: '客户内部故障', width:150}
+									,{field: '12', title: '低压故障', width:150}
+									,{field: '13', title: '非电力故障', width:150}
+									,{field: '14', title: '电能质量等故障', width:150}
 								]],
-							data:data
+							data:[],
+							done:function(res, curr, count){
+								count || this.elem.next('.layui-table-view').find('.layui-table-header').css('display', 'inline-block');
+								count || this.elem.next('.layui-table-view').find('.layui-table-box').css('overflow-x', 'auto');
+							}
 						});
 			    	} else {
 			    		$.ErrorAlert(res.MINErrorMessage);
@@ -462,5 +513,4 @@
 		}
     </script>
 </body>
-
 </html>