Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChart.jsp =================================================================== diff -u -r34030 -r34033 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChart.jsp (.../sterilizerLineChart.jsp) (revision 34030) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChart.jsp (.../sterilizerLineChart.jsp) (revision 34033) @@ -27,14 +27,7 @@ SterilizationRecordTableManager.getSterilizationRecord(sterilizationRecordId,function(result){ var json = JSON.parse(result); var deviceBrand = json.deviceBrand; - if(deviceBrand !== 'Getinge'){ - document.getElementById("div2").style.display = 'none'; - document.getElementById("div1").style.width = "1020px"; - $('.sterilizer_msg').css('margin-left','20px'); - initLoad(); - }else { - initLoad(); - } + initLoad(deviceBrand); var procStartTime = json[0].procStartTime; //开始时间 document.getElementById('sterilizationType').value = json[0].sterilizationType; //灭菌程序 document.getElementById('frequency').value = json[0].frequency; //炉次 @@ -106,11 +99,18 @@ var WWWROOT = '${pageContext.request.contextPath}'; var sterilizationRecordId = '${param.sterilizationRecordId}'; var myChart; -function initLoad(){ +function initLoad(deviceBrand){ //如果未开启打印灭菌温度压力曲线图时,则隐藏打印 if(sstsConfig.printSterileTPLineData){ document.getElementById("printButton").style.display = "inline-block"; } + if(deviceBrand !== 'Getinge'){ + document.getElementById("div2").style.display = 'none'; + document.getElementById("div1").style.width = "1020px"; + if($('.sterilizer_msg')){ + $('.sterilizer_msg').css('margin-left','20px'); + } + } myChart = echarts.init(document.getElementById('sterilizerLineChart')); var option; var addLline = false;