Index: ssts-web/src/main/webapp/js/commonUtils.js =================================================================== diff -u -r40949 -r40959 --- ssts-web/src/main/webapp/js/commonUtils.js (.../commonUtils.js) (revision 40949) +++ ssts-web/src/main/webapp/js/commonUtils.js (.../commonUtils.js) (revision 40959) @@ -27,48 +27,6 @@ } } -//FSEYEQ-26：获取pdf文件（清洗机和灭菌通用） -function getPDFFileUtil(params) { - var title = ''; - if (params.washAndDisinfectRecordId) { - title = '清洗参数'; - } else if (params.sterilizationRecordId) { - title = '灭菌炉运行参数'; - } - Ext.Ajax.request({ - url: WWWROOT + '/disinfectSystem/washData/washDataLineChartAction!getPDFFile.do', - params: params, - success: function (result) { - var resultStr = Ext.decode(result.responseText); - if (resultStr.success && resultStr.data) { - var url = 'data:application/pdf;base64,' + resultStr.data; - if (params.doc) { - params.doc.src = url; - } else { - var win = new top.Ext.Window({ - title: title, - width: 850, - height: 640, - autoScroll: false, - isTopContainer: true, - modal: true, - resizable: false, - buttonAlign: 'center', - items: [{ - xtype: "panel", - id: "index", - html: "" - }] - }) - win.show() - } - } else { - showResult('获取不到pdf文件！'); - } - } - }) -} - //ZSRY-60：form表单显示在iframe（可以通用） function getFormByIframeUtil(params) { var title = params.title; @@ -100,4 +58,82 @@ } }) win.show() +} + +//FSEYEQ-26：显示清洗机数据图形（通用） +function getWashDataLineCharByIframeUtil(id, deviceModel, isPrint) { + var url = WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfCommon.jsp?washAndDisinfectRecordId=' + id + '&deviceModel=' + deviceModel; + var win = new top.Ext.Window({ + title: '清洗参数', + id: 'extWindow' + id, + width: 850, + height: 640, + autoScroll: false, + isTopContainer: true, + modal: true, + resizable: false, + buttonAlign: 'center', + items: [{ + xtype: "panel", + id: "index", + html: "" + }], + buttons: [{ + text: '打印', + id: 'print', + hidden: true, + handler: function () { + top.document.getElementById('thisIframe').contentWindow.document.getElementById('print').click(); + } + }, { + text: '关闭', + id: 'close', + handler: function () { + win.close(); + } + }] + }) + win.show() + if (isPrint) { + top.Ext.getCmp('print').show(); + } +} + +//FSEYEQ-26：显示灭菌数据图形（通用） +function getSterilizerDataLineCharByIframeUtil(id, sterilizationParaType, isPrint) { + var url = WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChartOfCommon.jsp?sterilizationRecordId=' + id + '&sterilizationParaType=' + sterilizationParaType; + var win = new top.Ext.Window({ + title: '灭菌参数', + id: 'extWindow' + id, + width: 1050, + height: 700, + autoScroll: false, + isTopContainer: true, + modal: true, + resizable: false, + buttonAlign: 'center', + items: [{ + xtype: "panel", + id: "index", + html: "" + }], + buttons: [{ + text: '打印', + id: 'print', + hidden: true, + handler: function () { + top.document.getElementById('thisIframe').contentWindow.document.getElementById('print').click(); + } + }, { + text: '关闭', + id: 'close', + handler: function () { + win.close(); + } + }] + }) + win.show() + if (isPrint) { + top.Ext.getCmp('print').show(); + } } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChartOfCommon.jsp =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChartOfCommon.jsp (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChartOfCommon.jsp (revision 40959) @@ -0,0 +1,80 @@ +<%@ 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"%> +<%@ include file="/common/taglibs.jsp"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + + + + + + 灭菌炉运行参数 + + + + + + + + + +
+
+

灭菌炉运行参数

