Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
===================================================================
diff -u -r30380 -r30949
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js	(.../sterilizationRecordView.js)	(revision 30380)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js	(.../sterilizationRecordView.js)	(revision 30949)
@@ -1490,4 +1490,7 @@
 			items: grid
 		}]
 	});
+
+	//SZYK-34:针对设备运行结束后提醒功能的改进
+	showPromptUploadDeviceParameterPicture('sterilizationRecord');
 });
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
===================================================================
diff -u -r30920 -r30949
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js	(.../washAndDisinfectView.js)	(revision 30920)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js	(.../washAndDisinfectView.js)	(revision 30949)
@@ -86,7 +86,7 @@
 		url:WWWROOT +'/disinfectSystem/washData/washDataLineChartAction!getRinserTypeInfo.do?washAndDisinfectRecordId='+id+'&time='+new Date().getTime(),
 		success:function(result){
 		var resultStr = Ext.decode(result.responseText);
-		var data = resultStr.data
+		var data = resultStr.data;
 		if(data.deviceBrand == changLong){
 			openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataGridChart.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600');
 		}else if (data.deviceBrand == marge){
@@ -619,4 +619,7 @@
 		var seconds = sstsConfig.autoRefreshWashAndDisinfectRecordListIntervalSeconds;
 		setTimeOut(seconds*1000);
 	}
+
+	//SZYK-34:针对设备运行结束后提醒功能的改进
+	showPromptUploadDeviceParameterPicture('washAndDisinfect');
 });
\ No newline at end of file
Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r30818 -r30949
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 30818)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 30949)
@@ -1793,54 +1793,4 @@
 }
 
 //SZYK-27:提示上传设备运行物理参数
-showPromptUploadDeviceParameterPicture()
-
-function showPromptUploadDeviceParameterPicture(){
-	Ext.Ajax.request({
-		url : WWWROOT + '/system/systemWarningAction!promptUploadDeviceParameterPicture.do',
-		method : 'POST',
-        success : function someFn(response, request){
-			var result = Ext.decode(response.responseText, true);
-			if(result.data.length > 0){
-				var tipGrid = new Ext.grid.GridPanel({
-					store: new Ext.data.Store({
-						reader : new Ext.data.JsonReader({
-							fields : ["content"]
-						})
-					}),
-					columns: [
-						{header: "提示内容", width: 600, dataIndex: 'content'}
-					],
-					stripeRows: true,
-					viewConfig: {
-						forceFit:true
-					},
-					hideHeaders:true,
-					height:200,
-					width:580
-				});
-				var data = [];
-				for(var i = 0;i < result.data.length;i++){
-					//需要提示的告警类型
-					var content = result.data[i];
-					data.push({
-						content:content
-					});
-				}
-				tipGrid.getStore().loadData(data);
-				var tipWindow = new Ext.Window({
-					autoHeight:true,
-					title : '提示信息',
-					width:600,
-					height:400,
-					draggable:true,
-					modal:true,
-					closeAction:'close',
-					items:[tipGrid]
-				});
-				tipWindow.show();
-				Ext.QuickTips.init();
-			}
-        }
-   });
-}
\ No newline at end of file
+showPromptUploadDeviceParameterPicture();
\ No newline at end of file
Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r30935 -r30949
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 30935)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 30949)
@@ -143,6 +143,33 @@
 }
 
 /*
+ *报表查询封装函数(兼容30854之前未打增量之前的方法)
+ */
+function seachReport(url, params, html) {
+    if (html) {
+        document.getElementById('thisIframe').contentWindow.document.body.innerHTML = html;
+        return;
+    }
+    var html = '<form id="reportHiddenForm" style="display:none;" target="thisIframe" method="get" accept-charset="UTF-8">';
+    for (var item in params) {
+        var value = params[item] || '';
+
+        if (value !== '' && typeof value == 'string') {
+            value = value.replace(/%23/g, '#');
+        }
+
+        html += '<input type="hidden" id="' + item + '" name="' + item + '" value="' + value + '">';
+    }
+    html += '</form>';
+
+    setTimeout(function () {
+        document.getElementById('thisIframe').contentWindow.document.body.innerHTML = html;
+        document.getElementById('thisIframe').contentWindow.document.getElementById("reportHiddenForm").action = url;
+        document.getElementById('thisIframe').contentWindow.document.getElementById("reportHiddenForm").submit();
+    }, 1000);
+}
+
+/*
  *IE8以下兼容document.getElementsByClassName
  */
 function documentGetElementsByClassName(className) {
@@ -3594,4 +3621,65 @@
 	var Base64 = new Base64();
 
 	return Base64;
-}));
\ No newline at end of file
+}));
+
+//SZYK-27:提示上传设备运行物理参数
+function showPromptUploadDeviceParameterPicture(warningType){
+    var params = {};
+
+    if(warningType){
+        params = {
+            warningType:warningType
+        }
+    }
+
+	Ext.Ajax.request({
+		url : WWWROOT + '/system/systemWarningAction!promptUploadDeviceParameterPicture.do',
+        method : 'POST',
+        params : params,
+        success : function someFn(response, request){
+			var result = Ext.decode(response.responseText, true);
+			console.log(result)
+			if(result.data.length > 0){
+				var tipGrid = new Ext.grid.GridPanel({
+					store: new Ext.data.Store({
+						reader : new Ext.data.JsonReader({
+							fields : ["content"]
+						})
+					}),
+					columns: [
+						{header: "提示内容", width: 600, dataIndex: 'content'}
+					],
+					stripeRows: true,
+					viewConfig: {
+						forceFit:true
+					},
+					hideHeaders:true,
+					height:200,
+					width:580
+				});
+				var data = [];
+				for(var i = 0;i < result.data.length;i++){
+					//需要提示的告警类型
+					var content = result.data[i];
+					data.push({
+						content:content
+					});
+				}
+				tipGrid.getStore().loadData(data);
+				var tipWindow = new Ext.Window({
+					autoHeight:true,
+					title : '提示信息',
+					width:600,
+					height:400,
+					draggable:true,
+					modal:true,
+					closeAction:'close',
+					items:[tipGrid]
+				});
+				tipWindow.show();
+				Ext.QuickTips.init();
+			}
+        }
+   });
+}
\ No newline at end of file