功能优化

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

@@ -1092,7 +1092,7 @@ public class DataWareManageAction implements IMINAction {
         	example.createCriteria().andFileIdEqualTo(fileId);
         	List<DwFileDetail01> selectByExample = db.getMybatisMapper(DwFileDetail01Mapper.class).selectByExample(example);
         	ExportExcelUtil<DwFileDetail01> util = new ExportExcelUtil<DwFileDetail01>();
-        	String[] header = {"系统编号","ID","TNAME","CMODE","VALUE","facname","type","fdid","yxstatus","tytime","所属文件id"};
+        	String[] header = {"系统编号","编号","名称","台区名称","数据日期","单位","供电所名称","终端名称","终端编号","时间","所属文件id"};
         	util.exportExcel("终端投退运数据", selectByExample, os, "2007", header);
         } else if (Constant.FILE_DETAIL_TYPE_02.equals(type)) {
         	response.setContentType("application/application/vnd.ms-excel");

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

@@ -35,6 +35,7 @@
 			reportId : reportId
 		},
 		success : function(data) {
+		    console.log("reportDataJsonStr:"+data)
 			var reportDataJsonStr = data.data.data;
 			var excelList = eval('(' + reportDataJsonStr + ')');
 			reportTable(excelList, typeId,true);

src/main/webapp/admin/roleManage/roleAdd.html

@@ -55,7 +55,10 @@
       <script src="../../js/min-loader-next.js"></script>
     <!-- 注意：如果你直接复制所有代码到本地，上述js路径需要改成你本地的 -->
     <script>
-    var tabPageId = getQueryString("tabPageId");
+    	var tabPageId = getQueryString("tabPageId");
+    	if(!tabPageId){
+    		tabPageId = "110000";
+		}
    		function testNewPage() {
 			// 打开新增页面
 			deleteTabPage(tabPageId);

src/main/webapp/admin/roleManage/roleManage.html

@@ -87,13 +87,13 @@
 		    ,done: function(res, curr, count){
 		        //如果是异步请求数据方式，res即为你接口返回的信息。
 		        //如果是直接赋值的方式，res即为：{data: [], count: 99} data为当前页数据、count为数据总长度
-		        console.log(res);
-		        
-		        //得到当前页码
-		        console.log(curr); 
-		        
-		        //得到数据总量
-		        console.log(count);
+		        // console.log(res);
+		        //
+		        // //得到当前页码
+		        // console.log(curr);
+		        //
+		        // //得到数据总量
+		        // console.log(count);
 		      }
 		    ,even: true //开启隔行背景
 		  });

src/main/webapp/js/report.js

@@ -24,11 +24,11 @@ function reportTable(excelList, typeId, isEdit,isType) {
 		var excelChildList = excelList[i];
 		for (var j = 0; j < excelChildList.length; j ++) {
 			if (isEdit) {
-				editHtml = '<td style = "width : 100px;height: 20px;text-overflow: ellipsis;white-space: nowrap;overflow: hidden;" contenteditable = "true" onblur = "reportChange(this, ' + typeId + ',' + i + ', '+ j + ')">';
+				editHtml = '<td style = "width : auto;height: 20px;text-overflow: ellipsis;white-space: nowrap;overflow: hidden;" contenteditable = "true" onblur = "reportChange(this, ' + typeId + ',' + i + ', '+ j + ')">';
 			} else {
 				editHtml = '<td>';
 			}
-			html += editHtml + '<div style = "width : 100px;height: 20px;text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">' + (isEmpty(excelChildList[j])?'':excelChildList[j]) + '</div></td>';
+			html += editHtml + '<div style = "width : auto;height: 20px;text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">' + (isEmpty(excelChildList[j])?'':excelChildList[j]) + '</div></td>';
 		}
 		html += '</tr>';
 	}