From d75d7d7d76fe16e133f793cc31bfaea17a10cd24 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 27 十一月 2023 13:39:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/configuration/parameter2.json | 384 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 286 insertions(+), 98 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/parameter2.json b/CanadaMes-ui/src/configuration/parameter2.json
index c75f94c..751535f 100644
--- a/CanadaMes-ui/src/configuration/parameter2.json
+++ b/CanadaMes-ui/src/configuration/parameter2.json
@@ -1,127 +1,315 @@
[
[
- {
- "title": {
- "name": "A01杈撻��"
-
- }
- },
{
- "name": "楂橀�熺嚎閫熷害",
+ "button": {
+ "name": "D01鎵嬪姩鐘舵��",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "4"
+ },
+ {
+ "button": {
+ "name": "娓呴櫎ID",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "3"
+ },
+ {
+ "name": "ID",
"read": 33,
"sending": 0,
"type": "0",
- "address":"DB100.0",
- "count":3
+ "value":0
+
+ }]
+ ,[
+ {
+ "button": {
+ "name": "D02鎵嬪姩鐘舵��",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "4"
},
{
- "name": "浣庨�熺嚎閫熷害",
- "read": 11,
- "sending": 0,
- "type": "0"
+ "button": {
+ "name": "娓呴櫎ID",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "3"
},
{
- "name": "鎵嬪姩閫熷害",
- "read": 22,
+ "name": "ID",
+ "read": 33,
"sending": 0,
- "type": "0"
+ "type": "0",
+ "value":0
+
}
-
-
- ],
-
- [
- {
- "title": {
- "name": "B02杈撻��"
-
- }
- },
+ ]
+ ,[
{
- "name": "楂橀�熺嚎閫熷害",
+ "button": {
+ "name": "D03鎵嬪姩鐘舵��",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "4"
+ },
+ {
+ "button": {
+ "name": "娓呴櫎ID",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "3"
+ },
+ {
+ "name": "ID",
"read": 33,
"sending": 0,
"type": "0",
- "address":"DB100.0",
- "count":3
- },
- {
- "name": "浣庨�熺嚎閫熷害",
- "read": 11,
- "sending": 0,
- "type": "0"
- },
- {
- "name": "鎵嬪姩閫熷害",
- "read": 22,
- "sending": 0,
- "type": "0"
+ "value":0
+
}
-
-
- ],
- [
- {
- "title": {
- "name": "A02杈撻��"
-
- }
- },
+ ]
+ ,[
{
- "name": "楂橀�熺嚎閫熷害",
+ "button": {
+ "name": "D04鎵嬪姩鐘舵��",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "4"
+ },
+ {
+ "button": {
+ "name": "娓呴櫎ID",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "3"
+ },
+ {
+ "name": "ID",
"read": 33,
"sending": 0,
"type": "0",
- "address":"DB100.0",
- "count":3
- },
- {
- "name": "浣庨�熺嚎閫熷害",
- "read": 11,
- "sending": 0,
- "type": "0"
- },
- {
- "name": "鎵嬪姩閫熷害",
- "read": 22,
- "sending": 0,
- "type": "0"
- }
-
-
- ],
- [
- {
- "title": {
- "name": "B02杈撻��"
-
- }
- },
- {
- "name": "楂橀�熺嚎閫熷害",
- "read": 33,
- "sending": 0,
- "type": "0",
- "address":"DB100.0",
- "count":3
- },
- {
- "name": "浣庨�熺嚎閫熷害",
- "read": 11,
- "sending": 0,
- "type": "0"
- },
- {
- "name": "鎵嬪姩閫熷害",
- "read": 22,
- "sending": 0,
- "type": "0"
+ "value":0
+
}
]
-
+
+ ,[
+ {
+ "button": {
+ "name": "D05鎵嬪姩鐘舵��",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "4"
+ },
+ {
+ "button": {
+ "name": "娓呴櫎ID",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "3"
+ },
+ {
+ "name": "ID",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+ }
+
+
+ ]
+ ,[
+ {
+ "button": {
+ "name": "D06鎵嬪姩鐘舵��",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "4"
+ },
+ {
+ "button": {
+ "name": "娓呴櫎ID",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "3"
+ },
+ {
+ "name": "ID",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+ }
+
+
+ ] ,[
+ {
+ "button": {
+ "name": "A01鎵嬪姩鐘舵��",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "4"
+ },
+ {
+ "button": {
+ "name": "娓呴櫎ID",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "3"
+ },
+ {
+ "name": "ID1",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+ },{
+ "name": "ID2",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+ }
+
+
+ ]
+
+ ,[
+ {
+ "button": {
+ "name": "A02鎵嬪姩鐘舵��",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "4"
+ },
+ {
+ "button": {
+ "name": "娓呴櫎ID",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "3"
+ },
+ {
+ "name": "ID",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+ }
+
+
+ ]
+ ,[
+ {
+ "button": {
+ "name": "B01鎵嬪姩鐘舵��",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "4"
+ },
+ {
+ "button": {
+ "name": "娓呴櫎ID",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "3"
+ },
+ {
+ "name": "ID",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+ }
+
+
+ ],[
+ {
+ "button": {
+ "name": "B02鎵嬪姩鐘舵��",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "4"
+ },
+ {
+ "button": {
+ "name": "娓呴櫎ID",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "3"
+ },
+ {
+ "name": "ID",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+ }
+
+
+
+ ]
+
+ ,[
+ {
+ "name": "鎵弿鏋壂鐮佺殑ID",
+ "read": 66,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+ }
+
+
+ ]
+ ,[
+ {
+ "name": "A01褰撳墠鏍煎瓙",
+ "read": 333,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+ },
+ {
+ "name": "A02鎵�鍦ㄦ牸瀛�",
+ "read": 333,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+ },
+ {
+ "name": "B01鎵�鍦ㄦ牸瀛�",
+ "read": 333,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+ },
+ {
+ "name": "B02鎵�鍦ㄦ牸瀛�",
+ "read": 333,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+ }
+
+
+ ]
]
--
Gitblit v1.8.0