+
+
+
+
+
+
+
+ + + + \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js =================================================================== diff -u -r40925 -r40959 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 40925) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 40959) @@ -138,30 +138,23 @@ openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.jsp?washAndDisinfectRecordId=' + id + '&deviceModel=' + deviceModel, '', '清洗参数', '800', '600'); } } else if (data.deviceBrand == xinHua) { - if (sstsConfig.washDataLineChartType == 1) { - if (data.deviceModel == changlong_DC_4) { - openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHuaChangLong.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); - } else if (data.deviceModel == XINHUA_PDF_CLEAN_H101513 || data.deviceModel == XINHUA_PDF_SUPER6000) { - //FSEYEQ-26：获取新华pdf文件 - var params = { - washAndDisinfectRecordId: id - } - getPDFFileUtil(params); - } else { - openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHua.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); - } + if (data.deviceModel == XINHUA_PDF_SUPER6000) { + //FSEYEQ-26：super6000(清洗机型号) + getWashDataLineCharByIframeUtil(id, data.deviceModel); } else { - if (data.deviceModel == changlong_DC_5) { - openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHua_ChangLong.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); - } else if (data.deviceModel == XINHUA_PDF_CLEAN_H101513 || data.deviceModel == XINHUA_PDF_SUPER6000) { - //FSEYEQ-26：获取新华pdf文件 - var params = { - washAndDisinfectRecordId: id + if (sstsConfig.washDataLineChartType == 1) { + if (data.deviceModel == changlong_DC_4) { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHuaChangLong.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } else { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHua.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); } - getPDFFileUtil(params); } else { - // ZJJSRM-6新华清洗机(负压清洗机和单舱清洗机（super6000）清洗参数显示) - openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHuaOfZJJSRM.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + if (data.deviceModel == changlong_DC_5) { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHua_ChangLong.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } else { + // ZJJSRM-6新华清洗机(负压清洗机和单舱清洗机（super6000）清洗参数显示) + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHuaOfZJJSRM.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } } } } else if (data.deviceBrand == GETINGE) { @@ -190,10 +183,12 @@ } else if (data.deviceBrand == 'Belimed') { //NFYY-98：查看pdf文件 if (data.deviceModel == 'WD290') { - var params = { - washAndDisinfectRecordId: id + //暂时不支持IE + if (isIE()) { + showResult('IE浏览器不支持预览pdf文件，请切换谷歌浏览器！'); + } else { + openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/showFileForPDF.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '1050', '700'); } - getPDFFileUtil(params); } else { openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id + '&deviceBrand=Belimed', '', '清洗参数', '800', '600'); } @@ -361,7 +356,7 @@ { header: "清洗参数", dataIndex: 'washDataAmount', sortable: false, renderer: function (v, p, record) { var buttonGroup = ""; - if (record.data.washDataAmount > 0) { + if (record.data.washDataAmount > 0 || record.data.washDataType > 0) { buttonGroup += ""; } if (record.data.hasPicture) { @@ -420,6 +415,7 @@ { name: 'endDate' }, { name: 'washingMode' }, { name: 'washDataAmount' }, + { name: 'washDataType' }, { name: 'washMaterialAmount' }, { name: 'washStatus' }, { name: 'hasPicture' } Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChartOfCommon.js =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChartOfCommon.js (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChartOfCommon.js (revision 40959) @@ -0,0 +1,202 @@ +$(function () { + initLoad(); +}) + +//打印 +function printAll() { + window.print(); +} + +function initLoad() { + jQuery.ajax({ + url: WWWROOT + "/disinfectSystem/sterilization/sterilizerRecordLineChartAction!createEChartData.do", + type: 'post', + dataType: 'JSON', + data: { + sterilizationRecordId: sterilizationRecordId, + washDataRecordId:washDataRecordId, + time: new Date().getTime() + }, + success: function (result) { + if (result.success) { + if (result.data.keyValues) { + renderSterilizerData(result.data.keyValues) + } + if (sterilizationParaType == STERILIZATIONPARATYPE_XINHUA_PDF) { + creatLineChart(result); + } + } + } + }) +} + +/** + * 加载灭菌信息 + * @param {*} data + */ +function renderSterilizerData(data) { + var html = ''; + for (var item in data) { + html += '
' + '' + item + '' + data[item] + '
' + } + jQuery('#table').html(html); +} + +//FSEYEQ-26: Clean H101513(灭菌器型号) +function creatLineChart(result) { + //室内温度 + var innerTemperatureArray = result.data.innerTemperatureArray; + //夹层温度 + var interlayerTemperatureArray = result.data.interlayerTemperatureArray; + //室内压力 + var innerPressureArray = result.data.innerPressureArray; + //夹层压力 + var interlayerPressureArray = result.data.interlayerPressureArray; + //时间 + var timeArr = result.data.timeData; + var colors = ['#5470C6', '#91CC75', '#FA8072', '#FFA500']; + var stageNameArray = result.data.stageNameArray; + var xAxis2 = []; + var stageName = []; + for (var i = 0; i < stageNameArray.length; i++) { + if (!stageName[stageNameArray[i]]) { + stageName[stageNameArray[i]] = i; + if (i !== 1) { + xAxis2.push({ + xAxis: i + }) + } + } + } + var option = { + tooltip: { + trigger: 'axis' + }, + color: colors, + legend: { + left: "8%", + top: '10%', + data: ['室内温度', '夹层温度', '室内压力', '夹层压力'] + }, + xAxis: [{ + type: 'category', + name: "时间/时分秒", + nameLocation: "middle", + position: "bottom", + nameGap: 30, + data: timeArr, + splitLine: { + show: false + }, + axisLine: { + onZero: false + }, + axisTick: { + alignWithLabel: true + }, + boundaryGap: false + }], + yAxis: [ + { + type: 'value', + name: '室内温度(°C)', + nameGap: 25, + position: 'left', + alignTicks: true, + axisLine: { + show: true, + lineStyle: { + color: colors[0] + } + }, + axisLabel: { + formatter: '{value}' + }, + splitLine: { + show: false + } + }, { + type: 'value', + name: '夹层温度(°C)', + nameGap: 45, + position: 'left', + alignTicks: true, + axisLine: { + show: true, + lineStyle: { + color: colors[1] + } + }, + axisLabel: { + formatter: '{value}' + }, + splitLine: { + show: false + } + }, { + type: 'value', + name: '室内压力(Kpa)', + position: 'right', + nameGap: 45, + alignTicks: true, + axisLine: { + show: true, + lineStyle: { + color: colors[2] + } + }, + axisLabel: { + formatter: '{value}' + }, + splitLine: { + show: false + } + }, { + type: 'value', + name: '夹层压力(Kpa)', + position: 'right', + nameGap: 25, + alignTicks: true, + axisLine: { + show: true, + lineStyle: { + color: colors[3] + } + }, + axisLabel: { + formatter: '{value}' + }, + splitLine: { + show: false + } + } + ], + series: [{ + name: '室内温度', + type: 'line', + yAxisIndex: 0, + data: innerTemperatureArray + }, { + name: '夹层温度', + type: 'line', + yAxisIndex: 1, + data: interlayerTemperatureArray + }, + { + name: '室内压力', + type: 'line', + yAxisIndex: 2, + data: innerPressureArray + }, { + name: '夹层压力', + type: 'line', + yAxisIndex: 3, + data: interlayerPressureArray + }] + }; + myChart.setOption(option); + //自适应 + window.onresize = function () { + myChart.resize(); + } +} \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfCommon.js =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfCommon.js (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfCommon.js (revision 40959) @@ -0,0 +1,150 @@ +$(function () { + //获取清洗机信息和曲线图 + loadWashDataAndLineChartInfo(washAndDisinfectRecordId); +}) + +//打印 +function printAll() { + window.print(); +} + +function loadWashDataAndLineChartInfo(washAndDisinfectRecordId) { + $.ajax({ + type: "get", + url: WWWROOT + "/disinfectSystem/washData/washDataLineChartAction!getWashDataAndLineEchartDate.do?washAndDisinfectRecordId=" + washAndDisinfectRecordId + "&time=" + new Date(), + data: "data", + dataType: "json", + success: function (response) { + if (response.success) { + var data = response.data; + if (!data) { + return; + } + renderWashData(data.keyValues); + if (deviceModel == XINHUA_PDF_SUPER6000) { + creatLineChart(data, "washChartId"); + } + } else { + alert("请求数据失败!" + response.message); + } + } + }); +} + +/** + * 加载清洗机信息 + * @param {*} data + */ +function renderWashData(data) { + var html = ''; + for (var item in data) { + html += '
' + '' + item + '' + data[item] + '
' + } + $('#table').html(html); +} + +//FSEYEQ-26:super6000(清洗机型号) +function creatLineChart(dataObject, echartsId) { + var myChart = echarts.init(document.getElementById(echartsId)); + var timeArray = dataObject['timeData']; + var innerTemperatureArray = dataObject['innerTemperatureArray']; + var airTemperatureArray = dataObject['airTemperatureArray']; + var lowTempWaterTankArray = dataObject['lowTempWaterTankArray']; + var highTempWaterTankArray = dataObject['highTempWaterTankArray']; + var myChartOption = { + title: { + text: '', + left: 'center', + top: 0 + }, + tooltip: { + trigger: 'axis', + extraCssText: 'width:230px;height:150px;' + }, + color: ['#00CD66', '#FF6A6A', '#2E2EFE', '#DF7401'], + legend: { + top: 25, + data: ['内室温度', '空气温度', '低温水箱温度', '高温水箱温度'] + }, + grid: { + left: '6%', + containLabel: true + }, + xAxis: { + type: 'category', + boundaryGap: true, + axisTick: { + alignWithLabel: true, + inside: true //刻度线朝内 + }, + name: "时间/时分", + nameLocation: 'center', + nameGap: 30, //坐标名称与轴线之间的距离 + data: timeArray + }, + yAxis: { + type: 'value', + name: '温度(°C)', + alignTicks: true, + axisLabel: { + formatter: '{value}' + }, + splitLine: { + show: false + } + }, + series: [{ + name: '内室温度', + type: 'line', + symbol: "none", //去掉圆点 + itemStyle: { + normal: { + lineStyle: { + color: '#00CD66' //设置线的颜色,如果在这里设置了要再上面的colo数组里面一起修改 + } + } + }, + data: innerTemperatureArray + }, + { + name: '空气温度', + type: 'line', + symbol: "none", + itemStyle: { + normal: { + lineStyle: { + color: '#FF6A6A' + } + } + }, + data: airTemperatureArray + }, + { + name: '低温水箱温度', + type: 'line', + symbol: "none", //去掉圆点 + itemStyle: { + normal: { + lineStyle: { + color: '#2E2EFE' //设置线的颜色,如果在这里设置了要再上面的colo数组里面一起修改 + } + } + }, + data: lowTempWaterTankArray + }, + { + name: '高温水箱温度', + type: 'line', + symbol: "none", //去掉圆点 + itemStyle: { + normal: { + lineStyle: { + color: '#DF7401' //设置线的颜色,如果在这里设置了要再上面的colo数组里面一起修改 + } + } + }, + data: highTempWaterTankArray + }] + }; + myChart.setOption(myChartOption); +} \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp =================================================================== diff -u -r40925 -r40959 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp (.../interfereWashAndDisinfectRecordView.jsp) (revision 40925) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp (.../interfereWashAndDisinfectRecordView.jsp) (revision 40959) @@ -48,8 +48,6 @@ //JMSZXYY-112：新增型号：史帝瑞长龙 changlong var STERIS_CHANGLONG = '<%=DeviceInterface.STERIS_CHANGLONG%>'; var WASHDATATYPE_STERIS_CHANGLONG = '<%=WashAndDisinfectRecord.WASHDATATYPE_STERIS_CHANGLONG%>'; - //FSEYEQ-26：新增型号：Clean H101513(灭菌器型号) - var XINHUA_PDF_CLEAN_H101513 = '<%=DeviceInterface.XINHUA_PDF_CLEAN_H101513%>'; //FSEYEQ-26：新增型号：super6000(清洗机型号) var XINHUA_PDF_SUPER6000 = '<%=DeviceInterface.XINHUA_PDF_SUPER6000%>'; Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfCommon.jsp =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfCommon.jsp (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfCommon.jsp (revision 40959) @@ -0,0 +1,92 @@ +<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.deviceinterface.DeviceInterface"%> +<%@ page contentType="text/html; charset=UTF-8"%> + + + + + + <%@include file="/common/taglibs.jsp" %> + 清洗机参数 + + + + + + + + + + + + + +

