From 4f3aa71ed602c1abbafa638591b20abc3c7be224 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 18 一月 2024 10:03:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 CanadaMes-ui/src/views/Electrical/ManualonePosition.vue |   92 ++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 88 insertions(+), 4 deletions(-)

diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
index bde607c..79d41fa 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
@@ -38,6 +38,14 @@
       <router-link   v-if="hasPermission" to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
         $t('Speed parameter settings')
       }}</router-link>
+
+<router-link  v-if="hasPermission"
+        to="/Electrical/InteractionState"
+        tag="el-button"
+        type="text"
+        active-class="blue-button"
+        >{{ $t("InteractionState") }}</router-link
+      >
       
     </el-breadcrumb>
 
@@ -201,6 +209,9 @@
 console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
 socket?.send(jsonString);
 event.target.blur(); // 鍙栨秷杈撳叆妗嗙劍鐐�
+
+
+
     },
     A02start(event){
       const data = [];
@@ -313,6 +324,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 === 1) ? 0 : 0 ;
+    }));
+
+    const reversedJsonObject = { data: reversedData };
+
+    // 鎻愪氦鏁版嵁鍒板悗绔�
+    const reversedJsonString = JSON.stringify(reversedJsonObject);
+    console.log('鍙嶈浆鍚�:', reversedJsonString);
+    socket?.send(reversedJsonString);
+  }, 1000);
+  this.$forceUpdate();
 
       }
 
@@ -333,6 +357,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 === 1) ? 0 : 0 ;
+    }));
+
+    const reversedJsonObject = { data: reversedData };
+
+    // 鎻愪氦鏁版嵁鍒板悗绔�
+    const reversedJsonString = JSON.stringify(reversedJsonObject);
+    console.log('鍙嶈浆鍚�:', reversedJsonString);
+    socket?.send(reversedJsonString);
+  }, 1000);
+  this.$forceUpdate();
 
       }
 
@@ -353,6 +390,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 === 1) ? 0 : 0 ;
+    }));
+
+    const reversedJsonObject = { data: reversedData };
+
+    // 鎻愪氦鏁版嵁鍒板悗绔�
+    const reversedJsonString = JSON.stringify(reversedJsonObject);
+    console.log('鍙嶈浆鍚�:', reversedJsonString);
+    socket?.send(reversedJsonString);
+  }, 1000);
+  this.$forceUpdate();
 
       }
 
@@ -373,6 +423,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 === 1) ? 0 : 0 ;
+    }));
+
+    const reversedJsonObject = { data: reversedData };
+
+    // 鎻愪氦鏁版嵁鍒板悗绔�
+    const reversedJsonString = JSON.stringify(reversedJsonObject);
+    console.log('鍙嶈浆鍚�:', reversedJsonString);
+    socket?.send(reversedJsonString);
+  }, 1000);
+  this.$forceUpdate();
 
       }
 
@@ -419,10 +482,19 @@
         const jsonString2 = JSON.stringify(jsonObject2);
         console.log('鎵�鏈夊浣嶇殑value:', jsonString2);
         socket?.send(jsonString2);
-        // setTimeout(() =>
-        //   window.location.reload(), 2000
-        // )
+        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);
+  this.$forceUpdate();
       }
 
       if (currentButtonName === '鍥為浂' || currentButtonName === 'Home') {
@@ -443,6 +515,18 @@
         const jsonString2 = JSON.stringify(jsonObject2);
         console.log('鎵�鏈夊洖闆剁殑value:', 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);
         // setTimeout(() =>
         //   window.location.reload(), 2000
         // )
@@ -506,7 +590,7 @@
 
   if(obj.zuhe1){
 
-// console.log(obj);
+ console.log(obj);
   
               // 鎵ц鏇存柊閫昏緫
               for (let i = 0; i < 4; i++) {

--
Gitblit v1.8.0