From 82c2df0968b099bd589936adc5b28c1ac4827a05 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 04 十二月 2023 08:20:07 +0800
Subject: [PATCH] 更新测试后电气管理
---
CanadaMes-ui/src/views/Electrical/alarm.vue | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/alarm.vue b/CanadaMes-ui/src/views/Electrical/alarm.vue
index 378a61d..93d48b6 100644
--- a/CanadaMes-ui/src/views/Electrical/alarm.vue
+++ b/CanadaMes-ui/src/views/Electrical/alarm.vue
@@ -6,9 +6,10 @@
<router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm') }}</router-link>
<router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link>
<router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link>
- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link>
+ <!-- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link> -->
<router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link>
-
+ <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual')
+ }}</router-link>
</el-breadcrumb>
<div>{{ $t('Alarm') }}</div>
<div class="block">
@@ -101,10 +102,23 @@
},
- created () {
+ // created () {
+ // this.init();
+
+
+ // if (this.shijian1 == "" || this.shijian2 == "") {
+ // //鏌ヨ褰撳ぉ鎶ヨ淇℃伅
+ // this.load();
+ // }
+ // else {
+ // //鏍规嵁鏃堕棿鏌ヨ鎶ヨ淇℃伅
+ // this.selectTime();
+ // }
+
+ // },
+ activated(){
+
this.init();
-
-
if (this.shijian1 == "" || this.shijian2 == "") {
//鏌ヨ褰撳ぉ鎶ヨ淇℃伅
this.load();
@@ -114,7 +128,7 @@
this.selectTime();
}
- },
+ },
methods: {
load () {
@@ -131,6 +145,7 @@
},
selectTime () {
+
//moment闇�瑕佸崟鐙畨杞緷璧栵紝npm install moment
let sj1 = moment(this.shijian1).format('YYYY-MM-DD%20HH:mm');
let sj2 = moment(this.shijian2).format('YYYY-MM-DD%20HH:mm')
@@ -196,6 +211,9 @@
socket.onerror = function () {
console.log("websocket鍙戠敓浜嗛敊璇�");
}
+ this.$router.afterEach(function(){
+ socket.close();
+ })
}
},
@@ -211,7 +229,7 @@
</script>
-<style>
+<style >
.kuai_div {
/* width: 30%; */
margin-bottom: 30px;
--
Gitblit v1.8.0