From e4e6c1a0e34cbd5aca446018d19166497d8d7814 Mon Sep 17 00:00:00 2001
From: admin <52323@qq.com>
Date: 星期五, 15 九月 2023 11:38:12 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/Action.vue | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Action.vue b/CanadaMes-ui/src/views/Electrical/Action.vue
index b53055a..ce204d6 100644
--- a/CanadaMes-ui/src/views/Electrical/Action.vue
+++ b/CanadaMes-ui/src/views/Electrical/Action.vue
@@ -2,13 +2,11 @@
<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">Electrical</el-button>
- <router-link to="/Electrical/Parameter" tag="el-button" type="text">Parameter</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text">Action</router-link>
- <router-link to="/Electrical/Sign" tag="el-button" type="text">Sign</router-link>
- <router-link to="/Electrical/State" tag="el-button" type="text">State</router-link>
- <router-link to="/Electrical/alarm" tag="el-button" type="text">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>
</el-breadcrumb>
<div>Action</div>
<el-form label-width="100px" style="display: flex;flex-wrap: wrap;" :model="{ messagepack }">
@@ -31,12 +29,13 @@
import LanguageMixin from '../../lang/LanguageMixin'
let socket;
export default {
- name: "action",
+ name: "Action",
mixins: [LanguageMixin],
data () {
return {
+ activeButton: '',
record: {
- params: [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+ params: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
canshu: [
'D01 VFD conveyor',
'D02 VFD conveyor',
@@ -68,7 +67,7 @@
xyData: [
{ name: 'D01 VFD conveyor', value: "0" },
{ name: 'D02 VFD conveyor', value: "0" },
- { name: 'D03 VFD conveyor', value: "1" },
+ { name: 'D03 VFD conveyor', value: "0" },
{ name: 'D04 VFD conveyor', value: "0" },
{ name: 'D05 VFD conveyor', value: "0" },
{ name: 'D06 VFD conveyor', value: "0" },
@@ -111,6 +110,9 @@
this.init();
},
methods: {
+ setActiveButton(buttonName) {
+ this.activeButton = buttonName;
+ },
init () {
let viewname = "action";
@@ -137,6 +139,7 @@
}
let obj = JSON.parse(msg.data);
+ if (obj.params ){
this.record.params[0] = obj.params[0];
for (let a = 0; a <= this.record.params[0].length - 1; a++) {
@@ -146,7 +149,7 @@
this.record.xyData[a].value = this.record.params[0][a].toString();
}
}
-
+ }
// console.log(this.record.xyData);
this.$forceUpdate();
};
@@ -179,7 +182,7 @@
</script>
-<style>
+<style scoped>
.kuai_div {
/* width: 30%; */
margin-bottom: 30px;
@@ -203,4 +206,7 @@
.el-input__inner {
border: none;
}
+.blue-button {
+ background-color: skyblue;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0