From 0a5cbfbcc2b882a9c8bd15bd28cd4d6ab962ba2b Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 19 一月 2024 08:18:44 +0800
Subject: [PATCH] 修改交互信息状态 页面

---
 CanadaMes-ui/src/configuration/ManualJog.json |  246 ++++++++++++++++++++++++++++++++----------------
 1 files changed, 162 insertions(+), 84 deletions(-)

diff --git a/CanadaMes-ui/src/configuration/ManualJog.json b/CanadaMes-ui/src/configuration/ManualJog.json
index 8ac07e3..40c659a 100644
--- a/CanadaMes-ui/src/configuration/ManualJog.json
+++ b/CanadaMes-ui/src/configuration/ManualJog.json
@@ -3,218 +3,296 @@
     {
       "button": {
         "name": "D01杈撻��",
-        "value": 1,
+        "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 0
-      }
+      },
+      "type": "3"
     },
     {
       "button": {
         "name": "D02杈撻��",
-        "value": 1,
+        "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 0
-      }
+      },
+      "type": "3"
     },
     {
       "button": {
         "name": "D03杈撻��",
-        "value": 1,
+        "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 1
-      }
+      },
+      "type": "3"
     },
     {
       "button": {
         "name": "D04杈撻��",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 1
-      }
+      },
+      "type": "3"
     },
     {
       "button": {
         "name": "D05杈撻��",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 1
-      }
+      },
+      "type": "3"
     },
     {
       "button": {
         "name": "D06杈撻��",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 1
-      }
-    }
-  ],
-  [
-    {
-      "button": {
-        "name": "A01娉ㄦ补娉�",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 0
-      }
-    },
-    {
-      "button": {
-        "name": "A01缈昏浆",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 0
-      }
-    },
-    {
-      "button": {
-        "name": "A01琛岃蛋鐐瑰姩",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      }
+      },
+      "type": "3"
     },
     {
       "button": {
         "name": "A01杈撻�佹鍚�",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
-        "state": 1
-      }
+        "state": 0
+      },
+      "type": "3"
     },
     {
       "button": {
         "name": "A01杈撻�佸弽鍚�",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 1
-      }
-    }
-  ],
-  [
+      },
+      "type": "3"
+    },
+    
     {
       "button": {
-        "name": "A02娉ㄦ补娉�",
+        "name": "A01琛岃蛋鐐瑰姩",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 0
-      }
+      },
+      "type": "3"
     },
     {
       "button": {
-        "name": "A02缈昏浆",
+        "name": "A01缈昏浆",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
-        "state": 0
-      }
+        "state": 1
+      },
+      "type": "3"
     },
     {
       "button": {
-        "name": "A02琛岃蛋鐐瑰姩",
+        "name": "A01娉ㄧ數娉�",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
-        "state": 1
-      }
+        "state": 0
+      },
+      "type": "3"
     },
     {
       "button": {
         "name": "A02杈撻�佹鍚�",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
-        "state": 1
-      }
+        "state": 0
+      },
+      "type": "3"
     },
     {
       "button": {
         "name": "A02杈撻�佸弽鍚�",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 1
-      }
-    }
-  ],
-  [
+      },
+      "type": "3"
+    },
+    {
+      "button": {
+        "name": "A02琛岃蛋鐐瑰姩",
+        "value": 0,
+ "value2": 0,
+        "address": "DB10.0",
+        "state": 0
+      },
+      "type": "3"
+    },
+    {
+      "button": {
+        "name": "A02缈昏浆",
+        "value": 0,
+ "value2": 0,
+        "address": "DB10.0",
+        "state": 1
+      },
+      "type": "3"
+    },
+ 
+   
+
+    {
+      "button": {
+        "name": "A02娉ㄧ數娉�",
+        "value": 0,
+ "value2": 0,
+        "address": "DB10.0",
+        "state": 0
+      },
+      "type": "3"
+    },
     {
       "button": {
         "name": "B01杈撻��",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
-        "state": 0
-      }
+        "state": 1
+      },
+      "type": "3"
     },
     {
       "button": {
         "name": "B01琛岃蛋鐐瑰姩",
         "value": 0,
-        "address": "DB10.0",
-        "state": 0
-      }
-    },
-    {
-      "button": {
-        "name": "B02杈撻��",
-        "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 1
-      }
+      },
+      "type": "3"
     },
-    {
-      "button": {
-        "name": "B02琛岃蛋鐐瑰姩",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      }
-    }
-  ],
-  [
+    
     {
       "button": {
         "name": "B01缈昏浆姘旂几",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 0
-      }
+      },
+      "type": "3"
     },
     {
       "button": {
         "name": "B01鍗囬檷姘旂几",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 0
-      }
+      },
+      "type": "3"
+    }, {
+      "button": {
+        "name": "B01鍚规皵",
+        "value": 0,
+ "value2": 0,
+        "address": "DB10.0",
+        "state": 1
+      },
+      "type": "3"
     },
     {
       "button": {
-        "name": "B01鐢电闃�",
+        "name": "B02杈撻��",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 1
-      }
+      },
+      "type": "3"
+    },
+    
+   
+   
+    
+    {
+      "button": {
+        "name": "B02琛岃蛋鐐瑰姩",
+        "value": 0,
+ "value2": 0,
+        "address": "DB10.0",
+        "state": 1
+      },
+      "type": "3"
     },
     {
       "button": {
         "name": "B02缈昏浆姘旂几",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 0
-      }
+      },
+      "type": "3"
     },
     {
       "button": {
         "name": "B02鍗囬檷姘旂几",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 0
-      }
+      },
+      "type": "3"
     },
     {
       "button": {
-        "name": "B02鐢电闃�",
+        "name": "B02鍚规皵",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 1
-      }
+      },
+      "type": "3"
     }
+   
+   
+  ],
+  [
+    {
+      "button": {
+        "name": "A01琛岃蛋浼烘湇鍥為浂",
+        "value": 0,
+        "value2": 0,
+        "address": "DB10.0",
+        "state": 1
+      },
+      "type": "3"
+    },
+    {
+      "button": {
+        "name": "A02琛岃蛋浼烘湇鍥為浂",
+        "value": 0,
+        "value2": 0,
+        "address": "DB10.0",
+        "state": 1
+      },
+      "type": "3"
+    }
+
+
   ]
 ]
\ No newline at end of file

--
Gitblit v1.8.0