From 0ece3ba8c92df0438af52b8de6b9225d8ada4103 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 30 十一月 2023 08:46:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/Action.vue | 89 ++++++++++++--------------------------------
1 files changed, 25 insertions(+), 64 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Action.vue b/CanadaMes-ui/src/views/Electrical/Action.vue
index 68a1f2f..f27af2a 100644
--- a/CanadaMes-ui/src/views/Electrical/Action.vue
+++ b/CanadaMes-ui/src/views/Electrical/Action.vue
@@ -12,10 +12,11 @@
}}</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 to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ServoManual')
}}</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">
@@ -47,62 +48,10 @@
jsonData: data,
activeButton: '',
record: {
- 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',
- 'D03 VFD conveyor',
- 'D04 VFD conveyor',
- 'D05 VFD conveyor',
- 'D06 VFD conveyor',
- 'A01 VFD conveyor',
- 'A02 VFD conveyor',
- 'B01 VFD conveyor',
- 'B02 VFD conveyor',
- 'A01 SERVE TURN JOG+',
- 'A02 SERVE TURN JOG-',
- 'A01 SERVE TRAVEL JOG+',
- 'A02 SERVE TRAVEL JOG-',
- 'B01 SERVE TRAVEL JOG+',
- 'B02 SERVE TRAVEL JOG-',
- 'A01 SERVE TURN POS',
- 'A02 SERVE TURN POS',
- 'A01 SERVE TRAVEL POS',
- 'A02 SERVE TRAVEL POS',
- 'B01 SERVE TRAVEL POS',
- 'B02 SERVE TRAVEL POS',
- 'B01 YV TURN',
- 'B01 YV UP DOWN',
- 'B02 YV TURN',
- 'B02 YV UP DOWN',
- ],
+ params: [],
+
xyData: [
- { name: 'D01 VFD conveyor', value: "0" },
- { name: 'D02 VFD conveyor', value: "0" },
- { name: 'D03 VFD conveyor', value: "0" },
- { name: 'D04 VFD conveyor', value: "0" },
- { name: 'D05 VFD conveyor', value: "0" },
- { name: 'D06 VFD conveyor', value: "0" },
- { name: 'A01 VFD conveyor', value: "0" },
- { name: 'A02 VFD conveyor', value: "0" },
- { name: 'B01 VFD conveyor', value: "0" },
- { name: 'B02 VFD conveyor', value: "0" },
- { name: 'A01 SERVE TURN JOG+', value: "0" },
- { name: 'A02 SERVE TURN JOG-', value: "0" },
- { name: 'A01 SERVE TRAVEL JOG+', value: "0" },
- { name: 'A02 SERVE TRAVEL JOG-', value: "0" },
- { name: 'B01 SERVE TRAVEL JOG+', value: "0" },
- { name: 'B02 SERVE TRAVEL JOG-', value: "0" },
- { name: 'A01 SERVE TURN POS', value: "0" },
- { name: 'A02 SERVE TURN POS', value: "0" },
- { name: 'A01 SERVE TRAVEL POS', value: "0" },
- { name: 'A02 SERVE TRAVEL POS', value: "0" },
- { name: 'B01 SERVE TRAVEL POS', value: "0" },
- { name: 'B02 SERVE TRAVEL POS', value: "0" },
- { name: 'B01 YV TURN', value: "0" },
- { name: 'B01 YV UP DOWN', value: "0" },
- { name: 'B02 YV TURN', value: "0" },
- { name: 'B02 YV UP DOWN', value: "0" },
+
]
,
},
@@ -153,13 +102,25 @@
}
let obj = JSON.parse(msg.data);
-
+ this.record.params[0] = obj.params[0];
+ // console.log(obj.params);
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();
+
+ this.record.xyData = this.jsonData.action;
+
+ for (let a = 0; a < this.record.xyData.length; a++) {
+ if (this.record.params[0][a]) {
+ this.record.xyData[a].value = this.record.params[0][a].toString();
+ }
+
}
+
+ this.record.xyData = this.jsonData.action.filter(item => {
+ return item.state != 0;
+ }
+
+ );
+
const language = this.$i18n.locale;
if (language === 'en-US') {
this.replaceChineseWithEnglish();
@@ -184,14 +145,14 @@
},
send () {
this.messagepack.data = this.record.xyData.map(item => parseInt(item.value)); // 杞崲涓烘暣鏁版暟缁�
- //console.log(this.messagepack);
+ 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);
+
},
}
--
Gitblit v1.8.0