Index: ssts-web/src/main/webapp/js/commonUtils.js
===================================================================
diff -u -r40959 -r41012
--- ssts-web/src/main/webapp/js/commonUtils.js	(.../commonUtils.js)	(revision 40959)
+++ ssts-web/src/main/webapp/js/commonUtils.js	(.../commonUtils.js)	(revision 41012)
@@ -61,8 +61,11 @@
 }
 
 //FSEYEQ-26：显示清洗机数据图形（通用）
-function getWashDataLineCharByIframeUtil(id, deviceModel, isPrint) {
+function getWashDataLineCharByIframeUtil(id, deviceModel, deviceBrand) {
     var url = WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfCommon.jsp?washAndDisinfectRecordId=' + id + '&deviceModel=' + deviceModel;
+    if (deviceBrand) {
+        url = WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id + '&deviceBrand=' + deviceBrand
+    }
     var win = new top.Ext.Window({
         title: '清洗参数',
         id: 'extWindow' + id,
@@ -79,9 +82,14 @@
             html: "<iframe id='thisIframe' src='" + url + "' scrolling='yes' frameborder=0 width=835 height=610></iframe>"
         }],
         buttons: [{
+            text: '导出PDF',
+            id: 'exportPdf',
+            handler: function () {
+                top.document.getElementById('thisIframe').contentWindow.document.getElementById('export').click();
+            }
+        }, {
             text: '打印',
             id: 'print',
-            hidden: true,
             handler: function () {
                 top.document.getElementById('thisIframe').contentWindow.document.getElementById('print').click();
             }
@@ -94,13 +102,10 @@
         }]
     })
     win.show()
-    if (isPrint) {
-        top.Ext.getCmp('print').show();
-    }
 }
 
 //FSEYEQ-26：显示灭菌数据图形（通用）
-function getSterilizerDataLineCharByIframeUtil(id, sterilizationParaType, isPrint) {
+function getSterilizerDataLineCharByIframeUtil(id, sterilizationParaType) {
     var url = WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChartOfCommon.jsp?sterilizationRecordId=' + id + '&sterilizationParaType=' + sterilizationParaType;
     var win = new top.Ext.Window({
         title: '灭菌参数',
@@ -118,9 +123,14 @@
             html: "<iframe id='thisIframe' src='" + url + "' scrolling='yes' frameborder=0 width=1035 height=670></iframe>"
         }],
         buttons: [{
+            text: '导出PDF',
+            id: 'exportPdf',
+            handler: function () {
+                top.document.getElementById('thisIframe').contentWindow.document.getElementById('export').click();
+            }
+        }, {
             text: '打印',
             id: 'print',
-            hidden: true,
             handler: function () {
                 top.document.getElementById('thisIframe').contentWindow.document.getElementById('print').click();
             }
@@ -133,7 +143,4 @@
         }]
     })
     win.show()
