From afbddf62e45bce6fd9428cddec36382c75cee53a Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 07 十二月 2023 08:38:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/ServoManualone.vue | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
index 4512f87..0eea377 100644
--- a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
+++ b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
@@ -121,6 +121,8 @@
}
},
submitDataToBackend(currentButtonName) {
+
+//A01鍗婅嚜鍔ㄥ惎鍔ㄦ彁浜�
if (currentButtonName === 'A01鍗婅嚜鍔ㄥ惎鍔�' ||currentButtonName === 'A01 Semi-Auto Start') {
const data = [];
@@ -159,6 +161,7 @@
socket?.send(jsonString);
}
+ //A02鍗婅嚜鍔ㄥ惎鍔� 鎻愪氦
if (currentButtonName === 'A02鍗婅嚜鍔ㄥ惎鍔�' ||currentButtonName === 'A02 Semi-Auto Start') {
const data2 = [];
@@ -199,6 +202,8 @@
}
+ //澶嶄綅鎻愪氦
+
if (currentButtonName === '澶嶄綅' || currentButtonName === 'Reset') {
const data2 = [];
const resetButtonValues = this.jsonData.map(item => {
@@ -227,7 +232,7 @@
// )
}
-
+////鍥為浂鎻愪氦
if (currentButtonName === '鍥為浂' || currentButtonName === 'Home') {
const data3 = [];
const resetButtonValues3 = this.jsonData.map(item => {
@@ -256,7 +261,7 @@
}
-
+//A01鍗婅嚜鍔ㄦ彁浜�
if (currentButtonName === 'A01鍗婅嚜鍔�' || currentButtonName === 'A01 Semi-Auto' ) {
const elements = document.getElementsByClassName('special-class');
@@ -327,18 +332,26 @@
if (currentButtonName === 'A02鍗婅嚜鍔�' || currentButtonName === 'A02 Semi-Auto' ) {
+ // 鑾峰彇鎵�鏈塩lass涓簊pecial-class2鐨勫厓绱�
const elements = document.getElementsByClassName('special-class2');
const data = [];
+ // 閬嶅巻鎵�鏈夊厓绱�
for (let i = 0; i < elements.length; i++) {
+ // 濡傛灉鍏冪礌闅愯棌
if (elements[i].style.display === 'none') {
+ // 鏄剧ず鍏冪礌
elements[i].style.display = ''; // 鏄剧ず鍏冪礌
this.zhi2=1;
+ // 閬嶅巻jsonData
for (let i = 0; i < this.jsonData.length; i++) {
let arr = this.jsonData[i];
+ // 閬嶅巻arr
for (let j = 0; j < arr.length; j++) {
let obj2 = arr[j];
+ // 濡傛灉button鐨刵ame涓篈02鍗婅嚜鍔ㄦ垨鑰匒02 Semi-Auto
if (obj2.button && (obj2.button.name === "A02鍗婅嚜鍔�" || obj2.button.name === "A02 Semi-Auto")) {
+ // 璁剧疆button鐨剉alue涓�1
obj2.button.value = 1;
// console.log(obj2.button.value)
}
@@ -348,13 +361,18 @@
}
}else{
+ // 濡傛灉鍏冪礌鏄剧ず
elements[i].style.display = 'none';
this.zhi2=0;
+ // 閬嶅巻jsonData
for (let i = 0; i < this.jsonData.length; i++) {
let arr = this.jsonData[i];
+ // 閬嶅巻arr
for (let j = 0; j < arr.length; j++) {
let obj2 = arr[j];
+ // 濡傛灉button鐨刵ame涓篈02鍗婅嚜鍔ㄦ垨鑰匒02 Semi-Auto
if (obj2.button && (obj2.button.name === "A02鍗婅嚜鍔�" || obj2.button.name === "A02 Semi-Auto")) {
+ // 璁剧疆button鐨剉alue涓�0
obj2.button.value = 0;
// console.log(obj2.button.value)
}
@@ -365,8 +383,10 @@
}
}
+ // 灏唞hi2娣诲姞鍒癲ata鏁扮粍涓�
data.push([this.zhi2]);
+ // 灏哾ata鏁扮粍娣诲姞鍒癹sonObject涓�
data.unshift([],[],[],[],[],[],[]);
@@ -422,7 +442,7 @@
const handleMouseMove = throttle(function(event) {
const inputBox = document.querySelectorAll('.el-card__body');
const target = event.target;
- if (inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
+ if (obj.zuhe1 && inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
// 鎵ц鏇存柊閫昏緫
for (let i = 0; i < 6; i++) {
jsonData2[i].forEach((item, index) => {
@@ -433,7 +453,7 @@
}
-
+//鏁呴殰鏇存柊
for (let i = 0; i < jsonData2.length; i++) {
let arr = jsonData2[i];
@@ -448,7 +468,7 @@
}
-
+// 澶嶄綅鏇存柊
for (let i = 0; i < jsonData2.length; i++) {
let arr = jsonData2[i];
for (let j = 0; j < arr.length; j++) {
@@ -461,6 +481,7 @@
}
+//鏈洖闆舵洿鏂�
for (let i = 3; i < jsonData2.length; i++) {
let arr2 = jsonData2[i];
@@ -479,6 +500,7 @@
}
// console.log(jsonData2)
+//杩涚墖id
jsonData2.forEach((item) => {
item.forEach((subItem) => {
if (subItem.read === 9999) {
@@ -486,7 +508,7 @@
}
});
});
-
+//鍙栫墖id
jsonData2.forEach((item) => {
item.forEach((subItem) => {
if (subItem.read === 8888) {
@@ -527,6 +549,7 @@
socket?.send(JSON.stringify(this.messagepack));
},
+ //鏇挎崲璇█
replaceChineseWithEnglish() {
@@ -558,7 +581,11 @@
</script>
<style scoped>
+html,body{
+width:100%;
+height:85%;
+}
.item-row {
display: flex;
--
Gitblit v1.8.0