From 7ae7bcc0245afa4d94516feddc2b8bd60e4253c6 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 11 十二月 2023 10:25:02 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/configuration/parameter2.json | 462 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 334 insertions(+), 128 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/parameter2.json b/CanadaMes-ui/src/configuration/parameter2.json
index c75f94c..a477253 100644
--- a/CanadaMes-ui/src/configuration/parameter2.json
+++ b/CanadaMes-ui/src/configuration/parameter2.json
@@ -1,128 +1,334 @@
-[
-
- [
- {
- "title": {
- "name": "A01杈撻��"
-
- }
- },
- {
- "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"
- }
-
-
- ],
-
- [
- {
- "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"
- }
-
-
- ],
- [
- {
- "title": {
- "name": "A02杈撻��"
-
- }
- },
- {
- "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"
- }
-
-
- ],
- [
- {
- "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"
- }
-
-
- ]
-
-
-
- ]
-
\ No newline at end of file
+[
+ [
+ {
+ "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",
+ "value": 0
+ }
+ ],
+ [
+ {
+ "button": {
+ "name": "D02鎵嬪姩鐘舵��",
+ "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": "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",
+ "value": 0
+ }
+ ],
+ [
+ {
+ "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",
+ "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": "A02ID",
+ "read": "ID28",
+ "sending": 0,
+ "type": "0",
+ "value": 0
+ }
+ ],
+ [
+ {
+ "button": {
+ "name": "B01鎵嬪姩鐘舵��",
+ "value": 0
+
+ },
+ "type": "4"
+ },
+ {
+ "button": {
+ "name": "娓呴櫎ID",
+ "value": 0
+
+ },
+ "type": "3"
+ },
+ {
+ "name": "B01ID",
+ "read": "ID29",
+ "sending": 0,
+ "type": "0",
+ "value": 0
+ }
+ ],
+ [
+ {
+ "button": {
+ "name": "B02鎵嬪姩鐘舵��",
+ "value": 0,
+ "address": "DB10.0"
+ },
+ "type": "4"
+ },
+ {
+ "button": {
+ "name": "娓呴櫎ID",
+ "value": 0
+
+ },
+ "type": "3"
+ },
+ {
+ "name": "B02ID",
+ "read": "ID210",
+ "sending": 0,
+ "type": "0",
+ "value": 0
+ }
+ ],
+ [
+ {
+ "name": "鎵弿鏋壂鐮佺殑ID",
+ "read": 0,
+ "sending": 0,
+
+ "value": 0
+ },
+ {
+ "name": "ID1",
+ "read": 66,
+ "sending": 0,
+ "type": "0",
+ "value": 0
+ }
+ ],
+ [
+ {
+ "name": "鎵弿鏋壂鐮佺殑ID",
+ "read": 0,
+ "sending": 0,
+
+ "value": 0
+ },
+ {
+ "name": "ID2",
+ "read": 666,
+ "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
+ }
+ ]
+ , [
+ {
+ "button": {
+ "name": "鎬ュ仠鍚庝腑姝�/缁х画閫夋嫨",
+ "value":0,
+ "address":"DB10.0",
+ "type":"66"
+ }
+ }
+
+]
+]
\ No newline at end of file
--
Gitblit v1.8.0