From 376f9a04e2c2814d210e2c5177f0e27d115e1b5d Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 23 二月 2024 09:46:35 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue |  112 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 102 insertions(+), 10 deletions(-)

diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
index 636b9d0..302a3d5 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
@@ -201,6 +201,18 @@
       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 === 1) ? 0 : 0 ;
+    // }));
+
+   // const reversedJsonObject = { data: reversedData };
+
+    // 鎻愪氦鏁版嵁鍒板悗绔�
+  //   const reversedJsonString = JSON.stringify(reversedJsonObject);
+  //   console.log('鍙嶈浆鍚�:', reversedJsonString);
+  //   socket?.send(reversedJsonString);
+  // }, 1000);
 
       }
 
@@ -221,6 +233,18 @@
       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 === 1) ? 0 : 0 ;
+    // }));
+
+   // const reversedJsonObject = { data: reversedData };
+
+  //   // 鎻愪氦鏁版嵁鍒板悗绔�
+  //   const reversedJsonString = JSON.stringify(reversedJsonObject);
+  //   console.log('鍙嶈浆鍚�:', reversedJsonString);
+  //   socket?.send(reversedJsonString);
+  // }, 1000);
 
       }
 
@@ -267,6 +291,18 @@
         const jsonString2 = JSON.stringify(jsonObject2);
         console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString2);
         socket?.send(jsonString2);
+        setTimeout(() => {
+    const reversedData = data2.map(values => values.map(value => {
+      return   (!value || value === 1) ? 0 : 0 ;
+    }));
+
+    const reversedJsonObject = { data: reversedData };
+
+    // 鎻愪氦鏁版嵁鍒板悗绔�
+    const reversedJsonString = JSON.stringify(reversedJsonObject);
+    console.log('鍙嶈浆鍚�:', reversedJsonString);
+    socket?.send(reversedJsonString);
+  }, 1000);
 
 
       }
@@ -288,6 +324,18 @@
         const jsonString2 = JSON.stringify(jsonObject2);
         console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString2);
         socket?.send(jsonString2);
+        setTimeout(() => {
+    const reversedData = data2.map(values => values.map(value => {
+      return   (!value || value === 1) ? 0 : 0 ;
+    }));
+
+    const reversedJsonObject = { data: reversedData };
+
+    // 鎻愪氦鏁版嵁鍒板悗绔�
+    const reversedJsonString = JSON.stringify(reversedJsonObject);
+    console.log('鍙嶈浆鍚�:', reversedJsonString);
+    socket?.send(reversedJsonString);
+  }, 1000);
 
 
       }
@@ -428,18 +476,62 @@
               }
 
               //鍚姩
-              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("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 = 0; i < jsonData2.length; i++) {

--
Gitblit v1.8.0