-    if (isPrint) {
-        top.Ext.getCmp('print').show();
-    }
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
===================================================================
diff -u -r40959 -r41012
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js	(.../washAndDisinfectView.js)	(revision 40959)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js	(.../washAndDisinfectView.js)	(revision 41012)
@@ -158,13 +158,14 @@
 					}
 				}
 			} else if (data.deviceBrand == GETINGE) {
+				//BJDXZLYY-73：洁定改为通用的
 				if (data.deviceModel == GETING_86_SERIES || data.deviceModel == GETING_SUZHOUJIEDING_46_5) {
 					// KLMY洁定清洗机接口
 					openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfGeting86Series.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
 				} else if (data.deviceModel == GETING_WD500) {
-					openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfGETING_WD500.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
+					getWashDataLineCharByIframeUtil(id, data.deviceModel);
 				} else {
-					openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600');
+					getWashDataLineCharByIframeUtil(id, data.deviceModel, data.deviceBrand);
 				}
 			} else if (data.deviceBrand == YOUYUAN) {
 				// DGSDBZXYY-114 连云港佑源减压沸腾清洗消毒机的接口开发
Index: ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/config.js
===================================================================
diff -u -r37396 -r41012
--- ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/config.js	(.../config.js)	(revision 37396)
+++ ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/config.js	(.../config.js)	(revision 41012)
@@ -160,6 +160,8 @@
   kardexContainerOpeningConfig:[['三号开口','S01-1'],['五号开口','S01-2'],['六号开口','S01-3'],['八号开口','S01-4']],
   //物品科室共用设置扩展功能
   extendedFunctionalityOfGoodsDepartShareConfig:["warehousePosition"],
+  //启用参数文件确认功能
+  enableParameterFileConfirmation:true,
  //外来器械默认申请科室配置
   enableForeignTousseApplyDepartment:true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChartOfCommon.js
===================================================================
diff -u -r40959 -r41012
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChartOfCommon.js	(.../sterilizerLineChartOfCommon.js)	(revision 40959)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChartOfCommon.js	(.../sterilizerLineChartOfCommon.js)	(revision 41012)
@@ -1,20 +1,112 @@
-$(function () {
-    initLoad();
-})
+var queryTable = false;
+var enableParameterFileConfirmation = false;
+var commonParaType = ['8', '9', '10', '11'];
 
 //打印
 function printAll() {
     window.print();
 }
 
+//导出
+function exportAll() {
+    var reportContainer = document.getElementById("report-container");
+    $('.printHidden').hide();
+    html2canvas(reportContainer, {}).then((canvas) => {
+        var pdf = new jsPDF('p', 'pt', 'a4');
+        var pageWidth = 595.28;  // A4 宽度
+        var chunkHeight = 820; // A4 高度
+        var canvasHeight = canvas.height - 30
+        var totalChunks = Math.ceil(canvasHeight / chunkHeight);
+        if (canvas.height > 820) {
+
+            for (let i = 0; i < totalChunks; i++) {
+                const startY = i * chunkHeight;
+                const endY = Math.min(startY + chunkHeight, canvasHeight);
+                const actualHeight = endY - startY;
+
+                // 创建裁剪用 Canvas
+                const chunkCanvas = document.createElement('canvas');
+                chunkCanvas.width = canvas.width;
+                chunkCanvas.height = parseInt(actualHeight);
+                const chunkCtx = chunkCanvas.getContext('2d');
+
+                // 执行裁剪
+                chunkCtx.drawImage(
+                    canvas,
+                    0, startY, canvas.width, actualHeight, // 源区域
+                    0, 0, canvas.width, actualHeight       // 目标区域
+                );
+                // 导出并保存
+                const dataUrl = chunkCanvas.toDataURL('image/jpeg', 1);
+                if (chunkCanvas.height < chunkHeight) {
+                    pdf.addImage(dataUrl, 'JPEG', 10, 10, pageWidth, chunkCanvas.height - 30);
+                } else {
+                    pdf.addImage(dataUrl, 'JPEG', 10, 10, pageWidth, chunkHeight);
+                    pdf.addPage();
+                }
+            }
+        } else {
+            var contentWidth = canvas.width;
+            var contentHeight = canvas.height;
+            var pageData = canvas.toDataURL('image/jpeg', 1.0);
+            pdf.addImage(pageData, 'JPEG', 0, 0, pageWidth, parseInt(pageWidth / contentWidth * contentHeight));
+        }
+
+        var title = $('#titleName').text();
+        pdf.save(title + ".pdf");
+        if (enableParameterFileConfirmation) {
+            $('.printHidden').show();
+        }
+    });
+}
+
+function commonParaTypeFun(result) {
+    if (result.data.sterilizationRecordInfo) {
+        renderSterilizerData(result.data.sterilizationRecordInfo)
+    }
+    if (enableParameterFileConfirmation) {
+        $('#sterilizeParaConfirmationMan').html(result.data.sterilizeParaConfirmationMan || '');
+        $('#sterilizeParaConfirmationBox').show();
+        var codeBox = document.getElementById('sterilizeParaConfirmationBarCode');
+        codeBox.addEventListener('keydown', (event) => {
+            if (event.key === 'Enter') {
+                var barcode = codeBox.value;
+                if (barcode == '') {
+                    showResult('条码不能为空！');
+                    return
+                }
+                UserTableManager.getUserByBarcode(barcode, function (responseText) {
+                    if (responseText && responseText !== '') {
+                        var result = JSON.parse(responseText);
+                        if (!result.success) {
+                            showResult(result.message || "不允许登记非本科室人员，请扫描本科室人员条码！");
+                            codeBox.value = '';
+                            return;
+                        }
+                        $('#sterilizeParaConfirmationMan').html(result.fullName);
+                        $('#sterilizeParaConfirmationCode').html(result.name);
+                        codeBox.value = '';
+                    } else {
+                        showResult('找不到该条码所对应的人员信息');
+                        codeBox.value = '';
+                    }
+                });
+            }
+        });
+    } else {
+        $('#sterilizeParaConfirmationBox').hide();
+    }
+}
+
 function initLoad() {
     jQuery.ajax({
         url: WWWROOT + "/disinfectSystem/sterilization/sterilizerRecordLineChartAction!createEChartData.do",
         type: 'post',
         dataType: 'JSON',
         data: {
             sterilizationRecordId: sterilizationRecordId,
-            washDataRecordId:washDataRecordId,
+            washDataRecordId: washDataRecordId,
+            queryTable: queryTable,
             time: new Date().getTime()
         },
         success: function (result) {
@@ -23,7 +115,12 @@
                     renderSterilizerData(result.data.keyValues)
                 }
                 if (sterilizationParaType == STERILIZATIONPARATYPE_XINHUA_PDF) {
+                    $('#titleName').html('灭菌炉运行参数');
                     creatLineChart(result);
+                } else if (commonParaType.indexOf(sterilizationParaType) >= 0) {
+                    $('#titleName').html('炉次灭菌报告');
+                    creatLineChartByCommon(result);
+                    commonParaTypeFun(result);
                 }
             }
         }
@@ -42,6 +139,36 @@
     jQuery('#table').html(html);
 }
 
+//BJDXZLYY-74：保存灭菌参数确认人
+function savesterilizeParaConfirmationMan() {
+    var url = WWWROOT + '/disinfectSystem/sterilization/sterilizerRecordLineChartAction!saveSterilizeParaConfirmationMan.do';
+    var sterilizeParaConfirmationMan = $('#sterilizeParaConfirmationMan').text();
+    var sterilizeParaConfirmationCode = $('#sterilizeParaConfirmationCode').text();
+    if (sterilizeParaConfirmationCode == '') {
+        showResult('请先扫描确认人')
+        return;
+    }
+    jQuery.ajax({
+        url: url,
+        method: 'post',
+        data: {
+            sterilizationRecordId: sterilizationRecordId,
+            sterilizeParaConfirmationMan: sterilizeParaConfirmationMan,
+            sterilizeParaConfirmationCode: sterilizeParaConfirmationCode
+        },
+        success: function (result) {
+            if (result) {
+                var res = JSON.parse(result);
+                if (res.success) {
+                    showResult('保存成功');
+                } else {
+                    showResult('保存失败');
+                }
+            }
+        }
+    });
+}
+
 //FSEYEQ-26: Clean H101513(灭菌器型号)
 function creatLineChart(result) {
     //室内温度
@@ -199,4 +326,176 @@
     window.onresize = function () {
         myChart.resize();
     }
-}
\ No newline at end of file
+}
+
+//BJDXZLYY-74：改造通用的
+function creatLineChartByCommon(result) {
+    var temperature = result.data.t1TempData;//温度
+    var pressure = result.data.p1MbarData;//压力
+    var timeData = result.data.timeData;//时间
+    var sterilizerRecordArr = result.data.sterilizerRecordArr;
+    if (sterilizerRecordArr && sterilizerRecordArr.length > 0) {
+        var html = '<table>';
+        html += '<tr>';
+        html += '<td></td><td>温度</td><td>压力</td>';
+        html += '</tr>';
+        for (var i = 0; i < sterilizerRecordArr.length; i++) {
+            if ((sterilizerRecordArr[i].phase || '') !== '') {
+                html += '<tr>';
+                html += '<td colspan="3" style="color:#367f21">' + sterilizerRecordArr[i].phase + '</td>';
+                html += '</tr>';
+            } else {
+                html += '<tr>';
+                html += '<td style="padding-left:10px">' + sterilizerRecordArr[i].time + '</td><td>' + sterilizerRecordArr[i].T1Temp + '</td><td>' + sterilizerRecordArr[i].P1Mbar + '</td>';
+                html += '</tr>';
+            }
+        }
+        html += '</table>';
+        document.getElementById("div2").innerHTML = html;
+    }
+    for (j = 0; j < pressure.length; j++) {
+        if (pressure[j] < 0 || pressure[j] == 0) {
+            addLline = true;
+        }
+    }
+    var option = {
+        tooltip: {
+            trigger: 'axis'
+        },
+        color: ['#00CD66', '#CD2990'],
+        legend: {
+            left: "8%",
+            data: ['温度', '压力', "", "", ""]
+
+        },
+        xAxis: [{
+            type: 'category',
+            name: "时间/分秒",
+            nameLocation: "middle",
+            position: "bottom",
+            nameGap: 30,
+            data: timeData,
+            axisLabel: {
+                formatter: function (value, index) {//截取分钟
+                    var minutesData = [];
+                    var timeDataArr = value.split(" ");
+                    var timeDataArrTwo = timeDataArr[1];
+                    timeDataArrTwo = timeDataArrTwo.substring(3, 8);
+                    minutesData.push(timeDataArrTwo);
+                    return minutesData;
+                }
+            },
+            splitLine: {
+                show: false
+            },
+            axisLine: {
+                onZero: false
+            },
+            axisTick: {
+                alignWithLabel: true
+            },
+            boundaryGap: false
+        }],
+        yAxis: [
+            {
+                type: 'value',
+                name: '温度(°C)',
+                max: 140,
+                interval: 10,//间隔值
+                axisLabel: {
+                    formatter: '{value}'
+                },
+                splitLine: {
+                    show: false
+                }
+            }, {
+                type: 'value',
+                name: '压力(Kpa)',
+                axisLabel: {
+                    formatter: '{value}'
+                },
+                splitLine: {
+                    show: false
+                },
+                yAxisIndex: 1
+            }
+        ],
+        series: [{
+            name: '温度',
+            type: 'line',
+            symbol: "none",
+            itemStyle: {
+                normal: {
+                    lineStyle: {
+                        color: '#00CD66'
+                    }
+                }
+            },
+            data: temperature,
+            markLine: {
+                symbol: "none",
+                label: {
+                    show: false
+                },
+                data: [{
+                    silent: false,
+                    lineStyle: {
+                        type: "solid",
+                        color: "#00CD66"
+                    },
+                    yAxis: 134
+                }]
+            }
+        },
+        {
+            name: '压力',
+            type: 'line',
+            symbol: "none",
+            itemStyle: {
+                normal: {
+                    lineStyle: {
+                        color: '#CD2990'
+                    }
+                }
+            },
+            yAxisIndex: 1,
+            data: pressure
+        }]
+    };
+    if (addLline) {
+        var markLines = {
+            symbol: "none",
+            label: {
+                show: false
+            },
+            data: [{
+                silent: false,
+                lineStyle: {
+                    type: "solid",
+                    color: "#CD2990"
+                },
+                yAxis: 0
+            }, {
+                silent: false,
+                lineStyle: {
+                    type: "solid",
+                    color: "#CD2990"
+                },
+                yAxis: -85
+            }]
+        }
+        option.series[1].markLine = markLines;
+    }
+    myChart.setOption(option);
+}
+
+$(function () {
+    if (commonParaType.indexOf(sterilizationParaType) >= 0) {
+        queryTable = true;
+        if (sstsConfig.enableParameterFileConfirmation) {
+            enableParameterFileConfirmation = true;
+        }
+    }
+
+    initLoad();
+})
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChartOfCommon.jsp
===================================================================
diff -u -r40959 -r41012
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChartOfCommon.jsp	(.../sterilizerLineChartOfCommon.jsp)	(revision 40959)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChartOfCommon.jsp	(.../sterilizerLineChartOfCommon.jsp)	(revision 41012)
@@ -10,22 +10,26 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>灭菌炉运行参数</title>
 	<!-- <link rel="stylesheet" href="css/iefix.css" type="text/css" media="screen" /> -->
