Index: ssts-web/src/main/webapp/disinfectsystem/print/LodopFuncs.js
===================================================================
diff -u -r24870 -r25143
--- ssts-web/src/main/webapp/disinfectsystem/print/LodopFuncs.js (.../LodopFuncs.js) (revision 24870)
+++ ssts-web/src/main/webapp/disinfectsystem/print/LodopFuncs.js (.../LodopFuncs.js) (revision 25143)
@@ -1,4 +1,4 @@
-var CreatedOKLodop7766 = null, CLodopIsLocal;
+var CreatedOKLodop7766 = null, CLodopIsLocal;
//====判断是否需要 Web打印服务CLodop:===
//===(不支持插件的浏览器版本需要用它)===
@@ -61,10 +61,10 @@
//====获取LODOP对象的主过程：====
function getLodop(oOBJECT, oEMBED) {
- var strHtmInstall = "
打印控件未安装!点击这里执行安装,安装后请刷新页面或重新进入。";
- var strHtmUpdate = "
打印控件需要升级!点击这里执行升级,升级后请重新进入。";
- var strHtm64_Install = "
打印控件未安装!点击这里执行安装,安装后请刷新页面或重新进入。";
- var strHtm64_Update = "
打印控件需要升级!点击这里执行升级,升级后请重新进入。";
+ var strHtmInstall = "
lodop32_V6.175.exe打印控件未安装!点击这里执行安装,安装后请刷新页面或重新进入。";
+ var strHtmUpdate = "
lodop32_V6.175.exe打印控件需要升级!点击这里执行升级,升级后请重新进入。";
+ var strHtm64_Install = "
lodop64_V6.175.exe打印控件未安装!点击这里执行安装,安装后请刷新页面或重新进入。";
+ var strHtm64_Update = "
lodop64_V6.175.exe打印控件需要升级!点击这里执行升级,升级后请重新进入。";
var strHtmFireFox = "
（注意：如曾安装过Lodop旧版附件npActiveXPLugin,请在【工具】->【附加组件】->【扩展】中先卸它）";
var strHtmChrome = "
(如果此前正常，仅因浏览器升级或重安装而出问题，需重新执行以上安装）";
var strCLodopInstall_1 = "
Web打印服务CLodop未安装启动，点击这里下载执行安装";
@@ -125,6 +125,7 @@
throw strHtmChrome;
if (ua.indexOf('Firefox') >= 0)
throw (is64IE ? strHtm64_Install : strHtmInstall);
+ throw (is64IE ? strHtm64_Install : strHtmInstall);
// document.body.innerHTML = strHtmFireFox + document.body.innerHTML;
// document.body.innerHTML = (is64IE ? strHtm64_Install : strHtmInstall) + document.body.innerHTML;
// return LODOP;
@@ -143,9 +144,8 @@
//=======================================================
return LODOP;
} catch (err) {
- document.documentElement.innerHTML="";
+ document.body.innerHTML="";
return LODOP;
-// alert("getLodop出错:" + err);
}
}