From ad71edbf0f9d2cf2bc46cd2ba1e0239f80949e68 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 21 十二月 2023 15:12:56 +0800
Subject: [PATCH] 增加清除id调用终止出片任务
---
CanadaMes-ui/src/configuration/ManualJog.json | 334 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 197 insertions(+), 137 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/ManualJog.json b/CanadaMes-ui/src/configuration/ManualJog.json
index 02678ba..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,143 +64,9 @@
"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": "B01杈撻��",
- "value": 0,
- "address": "DB10.0",
- "state": 1
- },
- "type": "3"
- },
- {
- "button": {
- "name": "B02杈撻��",
- "value": 0,
- "address": "DB10.0",
- "state": 1
- },
- "type": "3"
- },
- {
- "button": {
- "name": "A01缈昏浆",
- "value": 0,
- "address": "DB10.0",
- "state": 1
- },
- "type": "3"
- },
- {
- "button": {
- "name": "A02缈昏浆",
- "value": 0,
- "address": "DB10.0",
- "state": 1
- },
- "type": "3"
- },
- {
- "button": {
- "name": "A01琛岃蛋鐐瑰姩",
- "value": 0,
- "address": "DB10.0",
- "state": 0
- },
- "type": "3"
- },
- {
- "button": {
- "name": "A02琛岃蛋鐐瑰姩",
- "value": 0,
- "address": "DB10.0",
- "state": 0
- },
- "type": "3"
- },
- {
- "button": {
- "name": "B01琛岃蛋鐐瑰姩",
- "value": 0,
- "address": "DB10.0",
- "state": 1
- },
- "type": "3"
- },
- {
- "button": {
- "name": "B02琛岃蛋鐐瑰姩",
- "value": 0,
- "address": "DB10.0",
- "state": 1
- },
- "type": "3"
- },
- {
- "button": {
- "name": "B02缈昏浆姘旂几",
- "value": 0,
- "address": "DB10.0",
- "state": 0
- },
- "type": "3"
- },
- {
- "button": {
- "name": "B02鍗囬檷姘旂几",
- "value": 0,
- "address": "DB10.0",
- "state": 0
- },
- "type": "3"
- },
- {
- "button": {
- "name": "B02鐢电闃�",
- "value": 0,
- "address": "DB10.0",
- "state": 1
- },
- "type": "3"
- },
- {
- "button": {
- "name": "B01缈昏浆姘旂几",
- "value": 0,
- "address": "DB10.0",
- "state": 0
- },
- "type": "3"
- },
- {
- "button": {
- "name": "B01鍗囬檷姘旂几",
- "value": 0,
- "address": "DB10.0",
- "state": 0
- },
- "type": "3"
- },
- {
- "button": {
- "name": "B01鐢电闃�",
- "value": 0,
- "address": "DB10.0",
- "state": 1
},
"type": "3"
},
@@ -202,15 +74,28 @@
"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": "A01缈昏浆",
+ "value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 1
},
@@ -220,6 +105,7 @@
"button": {
"name": "A01娉ㄧ數娉�",
"value": 0,
+ "value2": 0,
"address": "DB10.0",
"state": 0
},
@@ -227,12 +113,186 @@
},
{
"button": {
- "name": "A02娉ㄧ數娉�",
+ "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": "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": 1
+ },
+ "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
+ },
+ "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": "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鍚规皵",
+ "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