加拿大MES项目
parent: 46f29e79 | 补丁 | 提交 | ignore whitespace
wuyouming666
2023-12-15 9e512bb6c8d3bf13a61f2a17d569e73b7c8b16f4 
Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

# Conflicts:
#	CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
#	CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
1个文件已修改
3 ■■■■■ 已修改文件
CanadaMes-ui/src/views/home/index.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 CanadaMes-ui/src/views/home/index.vue


@@ -1740,9 +1740,10 @@


                        else {



                            this.PromptSize = 250;



                            this.CountDowns = "Waiting for reset";



                            this.dialogFormCountDown = false;



                            


                            // if(复位完成==true){



                            //     clearInterval(timer);



                            //     this.dialogFormCountDown = false;



                            // }



                        }



                    }