Index: ssts-web/src/main/webapp/activeX/install_lodop32_V6.224.exe =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/activeX/CLodop_Setup_for_Win32NT.exe =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/print/LodopFuncs.js =================================================================== diff -u -r15212 -r24870 --- ssts-web/src/main/webapp/disinfectsystem/print/LodopFuncs.js (.../LodopFuncs.js) (revision 15212) +++ ssts-web/src/main/webapp/disinfectsystem/print/LodopFuncs.js (.../LodopFuncs.js) (revision 24870) @@ -1,46 +1,200 @@ -function getLodop(oOBJECT,oEMBED){ -/************************** - 本函数根据浏览器类型决定采用哪个对象作为控件实例： - IE系列、IE内核系列的浏览器采用oOBJECT， - 其它浏览器(Firefox系列、Chrome系列、Opera系列、Safari系列等)采用oEMBED。 -**************************/ - var strHtml2="
打印控件需要升级!点击这里执行升级,升级后请重新进入。"; - var strHtml3="

(注：如曾安装过Lodop旧版附件npActiveXPLugin,请在【工具】->【附加组件】->【扩展】中先卸载它)"; - var LODOP=oEMBED; - - var installHtml = "
"; - installHtml += ""; - installHtml += ""; - installHtml += ""; - installHtml += "
您未安装打印控件
32位浏览器安装
64位浏览器安装
"; - try{ - //=====判断浏览器类型:=============== - var isIE = (navigator.userAgent.indexOf('MSIE')>=0) || (navigator.userAgent.indexOf('Trident')>=0); - var is64IE = isIE && (navigator.userAgent.indexOf('x64')>=0); - //=====如果页面有Lodop就直接使用，没有则新建:========== - if (oOBJECT!=undefined || oEMBED!=undefined) { - if (isIE) - LODOP=oOBJECT; - else - LODOP=oEMBED; - } +var CreatedOKLodop7766 = null, CLodopIsLocal; - if ((LODOP==null)||(typeof(LODOP.VERSION)=="undefined")) { - if (navigator.userAgent.indexOf('Firefox')>=0) - document.documentElement.innerHTML=strHtml3+document.documentElement.innerHTML; - if (navigator.appVersion.indexOf("MSIE")>=0) document.write(installHtml); else - document.documentElement.innerHTML=installHtml+document.documentElement.innerHTML; - } else if (LODOP.VERSION<"6.0.3.0") { - if (navigator.appVersion.indexOf("MSIE")>=0) document.write(strHtml2); else - document.documentElement.innerHTML=strHtml2+document.documentElement.innerHTML; - } - //*****如下空白位置适合调用统一功能:********* - LODOP.SET_LICENSES("广州孚峻信息技术有限公司","864607680718189907689190562356","",""); +//====判断是否需要 Web打印服务CLodop:=== +//===(不支持插件的浏览器版本需要用它)=== +function needCLodop() { + try { + var ua = navigator.userAgent; + if (ua.match(/Windows\sPhone/i)) + return true; + if (ua.match(/iPhone|iPod|iPad/i)) + return true; + if (ua.match(/Android/i)) + return true; + if (ua.match(/Edge\D?\d+/i)) + return true; - //******************************************* - return LODOP; - }catch(err){ - document.documentElement.innerHTML="
Error:"+installHtml+"
"; - return LODOP; - } + var verTrident = ua.match(/Trident\D?\d+/i); + var verIE = ua.match(/MSIE\D?\d+/i); + var verOPR = ua.match(/OPR\D?\d+/i); + var verFF = ua.match(/Firefox\D?\d+/i); + var x64 = ua.match(/x64/i); + if ((!verTrident) && (!verIE) && (x64)) + return true; + else if (verFF) { + verFF = verFF[0].match(/\d+/); + if ((verFF[0] >= 41) || (x64)) + return true; + } else if (verOPR) { + verOPR = verOPR[0].match(/\d+/); + if (verOPR[0] >= 32) + return true; + } else if ((!verTrident) && (!verIE)) { + var verChrome = ua.match(/Chrome\D?\d+/i); + if (verChrome) { + verChrome = verChrome[0].match(/\d+/); + if (verChrome[0] >= 41) + return true; + } + } + return false; + } catch (err) { + return true; + } } + +//====页面引用CLodop云打印必须的JS文件,用双端口(8000和18000）避免其中某个被占用：==== +if (needCLodop()) { + var src1 = "http://localhost:8000/CLodopfuncs.js?priority=1"; + var src2 = "http://localhost:18000/CLodopfuncs.js?priority=0"; + + var head = document.head || document.getElementsByTagName("head")[0] || document.documentElement; + var oscript = document.createElement("script"); + oscript.src = src1; + head.insertBefore(oscript, head.firstChild); + oscript = document.createElement("script"); + oscript.src = src2; + head.insertBefore(oscript, head.firstChild); + CLodopIsLocal = !!((src1 + src2).match(/\/\/localho|\/\/127.0.0./i)); +} + +//====获取LODOP对象的主过程：==== +function getLodop(oOBJECT, oEMBED) { + + var strHtmInstall = "
打印控件未安装!点击这里执行安装,安装后请刷新页面或重新进入。"; + var strHtmUpdate = "
打印控件需要升级!点击这里执行升级,升级后请重新进入。"; + var strHtm64_Install = "
打印控件未安装!点击这里执行安装,安装后请刷新页面或重新进入。"; + var strHtm64_Update = "
打印控件需要升级!点击这里执行升级,升级后请重新进入。"; + var strHtmFireFox = "

（注意：如曾安装过Lodop旧版附件npActiveXPLugin,请在【工具】->【附加组件】->【扩展】中先卸它）"; + var strHtmChrome = "

(如果此前正常，仅因浏览器升级或重安装而出问题，需重新执行以上安装）"; + var strCLodopInstall_1 = "
Web打印服务CLodop未安装启动，点击这里下载执行安装"; + var strCLodopInstall_2 = "
（若此前已安装过，可点这里直接再次启动）"; + var strCLodopInstall_3 = "，成功后请刷新本页面。"; + var strCLodopUpdate = "
Web打印服务CLodop需升级!点击这里执行升级,升级后请刷新页面。"; + var LODOP; + try { + var ua = navigator.userAgent; + var isIE = !!(ua.match(/MSIE/i)) || !!(ua.match(/Trident/i)); + if (needCLodop()) { + try { + LODOP = getCLodop(); + } catch (err) {} + if (!LODOP && document.readyState !== "complete") { + alert("网页还没下载完毕，请稍等一下再操作."); + return; + } + if (!LODOP) { + throw strCLodopInstall_1 + strCLodopInstall_3 ; +// document.documentElement.innerHTML = strCLodopInstall_1 + (CLodopIsLocal ? strCLodopInstall_2 : "") + strCLodopInstall_3 + document.documentElement.innerHTML; +// return; + } else { + if (CLODOP.CVERSION < "3.0.6.0") { + throw strCLodopUpdate; +// document.body.innerHTML = strCLodopUpdate + document.body.innerHTML; + } + if (oEMBED && oEMBED.parentNode) + oEMBED.parentNode.removeChild(oEMBED); + if (oOBJECT && oOBJECT.parentNode) + oOBJECT.parentNode.removeChild(oOBJECT); + } + } else { + var is64IE = isIE && !!(ua.match(/x64/i)); + //=====如果页面有Lodop就直接使用，没有则新建:========== + if (oOBJECT || oEMBED) { + if (isIE) + LODOP = oOBJECT; + else + LODOP = oEMBED; + } else if (!CreatedOKLodop7766) { + LODOP = document.createElement("object"); + LODOP.setAttribute("width", 0); + LODOP.setAttribute("height", 0); + LODOP.setAttribute("style", "position:absolute;left:0px;top:-100px;width:0px;height:0px;"); + if (isIE) + LODOP.setAttribute("classid", "clsid:2105C259-1E0C-4534-8141-A753534CB4CA"); + else + LODOP.setAttribute("type", "application/x-print-lodop"); + document.documentElement.appendChild(LODOP); + CreatedOKLodop7766 = LODOP; + } else + LODOP = CreatedOKLodop7766; + //=====Lodop插件未安装时提示下载地址:========== + if ((!LODOP) || (!LODOP.VERSION)) { + if (ua.indexOf('Chrome') >= 0) +// document.body.innerHTML = strHtmChrome + document.body.innerHTML; + throw strHtmChrome; + if (ua.indexOf('Firefox') >= 0) + throw (is64IE ? strHtm64_Install : strHtmInstall); +// document.body.innerHTML = strHtmFireFox + document.body.innerHTML; +// document.body.innerHTML = (is64IE ? strHtm64_Install : strHtmInstall) + document.body.innerHTML; +// return LODOP; + } + } + if (LODOP.VERSION < "6.0.3.0") { + if (!needCLodop()) + throw (is64IE ? strHtm64_Update : strHtmUpdate); +// document.body.innerHTML = (is64IE ? strHtm64_Update : strHtmUpdate) + document.body.innerHTML; +// return LODOP; + } + //===如下空白位置适合调用统一功能(如注册语句、语言选择等):== + LODOP.SET_LICENSES("广州孚峻信息技术有限公司","864607680718189907689190562356","",""); + + + //======================================================= + return LODOP; + } catch (err) { + document.documentElement.innerHTML="
Error:"+err+"
"; + return LODOP; +// alert("getLodop出错:" + err); + } +} + + +//function getLodop(oOBJECT,oEMBED){ +///************************** +// 本函数根据浏览器类型决定采用哪个对象作为控件实例： +// IE系列、IE内核系列的浏览器采用oOBJECT， +// 其它浏览器(Firefox系列、Chrome系列、Opera系列、Safari系列等)采用oEMBED。 +//**************************/ +// var LODOP=oEMBED; +// +// var installHtml = "
"; +// installHtml += ""; +// installHtml += ""; +// installHtml += ""; +// installHtml += "
您未安装打印控件
32位浏览器安装
64位浏览器安装
"; +// var strCLodopInstall_1 = "
Web打印服务CLodop未安装启动，点击这里下载执行安装"; +// +// try{ +// //=====判断浏览器类型:=============== +// var isIE = (navigator.userAgent.indexOf('MSIE')>=0) || (navigator.userAgent.indexOf('Trident')>=0); +// var is64IE = isIE && (navigator.userAgent.indexOf('x64')>=0); +// //=====如果页面有Lodop就直接使用，没有则新建:========== +// if (oOBJECT!=undefined || oEMBED!=undefined) { +// if (isIE) +// LODOP=oOBJECT; +// else +// LODOP=oEMBED; +// } +// +// if ((LODOP==null)||(typeof(LODOP.VERSION)=="undefined")) { +// if (navigator.userAgent.indexOf('Firefox')>=0) +// document.documentElement.innerHTML=strHtml3+document.documentElement.innerHTML; +// if (navigator.appVersion.indexOf("MSIE")>=0) document.write(installHtml); else +// document.documentElement.innerHTML=installHtml+document.documentElement.innerHTML; +// } else if (LODOP.VERSION<"6.0.3.0") { +// if (navigator.appVersion.indexOf("MSIE")>=0) document.write(strHtml2); else +// document.documentElement.innerHTML=strHtml2+document.documentElement.innerHTML; +// } +// //*****如下空白位置适合调用统一功能:********* +// LODOP.SET_LICENSES("广州孚峻信息技术有限公司","864607680718189907689190562356","",""); +// +// //******************************************* +// return LODOP; +// }catch(err){ +// document.documentElement.innerHTML="
Error:"+installHtml+"
"; +// return LODOP; +// } +//} + + Index: ssts-web/src/main/webapp/activeX/install_lodop64_V6.224..exe =================================================================== diff -u Binary files differ