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/Action.vue | 79 +++++++++++++++++++++++++++++----------
1 files changed, 58 insertions(+), 21 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Action.vue b/CanadaMes-ui/src/views/Electrical/Action.vue
index b53055a..6fbb39c 100644
--- a/CanadaMes-ui/src/views/Electrical/Action.vue
+++ b/CanadaMes-ui/src/views/Electrical/Action.vue
@@ -2,14 +2,20 @@
<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/ServoManualone" 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('Servo Manual')
+ }}</router-link>
</el-breadcrumb>
+
<div>Action</div>
<el-form label-width="100px" style="display: flex;flex-wrap: wrap;" :model="{ messagepack }">
<!-- <div class="kuai_div" v-for="item in record.xyData" :key="item.value">
@@ -21,6 +27,8 @@
<el-input v-model="item.name" style="width: 240px;" class="in_mc" readonly></el-input>
<el-switch v-model="item.value" active-value="1" inactive-value="0" @change="send()"></el-switch>
</div>
+
+
</el-form>
@@ -29,14 +37,17 @@
<script >
import LanguageMixin from '../../lang/LanguageMixin'
+import data from '../../configuration/Action'
let socket;
export default {
- name: "action",
+ name: "Action",
mixins: [LanguageMixin],
data () {
return {
+ jsonData: data,
+ 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 +79,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" },
@@ -107,10 +118,18 @@
}
},
- created () {
+ // created () {
+ // this.init();
+ // },
+ activated(){
+
this.init();
- },
+ },
methods: {
+
+ setActiveButton (buttonName) {
+ this.activeButton = buttonName;
+ },
init () {
let viewname = "action";
@@ -132,23 +151,28 @@
};
// 娴忚鍣ㄧ鏀舵秷鎭紝鑾峰緱浠庢湇鍔＄鍙戦�佽繃鏉ョ殑鏂囨湰娑堟伅
socket.onmessage = (msg) => {
+ //console.log("鏀跺埌鏁版嵁====" + msg.data);
if (!msg.data) {
return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
}
let obj = JSON.parse(msg.data);
- this.record.params[0] = obj.params[0];
- for (let a = 0; a <= this.record.params[0].length - 1; a++) {
- if (!this.record.xyData[a]) {
- this.record.xyData[a] = { name: this.record.canshu[a], value: this.record.params[0][a].toString() };
- } else {
+ if (obj.params) {
+ this.record.params[0] = obj.params[0];
+ for (let a = 0; a <= this.record.params[0].length - 1; a++) {
+ this.record.xyData[a].name = this.jsonData.action[a].name;
this.record.xyData[a].value = this.record.params[0][a].toString();
}
+ const language = this.$i18n.locale;
+ if (language === 'en-US') {
+ this.replaceChineseWithEnglish();
+ } else {
+ this.localizedRoles = [...this.record.xyData];
+ }
}
-
- // console.log(this.record.xyData);
this.$forceUpdate();
+ this.replaceChineseWithEnglish();
};
//鍏抽棴浜嬩欢
@@ -159,6 +183,9 @@
socket.onerror = function () {
console.log("websocket鍙戠敓浜嗛敊璇�");
}
+ this.$router.afterEach(function(){
+ socket.close();
+ })
}
},
@@ -166,7 +193,13 @@
this.messagepack.data = this.record.xyData.map(item => parseInt(item.value)); // 杞崲涓烘暣鏁版暟缁�
//console.log(this.messagepack);
socket?.send(JSON.stringify(this.messagepack));
- }
+ },
+ //璇█杞崲
+ replaceChineseWithEnglish () {
+ const translation = this.$t('langActions');
+ this.record.xyData = this.record.xyData.map(item => { return { name: translation[item.name] || item.name, value: item.value }; });
+ console.log(translation);
+ },
}
@@ -179,7 +212,7 @@
</script>
-<style>
+<style scoped>
.kuai_div {
/* width: 30%; */
margin-bottom: 30px;
@@ -203,4 +236,8 @@
.el-input__inner {
border: none;
}
+
+.blue-button {
+ background-color: skyblue;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0