Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
===================================================================
diff -u -r34933 -r34945
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 34933)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 34945)
@@ -1107,6 +1107,9 @@
function openCaspSterilizerRecordLineChart(id, sterilizerName) {
openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/caspSterilizerRecordLineChart.jsp?sterilizationRecordId=' + id + '&sterilizerName=' + encodeURI(sterilizerName), '', '灭菌炉运行参数', '1050', '550');
}
+function openPS100GXPSterilizerRecordLineChart(id, sterilizerName) {
+ openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/ps100GXPSterilizerRecordLineChart.jsp?sterilizationRecordId=' + id + '&sterilizerName=' + encodeURI(sterilizerName), '', '灭菌炉运行参数', '1050', '550');
+}
function openSenohSterilizerRecordLineChart(id, sterilizerName) {
openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/senohSterilizerRecordLineChart.jsp?sterilizationRecordId=' + id + '&sterilizerName=' + encodeURI(sterilizerName), '', '灭菌炉运行参数', '1050', '550');
}
@@ -1206,6 +1209,7 @@
{
header: "灭菌器参数", width: 70, dataIndex: 'sterilizerRecordAmount', sortable: false, renderer: function (v, p, record) {
var buttonGroup = "";
+ console.log(record.data.sterilizationParaType)
if (record.data.sterilizerRecordAmount > 0) {
buttonGroup += "![](\"")
";
} else if (record.data.sterilizationParaType == 1) {
@@ -1220,6 +1224,8 @@
buttonGroup += "";
}else if(record.data.sterilizationParaType == 6){
buttonGroup += "";
+ }else if(record.data.sterilizationParaType == 7){
+ buttonGroup += "";
}else {
buttonGroup += "";
}
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/ps100GXPSterilizerRecordLineChart.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/ps100GXPSterilizerRecordLineChart.jsp (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/ps100GXPSterilizerRecordLineChart.jsp (revision 34945)
@@ -0,0 +1,299 @@
+<%@ 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" %>
+
+
+
+
+
+ 灭菌炉运行参数
+
+
+
+ <%-- --%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | 阶段名称 |
+ 时间 |
+ 温度 |
+ 压力 |
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
\ No newline at end of file