Forráskód Böngészése

Merge remote-tracking branch 'origin/master'

zb 4 éve
szülő
commit
2d515781a7

+ 1 - 1
src/main/webapp/admin/reprotManage/utilExcelDetail.html

@@ -8,7 +8,7 @@
     <script src="../../js/report.js"></script>
 </head>
 <body class="content">
-	<div class="shadow-content" style="margin:1.5rem; text-align: center;">
+	<div class="shadow-content" style="margin:1.5rem; text-align: center;overflow: auto;">
 		<p id = "fileName" style="margin:15px; font-size : 20px"></p>
     	<table id="reportTable" class="layui-table"></table>
 	</div>

+ 1 - 1
src/main/webapp/js/report.js

@@ -171,7 +171,7 @@ function initExcelData(excelList, tableId, isEdit,isType) {
 		html += '<tr>';
 		var excelChildList = excelList[i];
 		for (var j = 0; j < excelChildList.length; j ++) {
-			html += tdHtml + '<div style = "width : 100px;height: 20px;text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">' + (isEmpty(excelChildList[j])?"":excelChildList[j]) + '</div></td>';
+			html += tdHtml + '<div style = "width : auto;height: 20px;text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">' + (isEmpty(excelChildList[j])?"":excelChildList[j]) + '</div></td>';
 		}
 		html += '</tr>';
 	}