Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
===================================================================
diff -u -r17082 -r18256
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js (.../sterilizationLoadingForm.js) (revision 17082)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js (.../sterilizationLoadingForm.js) (revision 18256)
@@ -693,6 +693,9 @@
//扫描条码间隔时间(即两次扫描间隔超过这个时间后,将刷新),单位:秒
var freeRefreshIntervalSecond = 5;
+if(sstsConfig.steriliLoadingFreeRefreshIntervalSecond){
+ freeRefreshIntervalSecond = sstsConfig.steriliLoadingFreeRefreshIntervalSecond;
+}
/**
* 空闲扫描计时
Index: ssts-web/src/main/webapp/common/taglibs.jsp
===================================================================
diff -u -r12331 -r18256
--- ssts-web/src/main/webapp/common/taglibs.jsp (.../taglibs.jsp) (revision 12331)
+++ ssts-web/src/main/webapp/common/taglibs.jsp (.../taglibs.jsp) (revision 18256)
@@ -13,5 +13,8 @@
<%@ taglib uri="http://www.forgon.com/tags-operation" prefix="operation"%>
<%@ taglib uri="/struts-tags" prefix="s"%>
<%@page import="com.forgon.register.service.RegisterManagerImpl"%>
-
+<%-- --%>
+<%
+ pageContext.setAttribute("ctx", request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath());
+%>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
===================================================================
diff -u -r18248 -r18256
--- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 18248)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 18256)
@@ -180,6 +180,8 @@
// 是否允许设置科室分组
allowSetDepartGroup : true,
// 科室申领供应室用户在申请单打印后是否允许编辑物品申请数量
- allowEditApplyFormAfterPrint : true
+ allowEditApplyFormAfterPrint : true,
+ //灭菌装载空闲刷新倒计时(单位:秒),未配置此参数的不在页面出现倒计时的提醒信息
+ steriliLoadingFreeRefreshIntervalSecond : 10
}
\ No newline at end of file