Index: ssts-web/src/main/webapp/disinfectsystem/report/cssdWorkloadCountByDate/cssdWorkloadMainReportPage.jsp =================================================================== diff -u -r33203 -r33205 --- ssts-web/src/main/webapp/disinfectsystem/report/cssdWorkloadCountByDate/cssdWorkloadMainReportPage.jsp (.../cssdWorkloadMainReportPage.jsp) (revision 33203) +++ ssts-web/src/main/webapp/disinfectsystem/report/cssdWorkloadCountByDate/cssdWorkloadMainReportPage.jsp (.../cssdWorkloadMainReportPage.jsp) (revision 33205) @@ -33,6 +33,7 @@
Index: ssts-web/src/main/webapp/disinfectsystem/report/cssdWorkloadCountByDate/cssdWorkloadMainReportPage.js =================================================================== diff -u -r33203 -r33205 --- ssts-web/src/main/webapp/disinfectsystem/report/cssdWorkloadCountByDate/cssdWorkloadMainReportPage.js (.../cssdWorkloadMainReportPage.js) (revision 33203) +++ ssts-web/src/main/webapp/disinfectsystem/report/cssdWorkloadCountByDate/cssdWorkloadMainReportPage.js (.../cssdWorkloadMainReportPage.js) (revision 33205) @@ -70,7 +70,7 @@ for (var i = 0; i < gridColumns.length; i++) { var gridColumnData = gridColumns[i]; //除了日期外的都需要显示在图表上 - if (gridColumnData["field"] != '<%=ReportConstant.CSSD_WORKLOAD_REPORTDATE[0] %>') { + if (gridColumnData["field"] != CSSD_WORKLOAD_REPORTDATE) { quotaNameArray.push(gridColumnData["title"]); //各个指标 var quotaSeriesData = { name: gridColumnData["title"], field: gridColumnData["field"], type: "bar", data: [] }; @@ -81,9 +81,9 @@ //以下为y轴即相应的指标 for (var i = 0; i < data.rows.length; i++) { var dataRow = data.rows[i]; - xAxisDataArray.push(dataRow["<%=ReportConstant.CSSD_WORKLOAD_REPORTDATE[0] %>"]); + xAxisDataArray.push(dataRow[CSSD_WORKLOAD_REPORTDATE]); for (var prop in dataRow) { - if (prop != "<%=ReportConstant.CSSD_WORKLOAD_REPORTDATE[0] %>") { + if (prop != CSSD_WORKLOAD_REPORTDATE) { for (var j = 0; j < quotaSeriesDataArray.length; j++) { var quotaSeriesData = quotaSeriesDataArray[j]; if (quotaSeriesData.field == prop) {