+	<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
 	<script type="text/javascript" src="${ctx}/disinfectsystem/touchScreen/recycle/js/jquery-min.js?version=${svnRevision}"></script>
 	<script type="text/javascript" src="${ctx}/js/json3.min.js?version=${svnRevision}"></script>
 	<script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
 	<script type="text/javascript" src="${ctx}/echarts-5.5.1/echarts.min.js?version=${svnRevision}"></script>
+	<script type="text/javascript" src="${ctx}/js/exportPDF/html2canvas.js"></script>
+	<script type="text/javascript" src="${ctx}/js/exportPDF/jspdf.min.js"></script>
+	<script type="text/javascript" src="${ctx }/dwr/engine.js?version=${svnRevision}"></script>
+	<script type="text/javascript" src="${ctx }/dwr/util.js?version=${svnRevision}"></script>
+	<script type="text/javascript" src="${ctx}/dwr/interface/UserTableManager.js?version=${svnRevision}"></script>
 	<style type="text/css">
 		.sterilizer-LineChart-title{
 			font-weight: normal;
 		}
 		#div2 {
 			width:320px; 
-			height:540px;
 			overflow: auto;
 			text-align: left;
 			padding-left: 20px;
 			font-size: 14px;
-			float: left;
 		}
 		#table {
 			width: 95%;
@@ -51,28 +55,37 @@
 			.print_btn {
 				display: none;
 			}
+			.printHidden {
+				display: none;
+			}
 		}
 	</style>
 </head>
-<body style="text-align:center;height:670px;">
+<body style="text-align:center;">
 	<button id="print" onclick="printAll()" style="display: none;">打印</button>
-	<div id="div1">
+	<button id="export" onclick="exportAll()" style="display: none;">导出</button>
+	<div id="report-container">
 		<div style="position:relative;">
-			<h1>灭菌炉运行参数</h1>
+			<h1 id="titleName"></h1>
 		</div>
 		<div style="margin-bottom: 20px">
+			<div id="sterilizeParaConfirmationBox" style="display: none;text-align: left;">
+				<span class="printHidden" style="display: none;margin-right: 10px;" id="sterilizeParaConfirmationCode"></span>
+				<span class="printHidden">灭菌参数确认人条码：</span><input class="printHidden" type="text" autocomplete="off" id="sterilizeParaConfirmationBarCode" style="margin-right: 10px;" /><span style="margin-right: 10px;">灭菌参数确认人：　</span><span id="sterilizeParaConfirmationMan"></span><button class="printHidden" onclick="savesterilizeParaConfirmationMan()" style="margin-left: 10px;">确认保存</button>
+			</div>
 			<div id="table">
 			</div>
 		</div>
 		<div id="chart" style="width: 100%;min-height:350px;"></div>
+		<div id="div2" style="margin-bottom: 50px;"></div>
 	</div>
 	<script type="text/javascript">
 		var myChart = echarts.init(document.getElementById('chart'));
 		var WWWROOT = '${ctx}';
 		var sterilizationRecordId = '${param.sterilizationRecordId}';
 		var washDataRecordId = '${param.sterilizationRecordId}' || '';
 		var sterilizationParaType = '${param.sterilizationParaType}';
