From 2a6d8a858ca7e41436548b35db147b5cdad4e4be Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 14 十二月 2023 14:08:17 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/configuration/Manualoneposition.json | 88 ++++++++++++++------------------------------
1 files changed, 28 insertions(+), 60 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/Manualoneposition.json b/CanadaMes-ui/src/configuration/Manualoneposition.json
index c9a50e8..d9b880c 100644
--- a/CanadaMes-ui/src/configuration/Manualoneposition.json
+++ b/CanadaMes-ui/src/configuration/Manualoneposition.json
@@ -35,15 +35,7 @@
},
{
"button": {
- "name": "A01鏁呴殰",
- "value": 1,
- "address": "DB10.0",
- "state": 1
- }
- },
- {
- "button": {
- "name": "A01澶嶄綅",
+ "name": "鏁呴殰",
"value": 0,
"address": "DB10.0",
"state": 1
@@ -51,18 +43,10 @@
},
{
"button": {
- "name": "A01鏈洖闆�",
+ "name": "澶嶄綅",
"value": 0,
"address": "DB10.0",
- "state": 0
- }
- },
- {
- "button": {
- "name": "A01鍥為浂",
- "value": 0,
- "address": "DB10.0",
- "state": 0
+ "state": 1
}
}
],
@@ -102,7 +86,7 @@
},
{
"button": {
- "name": "A02鏁呴殰",
+ "name": "鏁呴殰",
"value": 0,
"address": "DB10.0",
"state": 1
@@ -110,26 +94,10 @@
},
{
"button": {
- "name": "A02澶嶄綅",
+ "name": "澶嶄綅",
"value": 0,
"address": "DB10.0",
"state": 1
- }
- },
- {
- "button": {
- "name": "鏈洖闆�",
- "value": 0,
- "address": "DB10.0",
- "state": 0
- }
- },
- {
- "button": {
- "name": "鍥為浂",
- "value": 0,
- "address": "DB10.0",
- "state": 0
}
}
],
@@ -169,7 +137,7 @@
},
{
"button": {
- "name": "B01鏁呴殰",
+ "name": "鏁呴殰",
"value": 0,
"address": "DB10.0",
"state": 1
@@ -177,7 +145,7 @@
},
{
"button": {
- "name": "B01澶嶄綅",
+ "name": "澶嶄綅",
"value": 0,
"address": "DB10.0",
"state": 1
@@ -185,15 +153,15 @@
},
{
"button": {
- "name": "B01鏈洖闆�",
- "value": 0,
+ "name": "鏈洖闆�",
+ "value": 1,
"address": "DB10.0",
"state": 1
}
},
{
"button": {
- "name": "B01鍥為浂",
+ "name": "鍥為浂",
"value": 0,
"address": "DB10.0",
"state": 1
@@ -236,7 +204,23 @@
},
{
"button": {
- "name": "B02鏁呴殰",
+ "name": "鏁呴殰",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "澶嶄綅",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "鏈洖闆�",
"value": 1,
"address": "DB10.0",
"state": 1
@@ -244,23 +228,7 @@
},
{
"button": {
- "name": "B02澶嶄綅",
- "value": 0,
- "address": "DB10.0",
- "state": 1
- }
- },
- {
- "button": {
- "name": "B02鏈洖闆�",
- "value": 0,
- "address": "DB10.0",
- "state": 1
- }
- },
- {
- "button": {
- "name": "B02鍥為浂",
+ "name": "鍥為浂",
"value": 0,
"address": "DB10.0",
"state": 1
--
Gitblit v1.8.0