From 31101f632c27c05d15f30ca3084e3ed3da2a29af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 08 十二月 2023 11:42:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/alarm.vue | 80 ++++++++++++++++++++++++++--------------
1 files changed, 52 insertions(+), 28 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/alarm.vue b/CanadaMes-ui/src/views/Electrical/alarm.vue
index 7b20441..4ded8cc 100644
--- a/CanadaMes-ui/src/views/Electrical/alarm.vue
+++ b/CanadaMes-ui/src/views/Electrical/alarm.vue
@@ -2,22 +2,23 @@
<div class="app">
<!--闈㈠寘灞戝鑸尯鍩�-->
<el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
- <router-link to="/home" tag="el-button" type="text">{{ $t('langHome') }}</router-link>
- <el-button type="text">{{ $t('Electrical') }}</el-button>
- <router-link to="/Electrical/Parameter" tag="el-button" type="text">{{ $t('Parameter') }}</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text">{{ $t('Action') }}</router-link>
- <router-link to="/Electrical/Sign" tag="el-button" type="text">{{ $t('Sign') }}</router-link>
- <router-link to="/Electrical/State" tag="el-button" type="text">{{ $t('State') }}</router-link>
- <router-link to="/Electrical/alarm" tag="el-button" type="text">{{ $t('Alarm') }}</router-link>
+
+ <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/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('Parameter')
+ }}</router-link>
</el-breadcrumb>
- <div>Alarm</div>
+ <div>{{ $t('Alarm') }}</div>
<div class="block">
- <span class="demonstration">鏃堕棿锛�</span>
- <el-date-picker v-model="shijian1" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿" align="right"
+ <span class="demonstration">{{ $t('shijian') }}锛�</span>
+ <el-date-picker v-model="shijian1" type="datetime" :placeholder="$t('Pick a day')" align="right"
:picker-options="pickerOptions">
</el-date-picker>
~
- <el-date-picker v-model="shijian2" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿" align="right"
+ <el-date-picker v-model="shijian2" type="datetime" :placeholder="$t('Pick a day')" align="right"
:picker-options="pickerOptions">
</el-date-picker>
@@ -25,13 +26,13 @@
</div>
<el-table :data="localizedRoles" style="width: 100%;" height="550">
- <el-table-column prop="id" label="id" width="80">
+ <el-table-column prop="id" :label="$t('alarmid')" width="80">
</el-table-column>
- <el-table-column prop="content" label="content">
+ <el-table-column prop="content" :label="$t('alacontent')">
</el-table-column>
- <el-table-column prop="timeon" label="time-on">
+ <el-table-column prop="timeon" :label="$t('time-on')">
</el-table-column>
- <el-table-column prop="endTime" label="End Time">
+ <el-table-column prop="endTime" :label="$t('End-Time')">
</el-table-column>
</el-table>
</div>
@@ -67,27 +68,33 @@
pageSize: 10
},
pickerOptions: {
+
+ disabledDate (time) {
+ return time.getTime() > Date.now();
+ },
shortcuts: [{
- text: '浠婂ぉ',
+
+ text: this.$t('today'),
onClick (picker) {
picker.$emit('pick', new Date());
}
- }, {
- text: '鏄ㄥぉ',
+ },
+ {
+ text: this.$t('yesterday'),
onClick (picker) {
const date = new Date();
date.setTime(date.getTime() - 3600 * 1000 * 24);
picker.$emit('pick', date);
}
- }, {
- text: '涓�鍛ㄥ墠',
+ },
+ {
+ text: this.$t('week'),
onClick (picker) {
const date = new Date();
date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit('pick', date);
}
- }],
-
+ }]
},
shijian1: "",
shijian2: "",
@@ -95,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();
@@ -108,7 +128,7 @@
this.selectTime();
}
- },
+ },
methods: {
load () {
@@ -125,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')
@@ -157,7 +178,7 @@
} else {
//console.log("鎮ㄧ殑娴忚鍣ㄦ敮鎸乄ebSocket");
- let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname;
+ let socketUrl = "ws://" + this.$t('ip')+":8888" + "/springboot-vue3/api/talk/" + viewname;
if (socket != null) {
socket.close();
socket = null;
@@ -190,6 +211,9 @@
socket.onerror = function () {
console.log("websocket鍙戠敓浜嗛敊璇�");
}
+ this.$router.afterEach(function(){
+ socket.close();
+ })
}
},
@@ -205,7 +229,7 @@
</script>
-<style>
+<style >
.kuai_div {
/* width: 30%; */
margin-bottom: 30px;
--
Gitblit v1.8.0