Merge remote-tracking branch 'origin/dev' into dev

src/css/common.css

@@ -15,7 +15,19 @@ a {
 .avue-main {
   transition: all 0.3s;
 }
+.dy-font{
+      z-index: 99999999999;
+    position: fixed;
+    top: 3%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: 100%;
+    height: 5%;
+    background-color: #fff;
+    /* display: flex; */
+    /* justify-content: flex-start; */
 
+}
 .avue-layout {
   display: flex;
   height: 100%;

src/utils/LodopFuncs.js

@@ -93,12 +93,13 @@ export function checkOrTryHttp() {
 
 //==获取LODOP对象主过程,判断是否安装、需否升级:==
 export function getLodop(oOBJECT, oEMBED) {
-    var strFontTag = "<br><font color='#FF00FF'>打印控件";
+    var strFontTag = "<br><font class='dy-font' color='#FF00FF'>打印控件";
     var strLodopInstall = strFontTag + "未安装!点击这里<a href='install_lodop32.exe' target='_self'>执行安装</a>";
     var strLodopUpdate = strFontTag + "需要升级!点击这里<a href='install_lodop32.exe' target='_self'>执行升级</a>";
     var strLodop64Install = strFontTag + "未安装!点击这里<a href='install_lodop64.exe' target='_self'>执行安装</a>";
     var strLodop64Update = strFontTag + "需要升级!点击这里<a href='install_lodop64.exe' target='_self'>执行升级</a>";
-    var strCLodopInstallA = "<br><font color='#FF00FF'>Web打印服务CLodop未安装启动，点击这里<a href='CLodop_Setup_for_Win32NT.exe' target='_self'>下载执行安装</a>";
+    var strCLodopInstallA =
+      "<br><font color='#FF00FF'>Web打印服务CLodop未安装启动，点击这里<a href='http://47.108.51.143:9000/logpm/other/CLodop_Setup_for_Win32NT.exe' target='_self'>下载执行安装</a>";
     var strCLodopInstallB = "<br>（若此前已安装过，可<a href='CLodop.protocol:setup' target='_self'>点这里直接再次启动</a>）";
     var strCLodopUpdate = "<br><font color='#FF00FF'>Web打印服务CLodop需升级!点击这里<a href='CLodop_Setup_for_Win32NT.exe' target='_self'>执行升级</a>";
     var strLodop7FontTag = "<br><font color='#FF00FF'>Web打印服务Lodop7";