xushining před 3 roky
rodič
revize
67a5e70be1

+ 1 - 0
src/assets/script/BackgroundData.js

@@ -313,6 +313,7 @@ export default class BackgroundData {
             console.log(msg);
         })
         .catch(err=>{
+            this.showdialog("错误","风机控制出现错误",err.message);
             console.log(err);
         });
         console.log(isLockOrUnlock);

+ 1 - 0
src/assets/style/main.css

@@ -11,6 +11,7 @@ body,
     height: 100%;
     background-color: #000000;
     overflow: hidden;
+    font-family: "Microsoft YaHei";
 }
 .el-popover{
     background-color: rgb(36,36,36) !important;

+ 2 - 1
src/components/area/ControlArea.vue

@@ -210,7 +210,8 @@ export default {
     menuClicked(msg) {
       var bd = BackgroundData.getInstance();
       if (!bd.LoginUser) {
-        bd.showdialog("提示", "请登录:", "在控制之前需要先登录!");
+        this.$confirm("控制风机前需要登录!","请登录",{confirmButtonText:'确定',cancelButtonText:'取消',type:'warning'});
+        //bd.showdialog("提示", "请登录:", "在控制之前需要先登录!");
         return;
       }
       if (msg.type == "lock") {