From 7f1806c6a01318f3b1eff38da7c7c41ae82ff8c0 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 11 十二月 2023 13:19:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
index 96cd5e3..8ea33b4 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
@@ -125,6 +125,7 @@
},
+ //鎻愪氦鏂规硶
submitDataToBackend (currentButtonName) {
if (currentButtonName === 'A01缈昏浆鍚姩' || currentButtonName === 'A01 SERVE TURN') {
const data = [];
@@ -308,8 +309,18 @@
});
});
- // 閬嶅巻guzhang鏁扮粍
- for (let i = 0; i < jsonData2.length; i++) {
+
+
+
+
+
+ }
+ }, 50);
+
+ document.addEventListener('mouseover', handleMouseMove);
+
+ // 閬嶅巻guzhang鏁扮粍
+ for (let i = 0; i < jsonData2.length; i++) {
let arr = jsonData2[i];
for (let j = 0; j < arr.length; j++) {
let obj2 = arr[j];
@@ -324,7 +335,7 @@
-
+//鏈洖闆�
for (let i = 0; i < jsonData2.length; i++) {
let arr2 = jsonData2[i];
for (let j = 0; j < arr2.length; j++) {
@@ -356,13 +367,24 @@
}
+ //鏀瑰彉鏈洖闆舵枃瀛�
+for (let i = 0; i < jsonData2.length; i++) {
+ let arr = jsonData2[i];
+ for (let j = 0; j < arr.length; j++) {
+ let obj = arr[j];
+ if (obj.button && obj.button.value===1) {
+ if ( obj.button.name.includes("鏈洖闆�")&& this.language==="zh-CN") {
+ obj.button.name =obj.button.name.replace("鏈洖闆�","宸插洖闆�") ;
+ }
+ if ( obj.button.name.includes("NotZero")) {
+ obj.button.name =obj.button.name.replace("NotZero","Zero") ;
+ }
+ }
+
+}
+}
-
- }
- }, 50);
-
- document.addEventListener('mouseover', handleMouseMove);
};
--
Gitblit v1.8.0