清洗机运行参数

+
+
+ +
+
+
+
+
+
+ + + \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.js =================================================================== diff -u -r40922 -r40959 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.js (.../interfereSterilizationView1.js) (revision 40922) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationView1.js (.../interfereSterilizationView1.js) (revision 40959) @@ -152,7 +152,8 @@ function openSterilizerRecordDataLineChart(id, sterilizerRecordId, sterilizationParaType, sterilizerName) { //显示pdf文件的type - var showPdfForType = [15, parseInt(STERILIZATIONPARATYPE_XINHUA_PDF)]; + var showPdfForType = [15]; + var commonPage = [parseInt(STERILIZATIONPARATYPE_XINHUA_PDF)]; if (sterilizationParaType == 8 || sterilizationParaType == 9 || sterilizationParaType == 10 || sterilizationParaType == 11) { top.document.getElementById('thisIframe').src = WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChart.jsp?sterilizationRecordId=' + id + '&sterilizerRecordId=' + sterilizerRecordId; @@ -178,13 +179,10 @@ top.document.getElementById('thisIframe').src = WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType16.jsp?sterilizationRecordId=' + id + '&sterilizerRecordId=' + sterilizerRecordId; } else if (sterilizationParaType == 17) { top.document.getElementById('thisIframe').src = WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType17.jsp?sterilizationRecordId=' + id + '&sterilizerRecordId=' + sterilizerRecordId; + } else if (commonPage.indexOf(sterilizationParaType) >= 0) { + top.document.getElementById('thisIframe').src = WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChartOfCommon.jsp?sterilizationRecordId=' + id + '&sterilizerRecordId=' + sterilizerRecordId + '&sterilizationParaType=' + sterilizationParaType; } else if (showPdfForType.indexOf(sterilizationParaType) >= 0) { - var params = { - sterilizationRecordId: id, - doc: top.document.getElementById('thisIframe'), - dataRecordId: sterilizerRecordId - } - getPDFFileUtil(params); + top.document.getElementById('thisIframe').src = WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/showFileForPDF.jsp?sterilizationRecordId=' + id + '&sterilizerRecordId=' + sterilizerRecordId; } } Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js =================================================================== diff -u -r40921 -r40959 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 40921) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 40959) @@ -1312,15 +1312,21 @@ function openLowSterilizerLineChartSterilizationParaType17(id){ openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChartSterilizationParaType17.jsp?sterilizationRecordId=' + id, '', '灭菌炉运行参数', '1050', '700'); } +//FSEYEQ-26：灭菌炉运行参数（通用） +function openLowSterilizerLineChartSterilizationParaType(id, sterilizationParaType){ + getSterilizerDataLineCharByIframeUtil(id, sterilizationParaType); +} function openSterilizerPhoto(id,type){ top.showUploadImagesForWin(id,type); } //NFYY-98：显示窗口显示对应的PDF文件 function openSterilizerPDF(id){ - var params = { - sterilizationRecordId: id + //暂时不支持IE + if(isIE()){ + showResult('IE浏览器不支持预览pdf文件，请切换谷歌浏览器！'); + }else { + openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/showFileForPDF.jsp?sterilizationRecordId=' + id,'', '灭菌炉运行参数', '1050', '700'); } - getPDFFileUtil(params); } function renderBiologicalMonitoringStatus(v, p, record) { if (v == '进行中') { @@ -1386,7 +1392,8 @@ sterilizationRecordDetailHidden = false } //显示pdf文件的type - var showPdfForType = [15, parseInt(STERILIZATIONPARATYPE_XINHUA_PDF)]; + var showPdfForType = [15]; + var commonPage = [parseInt(STERILIZATIONPARATYPE_XINHUA_PDF)]; // 记录cookie（3步） var columns = [ { header: "灭菌员", width: 120, dataIndex: 'sterilizationUser', renderer: renderCallModifyFunction }, @@ -1451,6 +1458,8 @@ buttonGroup += ""; }else if(record.data.sterilizationParaType == 17){ buttonGroup += ""; + }else if(commonPage.indexOf(record.data.sterilizationParaType) >= 0){ + buttonGroup += ""; }else if(showPdfForType.indexOf(record.data.sterilizationParaType) >= 0){ buttonGroup += ""; }else { Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp =================================================================== diff -u -r40925 -r40959 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp (.../washAndDisinfectView.jsp) (revision 40925) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp (.../washAndDisinfectView.jsp) (revision 40959) @@ -139,8 +139,6 @@ var MARGE_MODEL_MAG_CL4 = '<%=DeviceInterface.MARGE_MODEL_MAG_CL4%>'; //JMSZXYY-112：新增型号：史帝瑞长龙 changlong var STERIS_CHANGLONG = '<%=DeviceInterface.STERIS_CHANGLONG%>'; -//FSEYEQ-26：新增型号：Clean H101513(灭菌器型号) -var XINHUA_PDF_CLEAN_H101513 = '<%=DeviceInterface.XINHUA_PDF_CLEAN_H101513%>'; //FSEYEQ-26：新增型号：super6000(清洗机型号) var XINHUA_PDF_SUPER6000 = '<%=DeviceInterface.XINHUA_PDF_SUPER6000%>'; Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js =================================================================== diff -u -r40925 -r40959 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js (.../interfereWashAndDisinfectRecordView.js) (revision 40925) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js (.../interfereWashAndDisinfectRecordView.js) (revision 40959) @@ -472,30 +472,27 @@ openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.jsp?washAndDisinfectRecordId=' + id + '&deviceModel=' + data.deviceModel, '', '清洗参数', '800', '600'); } } else if (data.deviceBrand == xinHua) { - if (sstsConfig.washDataLineChartType == 1) { - if (data.deviceModel == changlong_DC_4) { - openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHuaChangLong.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); - } else if (data.deviceModel == XINHUA_PDF_CLEAN_H101513 || data.deviceModel == XINHUA_PDF_SUPER6000) { - //FSEYEQ-26：获取新华pdf文件 - var params = { - washAndDisinfectRecordId: id - } - getPDFFileUtil(params); - } else { - openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHua.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + if (data.deviceModel == XINHUA_PDF_SUPER6000) { + //FSEYEQ-26：super6000(清洗机型号) + if(isFrame){ + top.document.getElementById('thisIframe').src = WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfCommon.jsp?washAndDisinfectRecordId=' + id + '&deviceModel=' + deviceModel + '&washDataRecordId=' + washDataRecordId; + }else { + getWashDataLineCharByIframeUtil(id, data.deviceModel); } } else { - if (data.deviceModel == changlong_DC_5) { - openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHua_ChangLong.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); - } else if (data.deviceModel == XINHUA_PDF_CLEAN_H101513 || data.deviceModel == XINHUA_PDF_SUPER6000) { - //FSEYEQ-26：获取新华pdf文件 - var params = { - washAndDisinfectRecordId: id + if (sstsConfig.washDataLineChartType == 1) { + if (data.deviceModel == changlong_DC_4) { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHuaChangLong.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } else { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHua.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); } - getPDFFileUtil(params); } else { - // ZJJSRM-6新华清洗机(负压清洗机和单舱清洗机（super6000）清洗参数显示) - openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHuaOfZJJSRM.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + if (data.deviceModel == changlong_DC_5) { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHua_ChangLong.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } else { + // ZJJSRM-6新华清洗机(负压清洗机和单舱清洗机（super6000）清洗参数显示) + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHuaOfZJJSRM.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } } } } else if (data.deviceBrand == GETINGE) { @@ -548,14 +545,16 @@ } else if (data.deviceBrand == 'Belimed') { //NFYY-98：查看pdf文件 if(data.deviceModel == 'WD290'){ - var params = { - washAndDisinfectRecordId:id + //暂时不支持IE + if(isIE()){ + showResult('IE浏览器不支持预览pdf文件，请切换谷歌浏览器！'); + }else { + if(isFrame){ + top.document.getElementById('thisIframe').src = WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/showFileForPDF.jsp?washAndDisinfectRecordId=' + id + '&washDataRecordId=' + washDataRecordId; + }else { + openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/showFileForPDF.jsp?washAndDisinfectRecordId=' + id,'', '清洗参数', '1050', '700'); + } } - if(isFrame){ - params.doc = top.document.getElementById('thisIframe'); - params.dataRecordId = washDataRecordId - } - getPDFFileUtil(params) }else { if(isFrame){ top.document.getElementById('thisIframe').src = WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id + '&washDataRecordId=' + washDataRecordId + '&deviceBrand=Belimed';