Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

ZengTao

2023-12-27 50122609dfab86da64df82396a30a30455e5bd67

 CanadaMes-ui/src/layout/index.vue

@@ -251,6 +251,9 @@
              this.alarm = obj.alarmmg[0];
              this.dialogFormVisible2 = true;
            }
          }else{
              this.alarm = obj.alarmmg[0];
              this.dialogFormVisible2 = false;
          }
        }

@@ -258,12 +261,9 @@

          
          
          this.$forceUpdate();
         

if(obj.Abort){




          if (obj.Abort[0].length > 0) {
            this.receivedData=obj.Abort[0][0];
@@ -271,6 +271,7 @@
           this.dialogFormVisible3 = true;
          }
        }
        this.$forceUpdate();

        }.bind(this);
        //关闭事件