-		//FSEYEQ-26：新增型号：Clean H101513(灭菌器型号)
+		//FSEYEQ-26：新增型号18：Clean H101513
 		var STERILIZATIONPARATYPE_XINHUA_PDF = '<%=SterilizationRecord.STERILIZATIONPARATYPE_XINHUA_PDF%>';
 	</script>
 	<script type="text/javascript" src="sterilizerLineChartOfCommon.js?version=${svnRevision}"></script>
Fisheye: Tag 41012 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfGETING_WD500.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
===================================================================
diff -u -r40959 -r41012
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js	(.../sterilizationRecordView.js)	(revision 40959)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js	(.../sterilizationRecordView.js)	(revision 41012)
@@ -1272,9 +1272,6 @@
 	openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerRecordView.jsp?popType=true&sterilizationRecordId=' + id, '', '灭菌器参数', '1000', '700');
 }
 
-function openSterilizerRecordLineChart(id) {
-	openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChart.jsp?sterilizationRecordId=' + id, '', '灭菌器参数', '1050', '700');
-}
 function openLowSterilizerRecordLineChart(id, sterilizationUser) {
 	openModalWindowForExt(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizerRecord/lowSterilizerLineChart.jsp?sterilizationRecordId=' + id, '', '灭菌器参数', '1050', '700');
 }
@@ -1312,10 +1309,6 @@
 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);
 }
@@ -1393,7 +1386,7 @@
 	}
 	//显示pdf文件的type
 	var showPdfForType = [15];
-	var commonPage = [parseInt(STERILIZATIONPARATYPE_XINHUA_PDF)];
+	var commonPage = [8,9,10,11,parseInt(STERILIZATIONPARATYPE_XINHUA_PDF)];
 	// 记录cookie（3步）
 	var columns = [
 		{ header: "灭菌员", width: 120, dataIndex: 'sterilizationUser', renderer: renderCallModifyFunction },
@@ -1429,12 +1422,7 @@
 		{
 			header: "灭菌器参数", width: 70, dataIndex: 'sterilizerRecordAmount', sortable: false, renderer: function (v, p, record) {
 				var buttonGroup = "";
-				if (record.data.sterilizerRecordAmount > 0 || record.data.sterilizationParaType == 8
-						|| record.data.sterilizationParaType == 9
-						|| record.data.sterilizationParaType == 10
-						|| record.data.sterilizationParaType == 11) {
-					buttonGroup += "<img height=\"20\" src=\"" + WWWROOT + "/images/web/application_view_list.png\" onclick=\"openSterilizerRecordLineChart('" + record.data.id + "') \">";
-				} else if (record.data.sterilizationParaType == 1) {
+				if (record.data.sterilizationParaType == 1) {
 					buttonGroup += "<img height=\"20\" src=\"" + WWWROOT + "/images/web/application_view_list.png\" onclick=\"openLowSterilizerRecordLineChart('" + record.data.id + "') \">";
 				} else if (record.data.sterilizationParaType == 2) {
 					buttonGroup += "<img height=\"20\" src=\"" + WWWROOT + "/images/web/application_view_list.png\" onclick=\"openHighSterilizerRecordLineChart('" + record.data.id + "') \">";
@@ -1459,7 +1447,7 @@
 				}else if(record.data.sterilizationParaType == 17){
 					buttonGroup += "<img height=\"20\" src=\"" + WWWROOT + "/images/web/application_view_list.png\" onclick=\"openLowSterilizerLineChartSterilizationParaType17('" + record.data.id + "') \">";
 				}else if(commonPage.indexOf(record.data.sterilizationParaType) >= 0){
-					buttonGroup += "<img height=\"20\" src=\"" + WWWROOT + "/images/web/application_view_list.png\" onclick=\"openLowSterilizerLineChartSterilizationParaType(" + record.data.id + ","+record.data.sterilizationParaType+") \">";
+					buttonGroup += "<img height=\"20\" src=\"" + WWWROOT + "/images/web/application_view_list.png\" onclick=\"getSterilizerDataLineCharByIframeUtil(" + record.data.id + ","+record.data.sterilizationParaType+") \">";
 				}else if(showPdfForType.indexOf(record.data.sterilizationParaType) >= 0){
 					buttonGroup += "<img height=\"20\" src=\"" + WWWROOT + "/images/web/application_view_list.png\" onclick=\"openSterilizerPDF('" + record.data.id + "') \">";
 				}else {
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfCommon.js
===================================================================
diff -u -r40959 -r41012
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfCommon.js	(.../washDataChartOfCommon.js)	(revision 40959)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfCommon.js	(.../washDataChartOfCommon.js)	(revision 41012)
@@ -8,6 +8,19 @@
     window.print();
 }
 
+//导出
+function exportAll() {
+    var reportContainer = document.getElementById("report-container");
+    html2canvas(reportContainer, {}).then((canvas) => {
+        var contentWidth = canvas.width;
+        var contentHeight = canvas.height;
+        var pdf = new jsPDF('1', 'pt', [contentWidth, contentHeight]);
+        var pageData = canvas.toDataURL('image/jpeg', 1.0);
+        pdf.addImage(pageData, 'JPEG', 0, 0, contentWidth, contentHeight);
+        pdf.save("清洗机运行参数.pdf");
+    });
+}
+
 function loadWashDataAndLineChartInfo(washAndDisinfectRecordId) {
     $.ajax({
         type: "get",
@@ -20,9 +33,11 @@
                 if (!data) {
                     return;
                 }
-                renderWashData(data.keyValues);
                 if (deviceModel == XINHUA_PDF_SUPER6000) {
-                    creatLineChart(data, "washChartId");
+                    renderWashData(data.keyValues);
+                    creatLineChartByXINHUA(data, "washChartId");
+                } else if (deviceModel == GETING_WD500) {
+                    creatLineChartByGETINGOfWD500(data, "washChartId");
                 }
             } else {
                 alert("请求数据失败!" + response.message);
@@ -44,7 +59,7 @@
 }
 
 //FSEYEQ-26:super6000(清洗机型号)
-function creatLineChart(dataObject, echartsId) {
+function creatLineChartByXINHUA(dataObject, echartsId) {
     var myChart = echarts.init(document.getElementById(echartsId));
     var timeArray = dataObject['timeData'];
     var innerTemperatureArray = dataObject['innerTemperatureArray'];
@@ -147,4 +162,77 @@
         }]
     };
     myChart.setOption(myChartOption);
+}
+
+//SZSZLYY-66：新增洁定型号：WD500
+function creatLineChartByGETINGOfWD500(dataObject, echartsId) {
+    var myChart = echarts.init(document.getElementById(echartsId));
+    var timeArray = dataObject.washDataItemLineChart.times;
+    var tempsArray = dataObject.washDataItemLineChart.temps;
+    var myChartOption = {
+        title: {
+            text: '',
+            left: 'center',
+            top: 0
+        },
+        tooltip: {
+            trigger: 'axis',
+            extraCssText: 'width:230px;height:150px;'
+        },
+        color: ['#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: '#DF7401' //设置线的颜色,如果在这里设置了要再上面的colo数组里面一起修改
+                    }
+                }
+            },
+            data: tempsArray
+        }]
+    };
+    myChart.setOption(myChartOption);
+
+    if (dataObject.tableInfo.length > 0) {
+        var html = '';
+        for (var i = 0; i < dataObject.tableInfo.length; i++) {
+            html += '<p style="white-space:pre;text-align:left;font-family: 宋体;">' + dataObject.tableInfo[i] + '</p>'
+        }
+        $('#WD500Table').html(html);
+        $('#WD500Table').show();
+    }
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp
===================================================================
diff -u -r40302 -r41012
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp	(.../washDataLineChart.jsp)	(revision 40302)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp	(.../washDataLineChart.jsp)	(revision 41012)
@@ -1,252 +1,370 @@
-<%@ 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.washanddisinfectmanager.washanddisinfectrecord.action.WashDataLineChartAction" %>
+<%@ 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.washanddisinfectmanager.washanddisinfectrecord.action.WashDataLineChartAction"%>
 
 <!DOCTYPE html>
 <html>
 <head>
-    <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7; IE=EmulateIE9">
+	<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7; IE=EmulateIE9">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>清洗机温度曲线图</title>
+	<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
 	<script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
 	<script type="text/javascript" src="${ctx}/js/json3.min.js?version=${svnRevision}"></script>
 	<script type="text/javascript" src="${ctx}/js/jquery-1.2.2.pack.js?version=${svnRevision}"></script>
 	<script type="text/javascript" src="${ctx}/js/excanvas.js?version=${svnRevision}"></script>
 	<script type="text/javascript" src="${ctx}/js/dygraph-combined.js?version=${svnRevision}"></script>
-	<!-- 打印函数 -->
-	<script language="javascript" src="${ctx}/disinfectsystem/print/LodopFuncs.js?version=${svnRevision}"></script>
-	<script type="text/javascript" src="${ctx}/disinfectsystem/print/print.js?version=${svnRevision}"></script>
 	<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/print/printConfig.js?version=${svnRevision}"></script>
+	<script type="text/javascript" src="${ctx}/js/exportPDF/html2canvas.js"></script>
+	<script type="text/javascript" src="${ctx}/js/exportPDF/jspdf.min.js"></script>
+	<script type="text/javascript" src="${ctx }/dwr/engine.js?version=${svnRevision}"></script>
+	<script type="text/javascript" src="${ctx }/dwr/util.js?version=${svnRevision}"></script>
+	<script type="text/javascript" src="${ctx}/dwr/interface/UserTableManager.js?version=${svnRevision}"></script>
 	<style type="text/css">
 		.labelWrap {
-		width:300px;
-		height:38px;
-		float:left;
-		margin-left :50px;
+			width: 300px;
+			height: 38px;
+			float: left;
+			margin-left: 50px;
 		}
+
 		.labelClass {
 			font-weight: bold;
 			text-align: right;
 			padding-top: 2px;
-			width : 150px;
-			color : red;
-			float : left;
-	    	font-size : 16px;
+			width: 150px;
+			color: red;
+			float: left;
+			font-size: 16px;
 		}
+
 		.textClass {
-			border:none;
-			font-weight:bold;
+			border: none;
+			font-weight: bold;
 			padding-left: 2px;
-			width : 130px;
-	    	font-size : 16px;
-			color : red;
+			width: 130px;
+			font-size: 16px;
+			color: red;
 		}
+
 		#div2 {
-			width:280px; 
-			height:400px;
+			width: 280px;
+			/* height:400px; */
 			overflow: auto;
 			text-align: left;
 			padding-left: 20px;
 			font-size: 14px;
 		}
