Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType4.jsp =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType4.jsp (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType4.jsp (revision 30380) @@ -0,0 +1,403 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ page import="com.forgon.tools.SpringBeanManger,org.jfree.data.general.DefaultPieDataset,org.jfree.chart.ChartFactory,org.jfree.chart.JFreeChart,org.jfree.chart.servlet.*,com.forgon.disinfectsystem.sterilizationmanager.sterilizerrecord.action.SterilizerRecordLineChartAction" %> +<%@ page import="com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + + + + + + 灭菌炉运行参数 + + + + <%-- --%> + + + + + + + + + + + + +

+ + + + + +

+ + +

+ 开始时间: + +

+ 结束时间: + +

+ 灭菌员: + +

+ 程序名称: + +

+ 机器号: + +

+ 循环次数: + +

+ 负脉冲: + +

+ 正脉冲: + +

+ 灭菌温度: + +

+ 灭菌时间: + +

+ 干燥时间: + +

+ DRYING STEAMPULS: + +

+ DRYING AIRPULS: + +

+ + +

+ 干燥最低温度: + +

+ 干燥最高温度: + +

+ + + + + + +

+ + \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/lowTempForJohnsonSterilizerLineChart.jsp =================================================================== diff -u -r30379 -r30380 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/lowTempForJohnsonSterilizerLineChart.jsp (.../lowTempForJohnsonSterilizerLineChart.jsp) (revision 30379) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/lowTempForJohnsonSterilizerLineChart.jsp (.../lowTempForJohnsonSterilizerLineChart.jsp) (revision 30380) @@ -24,215 +24,31 @@ var sterilizerName = '${param.sterilizerName}'; sterilizerName = decodeURI(sterilizerName); //灭菌状态：灭菌中 - var myChart; var statusBegin = '<%=SterilizationRecord.STERILIZATION_STATUS_BEGIN%>'; function getSterilizationRecord(){ - myChart = echarts.init(document.getElementById('sterilizerLineChart')); - var option; jQuery.ajax({ type:'post', - url:WWWROOT + '/disinfectSystem/sterilization/sterilizerRecordLineChartAction!creatOneOfGetingeSterilizerRecordEChartData.do?sterilizationRecordId='+sterilizationRecordId, + url:WWWROOT + '/disinfectSystem/sterilization/sterilizerRecordLineChartAction!selectLowTempForJohnsonSterilizerRecordData.do?sterilizationRecordId='+sterilizationRecordId, dataType:'json', success:function(result){ var success = result.success; var data = result.data; document.getElementById('cycleCounter').value = data.cycleCounter || ''; document.getElementById('sterilizationUser').value = data.sterilizationUser || ''; + document.getElementById('totalCycleCounter').value = data.totalCycleCounter || ''; document.getElementById('programName').value = data.programName || ''; document.getElementById('startDate').value = data.startDate || ''; + document.getElementById('Vacuum').value = data.Vacuum || ''; + document.getElementById('Injection1').value = data.Injection1 || ''; + document.getElementById('Diffusion1').value = data.Diffusion1 || ''; + document.getElementById('Plasma1').value = data.Plasma1 || ''; + document.getElementById('Injection2').value = data.Injection2 || ''; + document.getElementById('Diffusion2').value = data.Diffusion2 || ''; + document.getElementById('Plasma2').value = data.Plasma2 || ''; document.getElementById('endDate').value = data.endDate || ''; - document.getElementById('cycleCounter').value = data.cycleCounter || ''; - document.getElementById('negPulse').value = data.negPulse || ''; - document.getElementById('posPulse').value = data.posPulse || ''; - document.getElementById('sterilizingTemp').value = data.sterilizingTemp || ''; - document.getElementById('sterilizingTime').value = data.sterilizingTime || ''; - document.getElementById('dryingTime').value = data.dryingTime || ''; - document.getElementById('dryingSteampuls').value = data.dryingSteampuls || ''; - document.getElementById('dryingAirpuls').value = data.dryingAirpuls || ''; - document.getElementById('highestTemp').value = data.highestTemp || ''; - document.getElementById('lowestTemp').value = data.lowestTemp || ''; - document.getElementById('machineNumber').value = data.machineNumber || ''; - - //腔体压力 - var chamberPressureArr = data.chamberPressureArr; - //监测腔体压力 - var schamberPressArr = data.schamberPressArr; - //排放口温度 - var drainTempArr = data.drainTempArr; - //监测排放口温度 - var sdrainTempArr = data.sdrainTempArr; - //夹套温度 - var jacketTempArr = data.jacketTempArr; - //时间 - var timeData = data.timeArr; - option= { - tooltip: { - trigger: 'axis' - }, - color:['#eb4310','#fbb417','#3f9337','#003366','#a1488e'], - legend: { - left:"8%", - data: ['腔体压力','监测腔体压力',"排放口温度","监测排放口温度","夹套温度"] - }, - xAxis: [{ - type: 'category', - name:"时间/时分", - nameLocation:"middle", - position:"bottom", - nameGap:30, - data:timeData, - splitLine: { - show: false - }, - axisLine:{ - onZero:false - }, - axisTick:{ - alignWithLabel:true - }, - /* axisLabel:{ - interval: 20 - }, */ - boundaryGap:false - //minInterval:5 - }], - yAxis: [{ - //chamberPressureArr - type: 'value', - name: '温度(°C)', - axisLabel: { - formatter: '{value}' - }, - splitLine: { - show: false - }, - yAxisIndex: 1//双轴参数 - },{ - //schamberPressArr - type: 'value', - name: '', - axisLabel: { - formatter: '{value}' - }, - splitLine: { - show: false - }, - yAxisIndex: 1//双轴参数 - },{ - //drainTempArr - type: 'value', - name: '压力(Kpa)', - max: 140, - interval: 10,//间隔值 - axisLabel: { - formatter: '{value}' - }, - splitLine: { - show: false - }, - yAxisIndex: 1//双轴参数 - },{ - //sdrainTempArr - type: 'value', - name: '', - max: 140, - interval: 10,//间隔值 - axisLabel: { - formatter: '{value}' - }, - splitLine: { - show: false - }, - yAxisIndex: 1//双轴参数 - },{ - //jacketTempArr - type: 'value', - name: '', - max: 140, - interval: 10,//间隔值 - axisLabel: { - formatter: '{value}' - }, - splitLine: { - show: false - }, - yAxisIndex: 1//双轴参数 - }], - series: [{ - name: '腔体压力', - type: 'line', - symbol: "none", - itemStyle : { - normal : { - lineStyle:{ - color:'#eb4310' - } - } - }, - stack:'腔体压力', - yAxisIndex: 1,//双轴参数 - data: chamberPressureArr - }, - { - name: '监测腔体压力', - type: 'line', - symbol: "none", - itemStyle : { - normal : { - lineStyle:{ - color:'#fbb417' - } - } - }, - stack:'监测腔体压力', - yAxisIndex: 1,//双轴参数 - data: schamberPressArr - }, - { - name: '排放口温度', - type: 'line', - symbol: "none", - itemStyle : { - normal : { - lineStyle:{ - color:'#3f9337' - } - } - }, - stack:'排放口温度', - data: drainTempArr - }, - { - name: '监测排放口温度', - type: 'line', - symbol: "none", - itemStyle : { - normal : { - lineStyle:{ - color:'#003366' - } - } - }, - stack:'监测排放口温度', - data: sdrainTempArr - }, - { - name: '夹套温度', - type: 'line', - symbol: "none", - itemStyle : { - normal : { - lineStyle:{ - color:'#a1488e' - } - } - }, - stack:'夹套温度', - data: jacketTempArr - } - ]} - - myChart.setOption(option); + document.getElementById('stageTotalTime').value = data.stageTotalTime || ''; + document.getElementById('monitorUser').value = data.monitorUser || ''; + document.getElementById('biologyResult').value = data.biologyResult || ''; }, error:function(){ @@ -328,76 +144,75 @@

- 开始时间: - + 灭菌炉次: +

- 结束时间: - -

灭菌员:

+ 灭菌总炉次: + +

程序名称:

- 机器号: - + 开始时间: +

- 循环次数: - +

+ 真空期: +

- 负脉冲: - +

+ 注射期1: +

- 正脉冲: - +

+ 扩散期1: +

- 灭菌温度: - +

+ 等离子期1: +

- 灭菌时间: - + 注射期2: +

- 干燥时间: - +

+ 扩散期2: +

- DRYING STEAMPULS: - + 等离子期2: +

- DRYING AIRPULS: - +

+ 结束时间: +

- - + 灭菌总时间: +

- 干燥最低温度: - +

+ 监测员: +

- 干燥最高温度: - + 生物监测结果: +

- -

+ \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js =================================================================== diff -u -r30320 -r30380 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 30320) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 30380) @@ -858,6 +858,9 @@ function openLowTempForJohnsonSterilizerRecordLineChart(id, sterilizerName) { openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowTempForJohnsonSterilizerLineChart.jsp?sterilizationRecordId=' + id + '&sterilizerName=' + encodeURI(sterilizerName), '', '灭菌炉运行参数', '1050', '550'); } +function openLowSterilizerLineChartSterilizationParaType4(id, sterilizerName){ + openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType4.jsp?sterilizationRecordId=' + id + '&sterilizerName=' + encodeURI(sterilizerName), '', '灭菌炉运行参数', '1050', '550'); +} function renderBiologicalMonitoringStatus(v, p, record) { if (v == '进行中') { return "

" + v + ""; @@ -946,6 +949,8 @@ return ""; } else if (record.data.sterilizationParaType == 3) { return ""; + }else if (record.data.sterilizationParaType == 4) { + return ""; } else { return null; }

+ + 打印 +

+ + +