Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp =================================================================== diff -u -r41479 -r41483 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp (.../washDataLineChart.jsp) (revision 41479) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp (.../washDataLineChart.jsp) (revision 41483) @@ -245,8 +245,6 @@ html += ''; document.getElementById("div2").innerHTML = html; document.getElementById("div2").style.display = "block"; - document.getElementById("div3").innerHTML = html; - document.getElementById("div3").style.display = "block"; } } }); @@ -308,9 +306,15 @@ var yLabelName = '温度'; var createChartUrl = WWWROOT + '/disinfectSystem/washData/washDataLineChartAction!createChart.do?washAndDisinfectRecordId=' + washAndDisinfectRecordId + '&washDataRecordId=' + washDataRecordId + '&time=' + new Date().getTime(); + var dom; + if (deviceBrand !== 'Belimed') { + dom = document.getElementById("div1"); + }else { + dom = document.getElementById("div3"); + } gs.push( new Dygraph( - document.getElementById("div1"), createChartUrl, { + dom, createChartUrl, { rollPeriod: 7, ylabel: yLabelName, //showRoller: true, // note trailing comma @@ -391,7 +395,7 @@
-| @@ -407,7 +411,7 @@ |
| - + |