From 20f9e20e45a66a5dad1217c93455685d8174c6cf Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 25 一月 2024 08:09:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/ManualonePosition.vue | 51 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 41 insertions(+), 10 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
index 74eda79..e6f8a34 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
@@ -641,18 +641,49 @@
}
- for (let i = 0; i < jsonData2.length; i++) {
- let arr4 = jsonData2[i];
- for (let j = 0; j < arr4.length; j++) {
- let obj4 = arr4[j];
- if (obj4.button && (obj4.button.name.includes("鍚姩") || obj4.button.name.includes("Start"))) {
- obj4.button.value = obj.qidong[0][i];
- // console.log(obj2.button.value)
- }
- }
+ // for (let i = 0; i < jsonData2.length; i++) {
+ // let arr4 = jsonData2[i];
+ // for (let j = 0; j < arr4.length; j++) {
+ // let obj4 = arr4[j];
+ // if (obj4.button && (obj4.button.name.includes("鍚姩") || obj4.button.name.includes("Start"))) {
+ // obj4.button.value = obj.qidong[0][i];
+ // // console.log(obj2.button.value)
+ // }
+ // }
- }
+ // }
+
+ // for (let i = 0; i < jsonData2.length; i++) {
+ // let arr4 = jsonData2[i];
+ // for (let j = 0; j < arr4.length; j++) {
+ // let obj4 = arr4[j];
+ // if (obj4.button && (obj4.button.name.includes("澶嶄綅") || obj4.button.name.includes("Reast"))) {
+ // obj4.button.value = obj.fuwei[0][i];
+ // // console.log(obj2.button.value)
+ // }
+ // }
+
+
+ // }
+
+ // for (let i = 0; i < jsonData2.length; i++) {
+ // let arr4 = jsonData2[i];
+ // for (let j = 0; j < arr4.length; j++) {
+ // let obj4 = arr4[j];
+ // if (obj4.button && (obj4.button.name.includes("鍥為浂") || obj4.button.name.includes("Home"))) {
+ // obj4.button.value = obj.huiling[0][i];
+ // // console.log(obj2.button.value)
+ // }
+ // }
+
+
+ // }
+
+
+
+
+
for (let i = 2; i < jsonData2.length; i++) {
let arr2 = jsonData2[i];
for (let j = 2; j < arr2.length; j++) {
--
Gitblit v1.8.0