修改复位倒计时为全局弹出

ZengTao

2023-12-26 7677ec6038c661951fcd74a2acfce65f2e83a01e

 CanadaMes-ui/src/views/home/index.vue

@@ -46,9 +46,6 @@
    background-color: blue;

}



.black {

    background-color: black;

}



.yellow {

    background-color: yellow;

@@ -155,7 +152,7 @@
.box {

    width: 90%;

    margin-left: 5%;

    color: black;

    color: red;

    font-size: 12px;

    overflow: hidden;

    height: 20px;

@@ -899,6 +896,7 @@
                    this.cagelist4 = obj.cagelist4[0];

                    this.tasklist1 = obj.tasklist1[0];

                    this.tasklist2 = obj.tasklist2[0];

                    this.alarm = obj.alarmmg[0];

                    // if (obj.alarmmg[0].length > 0) {

                    //     if (this.alarm.length > 0) {

                    //         if (this.alarm[this.alarm.length - 1].id != obj.alarmmg[0][obj.alarmmg[0].length - 1].id) {

@@ -910,22 +908,22 @@
                    //         this.dialogFormVisible2 = true;

                    //     }

                    // }

                    //是否急停

                    if (obj.emergencystop != null) {

                        this.EmergencyStop = obj.emergencystop[0];

                    }

                    // //是否急停

                    // if (obj.emergencystop != null) {

                    //     this.EmergencyStop = obj.emergencystop[0];

                    // }



                    //复位倒计时

                    if (obj.countdown != null) {

                        if ((obj.countdown[0] == true && this.CountDowns == 0) || this.EmergencyStop == true) {

                            this.CountDown();

                        }

                    }

                    // //复位倒计时

                    // if (obj.countdown != null) {

                    //     if ((obj.countdown[0] == true && this.CountDowns == 0) || this.EmergencyStop == true) {

                    //         this.CountDown();

                    //     }

                    // }



                    //复位完成信号

                    if (obj.reset != null) {

                        this.reset = obj.reset[0];

                    }

                    // //复位完成信号

                    // if (obj.reset != null) {

                    //     this.reset = obj.reset[0];

                    // }



                    //是否有进片请求

                    if (obj.D01RequestState != null) {