Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js =================================================================== diff -u -r30825 -r30855 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js (.../qualityMonitoringView.js) (revision 30825) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js (.../qualityMonitoringView.js) (revision 30855) @@ -87,12 +87,25 @@ var columnWidthMap = dynamicColumn.columnWidthMap; for (var item in columnNameMap) { tableHeader1.push(item); - var len = columnNameMap[item].length; - var width = columnWidthMap[item]; - if (width == 0 || !width) { - width = columnWidth; + if (columnNameMap[item]) { + var arr = columnNameMap[item]; + for (var j = 0; j < arr.length; j++) { + var width = columnWidth; + if (columnWidthMap[item] && columnWidthMap[item] > 0) { + width = columnWidthMap[item]; + } + if (arr[j] == "灭菌时间") { + width = 80 + } else if (arr[j] == "灭菌员") { + width = 55 + } else if (arr[j] == "灭菌批号") { + width = 125 + } else if (arr[j] == "当次炉次灭菌总包数") { + width = 115 + } + widthSum += width; + } } - widthSum += len * width; } var fixedColumnIndex = 0; if (tableHeader.indexOf('日期') >= 0) { @@ -169,6 +182,15 @@ if (columnWidthMap[item] && columnWidthMap[item] > 0) { width = columnWidthMap[item]; } + if (arr[j] == "灭菌时间") { + width = 80 + } else if (arr[j] == "灭菌员") { + width = 55 + } else if (arr[j] == "灭菌批号") { + width = 125 + } else if (arr[j] == "当次炉次灭菌总包数") { + width = 115 + } tableHtml += "" + arr[j] + ""; } } @@ -234,7 +256,7 @@ continue } } - tdHtml += "" + answer + ""; + tdHtml += "" + answer + ""; } } trHtml = tdHtml; @@ -318,7 +340,7 @@ continue } } - tdHtml += "" + answer + ""; + tdHtml += "" + answer + ""; } } trHtml = tdHtml;