From 9472449b4ca46f482d13b6e628660c61101b443f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 08 五月 2024 14:55:53 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 901bcdb..a5a1780 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -1027,9 +1027,9 @@
}else{
const now = new Date();
console.log(this.count1,this.count2);
- alert(this.$t('Mes Connection failed')+now);
+ console.log(this.$t('Mes Connection failed')+now);
}
- }, 30000);
+ }, 60000);
},
activated() {
this.init();
@@ -1067,10 +1067,18 @@
// this.car2 = 300 + 11.25 * (obj.params[0][1]-this.carlist[1]['start'])/(this.carlist[1]['end']-this.carlist[1]['start'])*100;
}
if (obj.Plc1 != null) {
- this.plc1=this.$t('Plc1 Connection failed');
+ if(obj.Plc1[0]==true){
+ this.plc1="";
+ }else{
+ this.plc1=this.$t('Plc1 Connection failed');
+ }
}
if (obj.Plc2 != null) {
- this.plc2=this.$t('Plc2 Connection failed');
+ if(obj.Plc2[0]==true){
+ this.plc2="";
+ }else{
+ this.plc2=this.$t('Plc2 Connection failed');
+ }
}
this.tableData = obj.tableData[0];
--
Gitblit v1.8.0