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/Parameter2.vue |   67 +++++++++++++++++++++++++++++++--
 1 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/CanadaMes-ui/src/views/Electrical/Parameter2.vue b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
index b22cce4..ddcf02d 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter2.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
@@ -76,6 +76,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>
 
     <el-row :gutter="40">
@@ -121,8 +129,15 @@
                     item.button.value === 2 && item.button.name !== 'Clear ID',
                   'yellow-button':
                     item.button.value === 1 && item.button.name !== 'Clear ID',
-                  id:
+                  'id':
                     item.button.value === 1 && item.button.name === 'Clear ID',
+                    'A01jiting':item.button.value === 0 && item.button.name === 'A01Abort/ResumeTasks',
+                    'A02jiting':item.button.value === 0 && item.button.name === 'A02Abort/ResumeTasks',
+                    'emgHMI':item.button.value === 0 && item.button.name === 'emgHMI',
+                    'GA01jiting':item.button.value ===1 && item.button.name === 'A01Abort/ResumeTasks',
+                    'GA02jiting':item.button.value === 1 && item.button.name === 'A02Abort/ResumeTasks',
+                    'GemgHMI':item.button.value === 1 && item.button.name === 'emgHMI'
+
                 }"
                 >{{ item.button.name }}</el-button
               >
@@ -143,7 +158,14 @@
                     item.button.value === 2 && item.button.name !== '娓呴櫎ID',
                   'yellow-button':
                     item.button.value === 1 && item.button.name !== '娓呴櫎ID',
-                  id: item.button.value === 1 && item.button.name === '娓呴櫎ID',
+                  'id': item.button.value === 1 && item.button.name === '娓呴櫎ID',
+                  'A01jiting':item.button.value === 0 && item.button.name === 'A01缁堟/缁х画',
+                  'A02jiting':item.button.value === 0 && item.button.name === 'A02缁堟/缁х画',
+                  'emgHMI':item.button.value === 0 && item.button.name === '杞�ュ仠',
+                  'GA01jiting':item.button.value === 1 && item.button.name === 'A01缁堟/缁х画',
+                  'GA02jiting':item.button.value === 1 && item.button.name === 'A02缁堟/缁х画',
+                  'GemgHMI':item.button.value === 1 && item.button.name === '杞�ュ仠'
+                 
                 }"
                 >{{ item.button.name }}</el-button
               >
@@ -343,7 +365,7 @@
   const jsonString = JSON.stringify(jsonObject);
   console.log("鍙戦�佺殑鍐呭:", jsonString);
   socket?.send(jsonString);
-}, 2000);
+}, 1000);
 
       }
 
@@ -351,10 +373,12 @@
         currentButtonName === "A01Abort/ResumeTasks" ||
         currentButtonName === "A01缁堟/缁х画" ||
         currentButtonName === "A02Abort/ResumeTasks" ||
-        currentButtonName === "A02缁堟/缁х画"
+        currentButtonName === "A02缁堟/缁х画" ||
+        currentButtonName === "杞�ュ仠" || 
+        currentButtonName === "emgHMI" 
       ) {
         const data3 = [];
-        const resetButtonValues3 = [this.jsonData[13][0].button.value2,this.jsonData[14][0].button.value2];
+        const resetButtonValues3 = [this.jsonData[13][0].button.value2,this.jsonData[14][0].button.value2,this.jsonData[16][0].button.value2];
 
         // 灏嗗緱鍒扮殑鍊兼坊鍔犲埌 data 鏁扮粍涓�
         data3.push(resetButtonValues3.flat());
@@ -369,6 +393,16 @@
         const jsonString3 = JSON.stringify(jsonObject3);
         console.log("鎬ュ仠鍚庝腑姝�/缁х画閫夋嫨:", jsonString3);
         socket?.send(jsonString3);
+
+        setTimeout(() => {
+  const jsonObject = { data: [ [],[0, 0, 0], []] };
+  const jsonString = JSON.stringify(jsonObject);
+  console.log("鍙戦�佺殑鍥炲脊鍐呭:", jsonString);
+  socket?.send(jsonString);
+}, 1000);
+
+
+
         // setTimeout(()=>
         //   window.location.reload(),2000
         // )
@@ -439,6 +473,7 @@
             //鎬ュ仠鎸夐挳
             jsonData2[13][0].button.value = obj.jiting[0][0];
             jsonData2[14][0].button.value = obj.jiting[0][1];
+            jsonData2[16][0].button.value = obj.jiting[0][2];
             
 
            
@@ -653,4 +688,26 @@
 .id {
   background-color: green;
 }
+.A02jiting{
+
+  background-color: #66b1ff;
+}
+.A01jiting{
+
+background-color: #66b1ff;
+}
+.emgHMI{
+
+  background-color: #66b1ff;
+}
+.GA02jiting{
+
+  background-color: green;
+}
+.GA01jiting{
+  background-color: green;
+}
+.GemgHMI{
+  background-color: green;
+}
 </style>
\ No newline at end of file

--
Gitblit v1.8.0