From 9a0dd8244282d90b08b16d2c239683bbac62fab2 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 16 一月 2024 15:02:21 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/ServoManualone.vue | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
index e2acb21..956ea14 100644
--- a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
+++ b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
@@ -43,13 +43,13 @@
active-class="blue-button"
>{{ $t("Automatic State") }}</router-link
>
- <router-link
+ <!-- <router-link
to="/Electrical/ManualJog"
tag="el-button"
type="text"
active-class="blue-button"
>{{ $t("ManualJog") }}</router-link
- >
+ > -->
<router-link
to="/Electrical/ManualonePosition"
@@ -89,6 +89,14 @@
type="text"
active-class="blue-button"
>{{ $t("Speed parameter settings") }}</router-link
+ >
+
+ <router-link
+ to="/Electrical/InteractionState"
+ tag="el-button"
+ type="text"
+ active-class="blue-button"
+ >{{ $t("InteractionState") }}</router-link
>
</el-breadcrumb>
@@ -502,7 +510,7 @@
}
if (currentButtonName === "鍥為浂" || currentButtonName === "Home") {
- const data3 = [];
+
const resetButtonValues3 = this.jsonData
.map((item) => {
const buttonItem3 = item.find(
@@ -515,14 +523,14 @@
.filter((value) => value !== null);
// 灏嗗緱鍒扮殑鍊兼坊鍔犲埌 data 鏁扮粍涓�
- data3.push(resetButtonValues3.flat());
+ data.push(resetButtonValues3.flat());
// 鍦� data3 鏁扮粍鍓嶉潰娣诲姞涓や釜绌烘暟缁�
- data3.unshift([], [], []);
- data3.push([], [], [], []);
+ data.unshift([], [], []);
+ data.push([], [], [], []);
// 鍒涘缓 jsonObject3 瀵硅薄锛屽苟娣诲姞 data3 灞炴��
- jsonObject = { data: data3 };
+ jsonObject = { data };
}
if (
currentButtonName === "A01鍗婅嚜鍔�" ||
@@ -657,6 +665,19 @@
const jsonString = JSON.stringify(jsonObject);
console.log("鎵�鏈塗ype涓�0鐨剉alue:", jsonString);
socket?.send(jsonString);
+
+ setTimeout(() => {
+ const reversedData = data.map(values => values.map(value => {
+ return (!value || value === 0) ? 0 : 0 ;
+ }));
+
+ const reversedJsonObject = { data: reversedData };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const reversedJsonString = JSON.stringify(reversedJsonObject);
+ console.log('鍙嶈浆鍚�:', reversedJsonString);
+ socket?.send(reversedJsonString);
+ }, 1000);
},
initWebSocket() {
--
Gitblit v1.8.0