+
 		#div2 table {
-			width:260px; 
+			width: 260px;
 		}
+
 		#div {
 			margin-bottom: 20px;
 			display: none;
 		}
+
 		#div p {
 			margin: 10px 0;
 			text-align: left;
 			padding: 0 20px;
 		}
+
 		#div table td {
 			width: 100px;
 			text-align: center;
 		}
+
+		#left p{
+			text-align: left;
+		}
+		
 	</style>
-	
+	<style media="print">
+		@media print {
+			html, body {
+				height: auto;
+				margin: 0;
+			}
+		}
+		@page {
+			size: auto;
+			margin: 0;
+		}
+		.printHidden {
+			display: none;
+		}
+	</style>
 </head>
+
 <body style="text-align:center;">
 
 <script type="text/javascript">
-var gs;
-var deviceBrand = '${param.deviceBrand}';
-var WWWROOT = '${pageContext.request.contextPath}';
-var washAndDisinfectRecordId = '${param.washAndDisinfectRecordId}';
-var washDataRecordId = '${param.washDataRecordId}';
-window.onbeforeprint = function(event) {
-	$('#div1').hide();
-	$('#div2').hide();
-	$('#labelWrap').hide();
-	$('.printBtn').hide();
-};
-window.onafterprint = function(event) {
-	$('#div1').show();
-	$('#div2').show();
-	$('#labelWrap').show();
-	$('.printBtn').show();
-};
-$(document).ready(function () {
-	if(deviceBrand !== 'Belimed'){
-		//获取A0值
-		var getA0Url = WWWROOT + '/disinfectSystem/washData/washDataLineChartAction!getA0.do?washAndDisinfectRecordId='+ washAndDisinfectRecordId + '&washDataRecordId=' + washDataRecordId +'&time='+new Date().getTime();
-		$.ajax({
-			url 	: getA0Url,
-			dataType: 'text',
-			success	: function(result){
-				if(!isUndefinedOrNullOrEmpty(result)){
-					document.getElementById("labelWrap").style.display = "block";
-					document.getElementById("methodName").value = result;
+	//打印
+	function printAll() {
+		window.print();
+	}
+
+	//导出
+	function exportAll() {
+		var reportContainer = document.getElementById("report-container");
+		$('.printHidden').hide();
+		html2canvas(reportContainer, {}).then((canvas) => {
+			var pageWidth = 595.28;  // A4 宽度
+			var chunkHeight = 820; // A4 高度
+			var canvasHeight = canvas.height - 30
+			var totalChunks = Math.ceil(canvasHeight / chunkHeight);
+			var savePromises = [];
+			var pdf = new jsPDF('p', 'pt', 'a4');
+
+			for (let i = 0; i < totalChunks; i++) {
+				const startY = i * chunkHeight;
+				const endY = Math.min(startY + chunkHeight, canvasHeight);
+				const actualHeight = endY - startY ;
+
+				// 创建裁剪用 Canvas
+				const chunkCanvas = document.createElement('canvas');
+				chunkCanvas.width = canvas.width;
+				chunkCanvas.height = parseInt(actualHeight);
+				const chunkCtx = chunkCanvas.getContext('2d');
+
+				// 执行裁剪
+				chunkCtx.drawImage(
+				canvas,
+				0, startY, canvas.width, actualHeight, // 源区域
+				0, 0, canvas.width, actualHeight       // 目标区域
+				);
+				// 导出并保存
+				const dataUrl = chunkCanvas.toDataURL('image/jpeg', 1);
+				if(chunkCanvas.height < chunkHeight){
+					pdf.addImage(dataUrl,'JPEG', 10, 10, pageWidth, chunkCanvas.height-30);
+				}else {
+					pdf.addImage(dataUrl,'JPEG', 10, 10, pageWidth, chunkHeight);
+					pdf.addPage();
 				}
 			}
+			pdf.save("清洗机运行参数.pdf");
+			$('.printHidden').show();
 		});
-		var createPhaseTempChartUrl = WWWROOT + '/disinfectSystem/washData/washDataLineChartAction!createPhaseTempChart.do?washAndDisinfectRecordId='+ washAndDisinfectRecordId + '&washDataRecordId=' + washDataRecordId +'&time='+new Date().getTime();
-		
+	}
+
+	//BJDXZLYY-74：保存确认人
+	function saveCleaningParaConfirmationMan(){
+		var url = WWWROOT + '/disinfectSystem/washData/washDataLineChartAction!saveCleaningParaConfirmationMan.do';
+		var cleaningParaConfirmationMan = $('#cleaningParaConfirmationMan').text();
+		var cleaningParaConfirmationCode = $('#cleaningParaConfirmationCode').text();
+		if(cleaningParaConfirmationCode == ''){
+			showResult('请先扫描确认人')
+			return;
+		}
 		$.ajax({
-			url : createPhaseTempChartUrl,
-			success	: function(result){
-				var res = JSON.parse(result);
-				var html = '';
-				if(res.success){
-					html += '<p style="font-size: 16px;margin: 5px 0;">监控温度（摄氏度）</p>';
-					html += '<table>';
-					html += '<tr>';
-					html += '<td></td><td>摄氏度</td>';	
-					html += '</tr>';	
-					for(var i=0;i<res.data.length;i++){
-						if(res.data[i].phase !== ''){
-							html += '<tr>';
-							html += '<td colspan="2" style="color:#367f21">'+res.data[i].phase+'</td>';	
-							html += '</tr>';
-						}else {
-							html += '<tr>';
-							html += '<td style="padding-left:10px">'+res.data[i].time+'</td><td>'+res.data[i].t1Temp+'</td>';	
-							html += '</tr>';
-						}
+			url: url,
+			method:'post',
+			data:{
+				 washAndDisinfectRecordId: washAndDisinfectRecordId,
+				 cleaningParaConfirmationMan:cleaningParaConfirmationMan,
+				 cleaningParaConfirmationCode:cleaningParaConfirmationCode
+			},
+			success: function (result) {
+				if (result) {
+					var res = JSON.parse(result);
+					if(res.success){
+						showResult('保存成功');
+					}else {
+						showResult('保存失败');
 					}
-					html += '</table>';
-					document.getElementById("div2").innerHTML = html;
-					document.getElementById("div2").style.display = "block";
 				}
 			}
 		});
-	}else {
-		$('#div1').css('width','730px');
-		$('#div2').hide();
-		var obj = {};
-		var getPhaseWashDataUrl = WWWROOT + '/disinfectSystem/washData/washDataLineChartAction!getPhaseWashData.do?washAndDisinfectRecordId='+ washAndDisinfectRecordId + '&washDataRecordId=' + washDataRecordId +'&time='+new Date().getTime();
-		
-		$.ajax({
-			url : getPhaseWashDataUrl,
-			success	: function(result){
-				var res = JSON.parse(result);
-				var html = '';
-				if(res.success && JSON.stringify(res.data) !== '{}'){
-					obj = res.data;
-					html += '<p>清洗机：'+(res.data.rinser || "")+'</p>';
-					html += '<p>程序编号：'+(res.data.programNo || "")+'</p>';
-					html += '<p>周期名称：'+(res.data.cycleName || "")+'</p>';
-					html += '<p>周期数：'+(res.data.cycleCounter || "")+'</p>';
-					html += '<p>周期开始时间：'+(res.data.cycleStartTime || "")+'</p>';
-					html += '<p>周期时间：'+(res.data.cycleTotalTime || "")+'</p>';
-					html += '<p>消毒时间：'+(res.data.disinfectTotalTime || "")+'</p>';
-					html += '<p>A0：'+(res.data.A0 || "")+'</p>';
-					if(res.data.lastPhaseWashData && res.data.lastPhaseWashData.length > 0){
-						html += '<table border="1" cellspacing=0 cellpadding=0>';
+	}
+	var gs;
+	var deviceBrand = '${param.deviceBrand}';
+	var WWWROOT = '${pageContext.request.contextPath}';
+	var washAndDisinfectRecordId = '${param.washAndDisinfectRecordId}';
+	var washDataRecordId = '${param.washDataRecordId}';
+	$(document).ready(function () {
+		if (deviceBrand !== 'Belimed') {
+			//获取A0值
+			var getA0Url = WWWROOT + '/disinfectSystem/washData/washDataLineChartAction!getA0.do?washAndDisinfectRecordId=' + washAndDisinfectRecordId + '&washDataRecordId=' + washDataRecordId + '&time=' + new Date().getTime();
+			$.ajax({
+				url: getA0Url,
+				dataType: 'text',
+				success: function (result) {
+					if (result) {
+						var res = JSON.parse(result);
+						document.getElementById("A0").innerHTML = res.A0;
+						document.getElementById("disinfectProgram").innerHTML = res.disinfectProgram;
+						document.getElementById("startDate").innerHTML = res.startDate;
+						document.getElementById("endDate").innerHTML = res.endDate;
+						document.getElementById("operator").innerHTML = res.operator;
+						document.getElementById("rinserName").innerHTML = res.rinserName;
+						document.getElementById("cleaningParaConfirmationMan").innerHTML = res.cleaningParaConfirmationMan || '';
+					}
+				}
+			});
+			var createPhaseTempChartUrl = WWWROOT + '/disinfectSystem/washData/washDataLineChartAction!createPhaseTempChart.do?washAndDisinfectRecordId=' + washAndDisinfectRecordId + '&washDataRecordId=' + washDataRecordId + '&time=' + new Date().getTime();
+
+			$.ajax({
+				url: createPhaseTempChartUrl,
+				success: function (result) {
+					var res = JSON.parse(result);
+					var html = '';
+					if (res.success) {
+						html += '<p style="font-size: 16px;margin: 5px 0;">监控温度（摄氏度）</p>';
+						html += '<table>';
 						html += '<tr>';
-						html += '<td>时间</td><td>步骤名称</td><td>温度 °C</td><td>DoV1 ml</td>';	
+						html += '<td></td><td>摄氏度</td>';
 						html += '</tr>';
-						for(var i=0;i<res.data.lastPhaseWashData.length;i++){
+						for (var i = 0; i < res.data.length; i++) {
+							if (res.data[i].phase !== '') {
+								html += '<tr>';
+								html += '<td colspan="2" style="color:#367f21">' + res.data[i].phase + '</td>';
+								html += '</tr>';
+							} else {
+								html += '<tr>';
+								html += '<td style="padding-left:10px">' + res.data[i].time + '</td><td>' + res.data[i].t1Temp + '</td>';
+								html += '</tr>';
+							}
+						}
+						html += '</table>';
+						document.getElementById("div2").innerHTML = html;
+						document.getElementById("div2").style.display = "block";
+					}
+				}
+			});
+		} else {
+			$('#div1').css('width', '730px');
+			$('#div2').hide();
+			var obj = {};
+			var getPhaseWashDataUrl = WWWROOT + '/disinfectSystem/washData/washDataLineChartAction!getPhaseWashData.do?washAndDisinfectRecordId=' + washAndDisinfectRecordId + '&washDataRecordId=' + washDataRecordId + '&time=' + new Date().getTime();
+
+			$.ajax({
+				url: getPhaseWashDataUrl,
+				success: function (result) {
+					var res = JSON.parse(result);
+					var html = '';
+					if (res.success && JSON.stringify(res.data) !== '{}') {
+						obj = res.data;
+						html += '<p>清洗机：' + (res.data.rinser || "") + '</p>';
+						html += '<p>程序编号：' + (res.data.programNo || "") + '</p>';
+						html += '<p>周期名称：' + (res.data.cycleName || "") + '</p>';
+						html += '<p>周期数：' + (res.data.cycleCounter || "") + '</p>';
+						html += '<p>周期开始时间：' + (res.data.cycleStartTime || "") + '</p>';
+						html += '<p>周期时间：' + (res.data.cycleTotalTime || "") + '</p>';
+						html += '<p>消毒时间：' + (res.data.disinfectTotalTime || "") + '</p>';
+						html += '<p>A0：' + (res.data.A0 || "") + '</p>';
+						if (res.data.lastPhaseWashData && res.data.lastPhaseWashData.length > 0) {
+							html += '<table border="1" cellspacing=0 cellpadding=0>';
 							html += '<tr>';
-							html += '<td>'+res.data.lastPhaseWashData[i].time+'</td>';	
-							html += '<td>'+res.data.lastPhaseWashData[i].stepPhase+'</td>';
-							html += '<td>'+res.data.lastPhaseWashData[i].temp+'</td>';
-							html += '<td>'+res.data.lastPhaseWashData[i].DosVml+'</td>';
+							html += '<td>时间</td><td>步骤名称</td><td>温度 °C</td><td>DoV1 ml</td>';
 							html += '</tr>';
+							for (var i = 0; i < res.data.lastPhaseWashData.length; i++) {
+								html += '<tr>';
+								html += '<td>' + res.data.lastPhaseWashData[i].time + '</td>';
+								html += '<td>' + res.data.lastPhaseWashData[i].stepPhase + '</td>';
+								html += '<td>' + res.data.lastPhaseWashData[i].temp + '</td>';
+								html += '<td>' + res.data.lastPhaseWashData[i].DosVml + '</td>';
+								html += '</tr>';
+							}
+							html += '</table>';
 						}
-						html += '</table>';
+						document.getElementById("div").innerHTML = html;
+						document.getElementById("div").style.display = "block";
 					}
-					document.getElementById("div").innerHTML = html;
-					document.getElementById("div").style.display = "block";
-					$('.printBtn').show();
 				}
-			}
-		});
+			});
+		}
 
-		$('.printBtn').click(function(){
-			if(JSON.stringify(obj) !== '{}'){
-				printConfig.printPhaseWashData.customPrint(obj);
-			}else {
-				alert('打印内容不存在');
+		gs = [];
+		var blockRedraw = false;
+		var yLabelName = '温度';
+		var createChartUrl = WWWROOT + '/disinfectSystem/washData/washDataLineChartAction!createChart.do?washAndDisinfectRecordId=' + washAndDisinfectRecordId + '&washDataRecordId=' + washDataRecordId + '&time=' + new Date().getTime();
+
+		gs.push(
+			new Dygraph(
+				document.getElementById("div1"), createChartUrl, {
+				rollPeriod: 7,
+				ylabel: yLabelName,
+				//showRoller: true,  // note trailing comma
+				xlabel: '时间',
+				rollPeriod: 0,
+				connectSeparatedPoints: false,
+				drawCallback: function (me, initial) {
+					if (blockRedraw || initial) return;
+					blockRedraw = true;
+					var xrange;
+					var yrange;
+					for (var j = 0; j < gs.lenght; j++) {
+						//  if (gs[j] == me) continue;
+						//  alert("update gs");
+						xrange = gs[j].xAxisRange();
+						yrange = gs[j].yAxisRange();
+						//   alert(yrange);
+						gs[j].updateOptions({
+							dateWindow: xrange,
+							valueRange: yrange
+						});
+					}
+					blockRedraw = false;
+				}
 			}
-		})
-	}
-	
-	gs = [];
-    var blockRedraw = false;
-    var yLabelName = '温度';
-	var createChartUrl = WWWROOT + '/disinfectSystem/washData/washDataLineChartAction!createChart.do?washAndDisinfectRecordId='+ washAndDisinfectRecordId + '&washDataRecordId=' + washDataRecordId +'&time='+new Date().getTime();
-	
-      gs.push(
-        new Dygraph(
-          document.getElementById("div1"), createChartUrl, {
-            rollPeriod: 7,
-            ylabel: yLabelName,
-            //showRoller: true,  // note trailing comma
-            xlabel: '时间',
-            rollPeriod: 0,
-            connectSeparatedPoints :false,
-            drawCallback: function(me, initial) {
-              if (blockRedraw || initial) return;
-              blockRedraw = true;
-              var xrange;
-              var yrange;
-              for (var j = 0; j < gs.lenght; j++) {
-              //  if (gs[j] == me) continue;
-              //  alert("update gs");
-                xrange = gs[j].xAxisRange();
-                yrange = gs[j].yAxisRange();
-             //   alert(yrange);
-                gs[j].updateOptions({
-                 dateWindow: xrange,
-                 valueRange: yrange
-                });
-              }
-              blockRedraw = false;
-            }
-          }
-        )
-      );
-});
+			)
+		);
+
+		if(sstsConfig.enableParameterFileConfirmation){
+			$('#cleaningParaConfirmationBox').show();
+			var codeBox = document.getElementById('cleaningParaConfirmationBarCode');
+			codeBox.addEventListener('keydown', (event) => {
+				if (event.key === 'Enter') {
+					var barcode = codeBox.value;
+					if(barcode == ''){
+						showResult('条码不能为空！');
+						return
+					}
+					UserTableManager.getUserByBarcode(barcode, function (responseText) {
+						if (responseText && responseText !== '') {
+							var result = JSON.parse(responseText);
+							if (!result.success) {
+								showResult(result.message || "不允许登记非本科室人员，请扫描本科室人员条码！");
+								codeBox.value = '';
+								return;
+							}
+							$('#cleaningParaConfirmationMan').html(result.fullName);
+							$('#cleaningParaConfirmationCode').html(result.name);
+							codeBox.value = '';
+						} else {
+							showResult('找不到该条码所对应的人员信息');
+							codeBox.value = '';
+						}
+					});
+				}
+			});
+		}else {
+			$('#cleaningParaConfirmationBox').hide();
+		}
+	});
 </script>
-<table align="center">
-<tbody>
-<tr>
-	<td></td>
-	<td>
-		<p style="text-align:right"><button class="printBtn" type="button" style="display: none;">打印</button></p>
-	</td>
-</tr>
-<tr>
-	<td>
-		<div id="div">
+<button id="print" onclick="printAll()" style="display: none;">打印</button>
+<button id="export" onclick="exportAll()" style="display: none;">导出</button>
+<div id="report-container" style="display: inline-flex;">
+	<div id="div">
+	</div>
+	<div id="left">
+		<div id="cleaningParaConfirmationBox" style="display: none;">
+			<span class="printHidden" style="display: none;" id="cleaningParaConfirmationCode"></span>
+			<p class="printHidden">清洗参数确认人条码：<input type="text" autocomplete="off" id="cleaningParaConfirmationBarCode" /><button onclick="saveCleaningParaConfirmationMan()" style="margin-left: 10px;">确认保存</button></p>
+			<p>清洗参数确认人：　<span id="cleaningParaConfirmationMan"></span></p>
 		</div>
-	</td>
-</tr>
-<tr>
-<td>
-	<div id="div1" style="width:500px; height:400px;"></div>
-</td>
-<td>
-	<div id="div2">
+		<p>清洗机名称：　<span id="rinserName"></span></p>
+		<p>清洗机程序：　<span id="disinfectProgram"></span></p>
+		<p>　开始时间：　<span id="startDate"></span></p>
+		<p>　结束时间：　<span id="endDate"></span></p>
+		<p>清洗操作人：　<span id="operator"></span></p>
+		<p>　　　AO值：　<span id="A0"></span></p>
+		<div id="div1" style="width:500px; height:400px;"></div>
 	</div>
-</td>
-</tbody>
-</table>
-<div id="labelWrap" class="labelWrap" style="display:none">
-<label class="labelClass">A0值:</label> 
-<input id="methodName" type=text readOnly class="textClass">
+	<div id="div2" style="padding-bottom: 30px;"></div>
 </div>
 </body>
+
 </html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfCommon.jsp
===================================================================
diff -u -r40959 -r41012
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfCommon.jsp	(.../washDataChartOfCommon.jsp)	(revision 40959)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfCommon.jsp	(.../washDataChartOfCommon.jsp)	(revision 41012)
@@ -14,12 +14,19 @@
 	<script type="text/javascript" src="${ctx}/echarts-4.2.1/echarts.min.js?version=${svnRevision}"></script>
 	<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
 	<script type="text/javascript" src="washDataChartOfCommon.js?version=${svnRevision}"></script>
+	<script type="text/javascript" src="${ctx}/js/exportPDF/html2canvas.js"></script>
+	<script type="text/javascript" src="${ctx}/js/exportPDF/jspdf.min.js"></script>
 	<script type="text/javascript">
 		var washAndDisinfectRecordId = '${param.washAndDisinfectRecordId}';
 		var WWWROOT = '${ctx}';
 		var deviceModel = '${param.deviceModel}';
 		//FSEYEQ-26：新增型号：super6000(清洗机型号)
 		var XINHUA_PDF_SUPER6000 = '<%=DeviceInterface.XINHUA_PDF_SUPER6000%>';
+		//BJDXZLYY-73：新增洁定型号：
+		var GETING_86_SERIES = '<%= DeviceInterface.GETING_86_SERIES %>';
+		var GETING_SUZHOUJIEDING_46_5 = '<%=DeviceInterface.GETING_SUZHOUJIEDING_46_5%>';
+		//SZSZLYY-66：新增型号：WD500(BJDXZLYY-73:添加为通用)
+		var GETING_WD500 = '<%=DeviceInterface.GETING_WD500%>';
 	</script>
 	<style type="text/css">
 		* {
@@ -77,15 +84,19 @@
 
 <body>
 	<button id="print" onclick="printAll()" style="display: none;">打印</button>
-	<h3>清洗机运行参数</h3>
-	<div class="wash_details_wrapp">
-		<div id="table">
-		</table>
-	</div>
-	<div class="wash_echarts_wrapp">
-		<div class="wash_echarts_item">
-			<div id="washChartId"></div>
+	<button id="export" onclick="exportAll()" style="display: none;">导出</button>
+	<div id="report-container">
+		<h3>清洗机运行参数</h3>
+		<div class="wash_details_wrapp">
+			<div id="table">
+			</table>
 		</div>
+		<div class="wash_echarts_wrapp">
+			<div class="wash_echarts_item">
+				<div id="washChartId"></div>
+			</div>
+		</div>
+		<div id="WD500Table" style="display: none;padding: 30px 20px;"></div>
 	</div>
 </body>