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

---
 CanadaMes-ui/src/configuration/ManualJog.json |  127 +++++++++++++++++++++++-------------------
 1 files changed, 70 insertions(+), 57 deletions(-)

diff --git a/CanadaMes-ui/src/configuration/ManualJog.json b/CanadaMes-ui/src/configuration/ManualJog.json
index 36a392a..da0da0b 100644
--- a/CanadaMes-ui/src/configuration/ManualJog.json
+++ b/CanadaMes-ui/src/configuration/ManualJog.json
@@ -1,18 +1,26 @@
 [
+
+ 
   [
-    {
+    
+    {   
       "button": {
         "name": "D01杈撻��",
         "value": 0,
+        "value2": 0,
         "address": "DB10.0",
         "state": 0
+     
+        
       },
       "type": "3"
+      
     },
     {
       "button": {
         "name": "D02杈撻��",
         "value": 0,
+        "value2": 0,
         "address": "DB10.0",
         "state": 0
       },
@@ -22,6 +30,7 @@
       "button": {
         "name": "D03杈撻��",
         "value": 0,
+        "value2": 0,
         "address": "DB10.0",
         "state": 1
       },
@@ -31,6 +40,7 @@
       "button": {
         "name": "D04杈撻��",
         "value": 0,
+        "value2": 0,
         "address": "DB10.0",
         "state": 1
       },
@@ -40,6 +50,7 @@
       "button": {
         "name": "D05杈撻��",
         "value": 0,
+        "value2": 0,
         "address": "DB10.0",
         "state": 1
       },
@@ -49,34 +60,20 @@
       "button": {
         "name": "D06杈撻��",
         "value": 0,
+        "value2": 0,
         "address": "DB10.0",
         "state": 1
       },
       "type": "3"
-    },
-    {
-      "button": {
-        "name": "A01杈撻�佹鍚�",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 0
-      },
-      "type": "3"
-    },
-    {
-      "button": {
-        "name": "A01杈撻�佸弽鍚�",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      },
-      "type": "3"
-    },
-    
+    }],
+    [
+   
+   
     {
       "button": {
         "name": "A01琛岃蛋鐐瑰姩",
         "value": 0,
+        "value2": 0,
         "address": "DB10.0",
         "state": 0
       },
@@ -86,8 +83,19 @@
       "button": {
         "name": "A01缈昏浆",
         "value": 0,
+        "value2": 0,
         "address": "DB10.0",
         "state": 1
+      },
+      "type": "3"
+    },
+    {
+      "button": {
+        "name": "A01杈撻�佹鍚�",
+        "value": 0,
+        "value2": 0,
+        "address": "DB10.0",
+        "state": 0
       },
       "type": "3"
     },
@@ -95,33 +103,20 @@
       "button": {
         "name": "A01娉ㄧ數娉�",
         "value": 0,
+        "value2": 0,
         "address": "DB10.0",
         "state": 0
       },
       "type": "3"
-    },
-    {
-      "button": {
-        "name": "A02杈撻�佹鍚�",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 0
-      },
-      "type": "3"
-    },
-    {
-      "button": {
-        "name": "A02杈撻�佸弽鍚�",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      },
-      "type": "3"
-    },
+    }],
+    [
+    
+    
     {
       "button": {
         "name": "A02琛岃蛋鐐瑰姩",
         "value": 0,
+        "value2": 0,
         "address": "DB10.0",
         "state": 0
       },
@@ -131,18 +126,17 @@
       "button": {
         "name": "A02缈昏浆",
         "value": 0,
+        "value2": 0,
         "address": "DB10.0",
         "state": 1
       },
       "type": "3"
     },
- 
-   
-
     {
       "button": {
-        "name": "A02娉ㄧ數娉�",
+        "name": "A02杈撻�佹鍚�",
         "value": 0,
+        "value2": 0,
         "address": "DB10.0",
         "state": 0
       },
@@ -150,27 +144,31 @@
     },
     {
       "button": {
-        "name": "B01杈撻��",
+        "name": "A02娉ㄧ數娉�",
         "value": 0,
+        "value2": 0,
         "address": "DB10.0",
-        "state": 1
+        "state": 0
       },
       "type": "3"
-    },
+    }],
+    [
+   
     {
       "button": {
         "name": "B01琛岃蛋鐐瑰姩",
         "value": 0,
+        "value2": 0,
         "address": "DB10.0",
         "state": 1
       },
       "type": "3"
     },
-    
     {
       "button": {
         "name": "B01缈昏浆姘旂几",
         "value": 0,
+        "value2": 0,
         "address": "DB10.0",
         "state": 0
       },
@@ -180,14 +178,17 @@
       "button": {
         "name": "B01鍗囬檷姘旂几",
         "value": 0,
+        "value2": 0,
         "address": "DB10.0",
         "state": 0
       },
       "type": "3"
-    }, {
+    },
+    {
       "button": {
-        "name": "B01鍚规皵",
+        "name": "B01杈撻��",
         "value": 0,
+        "value2": 0,
         "address": "DB10.0",
         "state": 1
       },
@@ -195,21 +196,21 @@
     },
     {
       "button": {
-        "name": "B02杈撻��",
+        "name": "B01鍚规皵",
         "value": 0,
+        "value2": 0,
         "address": "DB10.0",
         "state": 1
       },
       "type": "3"
-    },
-    
+    }],
+    [
    
-   
-    
     {
       "button": {
         "name": "B02琛岃蛋鐐瑰姩",
         "value": 0,
+        "value2": 0,
         "address": "DB10.0",
         "state": 1
       },
@@ -219,6 +220,7 @@
       "button": {
         "name": "B02缈昏浆姘旂几",
         "value": 0,
+        "value2": 0,
         "address": "DB10.0",
         "state": 0
       },
@@ -228,6 +230,7 @@
       "button": {
         "name": "B02鍗囬檷姘旂几",
         "value": 0,
+        "value2": 0,
         "address": "DB10.0",
         "state": 0
       },
@@ -235,14 +238,24 @@
     },
     {
       "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": 1
       },
       "type": "3"
     }
-   
-   
   ]
+ 
 ]
\ No newline at end of file

--
Gitblit v1.8.0