From 3a59de819bb1fbefc3eb4a38fb4f76a11d19a1ae Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 05 一月 2024 15:05:56 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 CanadaMes-ui/src/configuration/ManualJog.json |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 50 insertions(+), 0 deletions(-)

diff --git a/CanadaMes-ui/src/configuration/ManualJog.json b/CanadaMes-ui/src/configuration/ManualJog.json
index 36a392a..40c659a 100644
--- a/CanadaMes-ui/src/configuration/ManualJog.json
+++ b/CanadaMes-ui/src/configuration/ManualJog.json
@@ -4,6 +4,7 @@
       "button": {
         "name": "D01杈撻��",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 0
       },
@@ -13,6 +14,7 @@
       "button": {
         "name": "D02杈撻��",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 0
       },
@@ -22,6 +24,7 @@
       "button": {
         "name": "D03杈撻��",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 1
       },
@@ -31,6 +34,7 @@
       "button": {
         "name": "D04杈撻��",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 1
       },
@@ -40,6 +44,7 @@
       "button": {
         "name": "D05杈撻��",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 1
       },
@@ -49,6 +54,7 @@
       "button": {
         "name": "D06杈撻��",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 1
       },
@@ -58,6 +64,7 @@
       "button": {
         "name": "A01杈撻�佹鍚�",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 0
       },
@@ -67,6 +74,7 @@
       "button": {
         "name": "A01杈撻�佸弽鍚�",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 1
       },
@@ -77,6 +85,7 @@
       "button": {
         "name": "A01琛岃蛋鐐瑰姩",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 0
       },
@@ -86,6 +95,7 @@
       "button": {
         "name": "A01缈昏浆",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 1
       },
@@ -95,6 +105,7 @@
       "button": {
         "name": "A01娉ㄧ數娉�",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 0
       },
@@ -104,6 +115,7 @@
       "button": {
         "name": "A02杈撻�佹鍚�",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 0
       },
@@ -113,6 +125,7 @@
       "button": {
         "name": "A02杈撻�佸弽鍚�",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 1
       },
@@ -122,6 +135,7 @@
       "button": {
         "name": "A02琛岃蛋鐐瑰姩",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 0
       },
@@ -131,6 +145,7 @@
       "button": {
         "name": "A02缈昏浆",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 1
       },
@@ -143,6 +158,7 @@
       "button": {
         "name": "A02娉ㄧ數娉�",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 0
       },
@@ -152,6 +168,7 @@
       "button": {
         "name": "B01杈撻��",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 1
       },
@@ -161,6 +178,7 @@
       "button": {
         "name": "B01琛岃蛋鐐瑰姩",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 1
       },
@@ -171,6 +189,7 @@
       "button": {
         "name": "B01缈昏浆姘旂几",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 0
       },
@@ -180,6 +199,7 @@
       "button": {
         "name": "B01鍗囬檷姘旂几",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 0
       },
@@ -188,6 +208,7 @@
       "button": {
         "name": "B01鍚规皵",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 1
       },
@@ -197,6 +218,7 @@
       "button": {
         "name": "B02杈撻��",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 1
       },
@@ -210,6 +232,7 @@
       "button": {
         "name": "B02琛岃蛋鐐瑰姩",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 1
       },
@@ -219,6 +242,7 @@
       "button": {
         "name": "B02缈昏浆姘旂几",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 0
       },
@@ -228,6 +252,7 @@
       "button": {
         "name": "B02鍗囬檷姘旂几",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 0
       },
@@ -237,6 +262,7 @@
       "button": {
         "name": "B02鍚规皵",
         "value": 0,
+ "value2": 0,
         "address": "DB10.0",
         "state": 1
       },
@@ -244,5 +270,29 @@
     }
    
    
+  ],
+  [
+    {
+      "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