Index: ssts-web/src/main/webapp/disinfectsystem/print/LodopFuncs.js
===================================================================
diff -u -r30878 -r31788
--- ssts-web/src/main/webapp/disinfectsystem/print/LodopFuncs.js (.../LodopFuncs.js) (revision 30878)
+++ ssts-web/src/main/webapp/disinfectsystem/print/LodopFuncs.js (.../LodopFuncs.js) (revision 31788)
@@ -52,10 +52,10 @@
var head = document.head || document.getElementsByTagName("head")[0] || document.documentElement;
var oscript = document.createElement("script");
oscript.src = src1;
- head.insertBefore(oscript, head.firstChild);
+ head.appendChild(oscript);
oscript = document.createElement("script");
oscript.src = src2;
- head.insertBefore(oscript, head.firstChild);
+ head.appendChild(oscript);
CLodopIsLocal = !!((src1 + src2).match(/\/\/localho|\/\/127.0.0./i));
}, 2000);
}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r31779 -r31788
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 31779)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 31788)
@@ -39,6 +39,12 @@
<%@ include file="/common/includeExtJsAndCss.jsp"%>
+
+
+
+
+
+
@@ -207,8 +213,10 @@
<%session.removeAttribute("fromLogin");%>
}
-
-var resolution = '${param.resolution}';
+var resolution = 1980;
+if('${param.resolution}'){
+ resolution = '${param.resolution}';
+}
//申请单id
var params_appId = '${param.recyclingApplicationId}';
//条码(即:在待回收界面直接扫描的科室条码或者器械包实例条码)
@@ -228,8 +236,6 @@
skin: 'layer-ext-myskin'
});
//layer.alert('layer皮肤-myskin');
-
-document.write('');
$(document).ready(function() {
if (notInWhiteList(sstsConfig, 'tousseSplitRecycle')) {
$("#customIntoBasketDiv").hide();
@@ -276,7 +282,7 @@
-
+
@@ -763,10 +769,4 @@
-
-
-
-
-
-