From ff6fd31ba5a4b6a6e74096786ff6d61293d15c73 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 04 十二月 2023 09:08:57 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/configuration/Manualoneposition.json | 594 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 281 insertions(+), 313 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/Manualoneposition.json b/CanadaMes-ui/src/configuration/Manualoneposition.json
index 69edafb..62d0a25 100644
--- a/CanadaMes-ui/src/configuration/Manualoneposition.json
+++ b/CanadaMes-ui/src/configuration/Manualoneposition.json
@@ -1,314 +1,282 @@
-[
- [
- {
- "name": "A01鎵嬪姩鏍煎瓙",
- "value": 0,
- "sending": 0,
- "type": "0",
- "address": "DB100.0",
- "count": 3,
- "state": 1
- },
- {
- "name": "A01瀹氫綅閫熷害",
- "value": 0,
- "sending": 0,
- "address": "DB100.0",
- "type": "0",
- "state": 1
- },
- {
- "name": "A01褰撳墠鏍煎瓙",
- "value": 0,
- "sending": 0,
- "address": "DB100.0",
- "type": "0",
- "state": 1
- },
- {
- "button": {
- "name": "A01鍚姩",
- "value": 0,
- "address": "DB10.0",
- "state": 1
- }
- },
- {
- "button": {
- "name": "鏁呴殰",
- "value": 1,
- "address": "DB10.0",
- "state": 1
- }
- },
- {
- "button": {
- "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
- }
- }
- ],
- [
- {
- "name": "A02鎵嬪姩鏍煎瓙",
- "value": 0,
- "sending": 0,
- "type": "0",
- "address": "DB100.0",
- "count": 3,
- "state": 1
- },
- {
- "name": "A02瀹氫綅閫熷害",
- "value": 0,
- "sending": 0,
- "address": "DB100.0",
- "type": "0",
- "state": 1
- },
- {
- "name": "A02褰撳墠鏍煎瓙",
- "value": 0,
- "sending": 0,
- "address": "DB100.0",
- "type": "0",
- "state": 1
- },
- {
- "button": {
- "name": "A02鍚姩",
- "value": 0,
- "address": "DB10.0",
- "state": 1
- }
- },
- {
- "button": {
- "name": "鏁呴殰",
- "value": 0,
- "address": "DB10.0",
- "state": 1
- }
- },
- {
- "button": {
- "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
- }
- }
- ],
- [
- {
- "name": "B01鎵嬪姩鏍煎瓙",
- "value": 0,
- "sending": 0,
- "type": "0",
- "address": "DB100.0",
- "count": 3,
- "state": 1
- },
- {
- "name": "B01瀹氫綅閫熷害",
- "value": 0,
- "sending": 0,
- "address": "DB100.0",
- "type": "0",
- "state": 1
- },
- {
- "name": "B01褰撳墠鏍煎瓙",
- "value": 0,
- "sending": 0,
- "address": "DB100.0",
- "type": "0",
- "state": 1
- },
- {
- "button": {
- "name": "B01鍚姩",
- "value": 0,
- "address": "DB10.0",
- "state": 1
- }
- },
- {
- "button": {
- "name": "鏁呴殰",
- "value": 0,
- "address": "DB10.0",
- "state": 1
- }
- },
- {
- "button": {
- "name": "澶嶄綅",
- "value": 0,
- "address": "DB10.0",
- "state": 1
- }
- },
- {
- "button": {
- "name": "鏈洖闆�",
- "value": 0,
- "address": "DB10.0",
- "state": 1
- }
- },
- {
- "button": {
- "name": "鍥為浂",
- "value": 0,
- "address": "DB10.0",
- "state": 1
- }
- }
- ],
- [
- {
- "name": "B02鎵嬪姩鏍煎瓙",
- "value": 0,
- "sending": 0,
- "type": "0",
- "address": "DB100.0",
- "count": 3,
- "state": 1
- },
- {
- "name": "B02瀹氫綅閫熷害",
- "value": 0,
- "sending": 0,
- "address": "DB100.0",
- "type": "0",
- "state": 1
- },
- {
- "name": "B02褰撳墠鏍煎瓙",
- "value": 0,
- "sending": 0,
- "address": "DB100.0",
- "type": "0",
- "state": 1
- },
- {
- "button": {
- "name": "B02鍚姩",
- "value": 0,
- "address": "DB10.0",
- "state": 1
- }
- },
- {
- "button": {
- "name": "鏁呴殰",
- "value": 1,
- "address": "DB10.0",
- "state": 1
- }
- },
- {
- "button": {
- "name": "澶嶄綅",
- "value": 0,
- "address": "DB10.0",
- "state": 1
- }
- },
- {
- "button": {
- "name": "鏈洖闆�",
- "value": 0,
- "address": "DB10.0",
- "state": 1
- }
- },
- {
- "button": {
- "name": "鍥為浂",
- "value": 0,
- "address": "DB10.0",
- "state": 1
- }
- }
- ],
- [
- {
- "name": "A01瀹炴椂浣嶇疆",
- "value": 0,
- "sending": 4,
- "type": "0",
- "address": "DB100.0",
- "count": 3,
- "state": 1
- }
- ],
- [
- {
- "name": "A02瀹炴椂浣嶇疆",
- "value": 0,
- "sending": 5,
- "type": "0",
- "address": "DB100.0",
- "count": 3,
- "state": 1
- }
- ],
- [
- {
- "name": "B01瀹炴椂浣嶇疆",
- "value": 0,
- "sending": 6,
- "type": "0",
- "address": "DB100.0",
- "count": 3,
- "state": 1
- }
- ],
- [
- {
- "name": "B02瀹炴椂浣嶇疆",
- "value": 0,
- "sending": 7,
- "type": "0",
- "address": "DB100.0",
- "count": 3,
- "state": 1
- }
- ]
+[
+ [
+ {
+ "name": "A01鎵嬪姩鏍煎瓙",
+ "value": 0,
+ "sending": 0,
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3,
+ "state": 1
+ },
+ {
+ "name": "A01瀹氫綅閫熷害",
+ "value": 0,
+ "sending": 0,
+ "address": "DB100.0",
+ "type": "0",
+ "state": 1
+ },
+ {
+ "name": "A01褰撳墠鏍煎瓙",
+ "value": 0,
+ "sending": 0,
+ "address": "DB100.0",
+ "type": "0",
+ "state": 1
+ },
+ {
+ "button": {
+ "name": "A01鍚姩",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "鏁呴殰",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "澶嶄綅",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ }
+ ],
+ [
+ {
+ "name": "A02鎵嬪姩鏍煎瓙",
+ "value": 0,
+ "sending": 0,
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3,
+ "state": 1
+ },
+ {
+ "name": "A02瀹氫綅閫熷害",
+ "value": 0,
+ "sending": 0,
+ "address": "DB100.0",
+ "type": "0",
+ "state": 1
+ },
+ {
+ "name": "A02褰撳墠鏍煎瓙",
+ "value": 0,
+ "sending": 0,
+ "address": "DB100.0",
+ "type": "0",
+ "state": 1
+ },
+ {
+ "button": {
+ "name": "A02鍚姩",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "鏁呴殰",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "澶嶄綅",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ }
+ ],
+ [
+ {
+ "name": "B01鎵嬪姩鏍煎瓙",
+ "value": 0,
+ "sending": 0,
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3,
+ "state": 1
+ },
+ {
+ "name": "B01瀹氫綅閫熷害",
+ "value": 0,
+ "sending": 0,
+ "address": "DB100.0",
+ "type": "0",
+ "state": 1
+ },
+ {
+ "name": "B01褰撳墠鏍煎瓙",
+ "value": 0,
+ "sending": 0,
+ "address": "DB100.0",
+ "type": "0",
+ "state": 1
+ },
+ {
+ "button": {
+ "name": "B01鍚姩",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "鏁呴殰",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "澶嶄綅",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "鏈洖闆�",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "鍥為浂",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ }
+ ],
+ [
+ {
+ "name": "B02鎵嬪姩鏍煎瓙",
+ "value": 0,
+ "sending": 0,
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3,
+ "state": 1
+ },
+ {
+ "name": "B02瀹氫綅閫熷害",
+ "value": 0,
+ "sending": 0,
+ "address": "DB100.0",
+ "type": "0",
+ "state": 1
+ },
+ {
+ "name": "B02褰撳墠鏍煎瓙",
+ "value": 0,
+ "sending": 0,
+ "address": "DB100.0",
+ "type": "0",
+ "state": 1
+ },
+ {
+ "button": {
+ "name": "B02鍚姩",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "鏁呴殰",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "澶嶄綅",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "鏈洖闆�",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "鍥為浂",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ }
+ ],
+ [
+ {
+ "name": "A01瀹炴椂浣嶇疆",
+ "value": 0,
+ "sending": 4,
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3,
+ "state": 1
+ }
+ ],
+ [
+ {
+ "name": "A02瀹炴椂浣嶇疆",
+ "value": 0,
+ "sending": 5,
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3,
+ "state": 1
+ }
+ ],
+ [
+ {
+ "name": "B01瀹炴椂浣嶇疆",
+ "value": 0,
+ "sending": 6,
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3,
+ "state": 1
+ }
+ ],
+ [
+ {
+ "name": "B02瀹炴椂浣嶇疆",
+ "value": 0,
+ "sending": 7,
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3,
+ "state": 1
+ }
+ ]
]
\ No newline at end of file
--
Gitblit v1.8.0