Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
===================================================================
diff -u -r29628 -r29631
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 29628)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 29631)
@@ -841,21 +841,8 @@
function openHighSterilizerRecordLineChart(id,sterilizationUser){
openModalWindowForExt(WWWROOT+'/disinfectsystem/sterilizationmanager/sterilizerRecord/highSterilizerLineChart.jsp?sterilizationRecordId='+id,'', '灭菌器参数', '1050', '600');
}
-function openLowTempForJohnsonSterilizerRecordLineChart(id,sterilizationUser){
- Ext.Ajax.request({
- url :WWWROOT+'/disinfectSystem/sterilization/sterilizerRecordLineChartAction!selectLowTempForJohnsonSterilizerRecordData.do',
- params : {
- sterilizationRecordId : id
- },
- success : function(response, options) {
- var result = Ext.decode(response.responseText);
- openLowTempForJohnsonSterilizerPara(result.data);
- },
- failure : function(response, options) {
- var result = Ext.decode(response.responseText);
- showResult(result.message);
- }
- });
+function openLowTempForJohnsonSterilizerRecordLineChart(id,sterilizerName){
+ openModalWindowForExt(WWWROOT+'/disinfectsystem/sterilizationmanager/sterilizerRecord/LowTempForJohnsonSterilizerLineChart.jsp?sterilizationRecordId='+id+'&sterilizerName='+encodeURI(sterilizerName),'', '灭菌炉运行参数', '1050', '550');
}
function renderBiologicalMonitoringStatus(v, p, record) {
if (v == '进行中') {
@@ -917,9 +904,9 @@
}else if(record.data.sterilizationParaType == 2){
return "";
}else if(record.data.sterilizationParaType == 3){
- return "
";
+ return "
";
}else{
- return null;
+ return null;
}
}},
{header : "打印状态",width : 70,dataIndex : 'printStatus',hidden : !printConfig.sterilizationRecordDetail},
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/LowTempForJohnsonSterilizerLineChart.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/LowTempForJohnsonSterilizerLineChart.jsp (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/LowTempForJohnsonSterilizerLineChart.jsp (revision 29631)
@@ -0,0 +1,204 @@
+<%@ 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" %>
+
+
+
+ |