Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChart.jsp =================================================================== diff -u -r26764 -r27020 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChart.jsp (.../sterilizerLineChart.jsp) (revision 26764) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChart.jsp (.../sterilizerLineChart.jsp) (revision 27020) @@ -92,7 +92,7 @@ myChart = echarts.init(document.getElementById('sterilizerLineChart')); var option; var addLline = false; - $.ajax({ + jQuery.ajax({ url :WWWROOT+"/disinfectSystem/sterilization/sterilizerRecordLineChartAction!createEChartData.do?sterilizationRecordId=${param.sterilizationRecordId}&time="+new Date(), type: 'post', dataType:'JSON', @@ -113,7 +113,7 @@ color:['#00CD66','#CD2990'], legend: { left:"8%", - data: ['温度','压力',"","",""], + data: ['温度','压力',"","",""] }, xAxis: [{ @@ -145,7 +145,7 @@ /* axisLabel:{ interval: 20 }, */ - boundaryGap:false, + boundaryGap:false //minInterval:5 }], yAxis: [ @@ -157,7 +157,7 @@ //minInterval:10, interval: 10,//间隔值 axisLabel: { - formatter: '{value}', + formatter: '{value}' }, splitLine: { show: false @@ -174,7 +174,7 @@ splitLine: { show: false }, - yAxisIndex: 1,//双轴参数 + yAxisIndex: 1//双轴参数 /* axisLabel: {//除以1000 formatter: function (value,index) {//截取分钟 var pressureDatas = value/1000; @@ -205,7 +205,7 @@ silent:false, lineStyle:{ type:"solid", - color:"#00CD66", + color:"#00CD66" }, yAxis: 134 }] @@ -223,7 +223,7 @@ } }, yAxisIndex: 1,//双轴参数 - data: pressure,//[-0.9,-1,-1.2,2.5,0,0.5,1.6,-0.8,-0.6,1.8,1.9,2.8], + data: pressure//[-0.9,-1,-1.2,2.5,0,0.5,1.6,-0.8,-0.6,1.8,1.9,2.8], //markLine:{//参考线 /* symbol:"none",//去掉警戒线最后面的箭头 label:{ @@ -260,14 +260,14 @@ silent:false, //鼠标悬停事件 true没有,false有 lineStyle:{ //警戒线的样式 ,虚实 颜色 type:"solid", - color:"#CD2990", + color:"#CD2990" }, yAxis:0// 警戒线的标注值,可以有多个yAxis,多条警示线 或者采用 {type : 'average', name: '平均值'},type值有 max min average,分为最大,最小,平均值 },{ silent:false, lineStyle:{ type:"solid", - color:"#CD2990", + color:"#CD2990" }, yAxis: -85 }] @@ -285,8 +285,8 @@ } if(sstsConfig.sterilizerLineChartIsShowTable){ - $("#sterilizerLineChartTable").show(); - $.ajax({ + jQuery("#sterilizerLineChartTable").show(); + jQuery.ajax({ type:'post', url:WWWROOT + '/disinfectSystem/sterilization/sterilizerRecordLineChartAction!getChartDataBySterilizationRecordId.do?sterilizationRecordId=${param.sterilizationRecordId}&time='+new Date(), dataType:'json', @@ -312,7 +312,7 @@ } } dataTableHtml += ""; - $("#sterilizerLineChartTable").append(dataTableHtml); + jQuery("#sterilizerLineChartTable").append(dataTableHtml); } }else{ alert(result.message); @@ -330,7 +330,7 @@ function pintReport(){ //window.print();return;//用这一句要去掉print.js的引用 //请求后台接口查询数据 - $.ajax({ + jQuery.ajax({ type:'post', url:WWWROOT + '/disinfectSystem/sterilization/sterilizerRecordLineChartAction!getChartDataBySterilizationRecordId.do?sterilizationRecordId=${param.sterilizationRecordId}&time='+new Date(), dataType:'json',