From ca1ae93196be366e707647c42e3039512a2cf45f Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 12 十一月 2024 14:00:24 +0800
Subject: [PATCH] 字段显示，结束任务功能更新，界面调整，测量显示
---
Albania_Mes-ui/src/configuration/parameter2.json | 250 +++++++++++++++++++++++--------------------------
1 files changed, 118 insertions(+), 132 deletions(-)
diff --git a/Albania_Mes-ui/src/configuration/parameter2.json b/Albania_Mes-ui/src/configuration/parameter2.json
index 79f5ef3..025652d 100644
--- a/Albania_Mes-ui/src/configuration/parameter2.json
+++ b/Albania_Mes-ui/src/configuration/parameter2.json
@@ -3,8 +3,8 @@
{
"button": {
"name": "D01鎵嬪姩鐘舵��",
- "value": 0,
-"value2": 0,
+ "value": 0,
+ "value2": 0,
"address": "DB10.0"
},
"type": "4"
@@ -12,8 +12,8 @@
{
"button": {
"name": "娓呴櫎ID",
- "value": 0,
-"value2": 0,
+ "value": 0,
+ "value2": 0,
"address": "DB10.0"
},
"type": "3"
@@ -23,16 +23,16 @@
"read": 33,
"sending": 0,
"type": "0",
- "value": 0,
-"value2": 0
+ "value": 0,
+ "value2": 0
}
],
[
{
"button": {
"name": "D02鎵嬪姩鐘舵��",
- "value": 0,
-"value2": 0,
+ "value": 0,
+ "value2": 0,
"address": "DB10.0"
},
"type": "4"
@@ -40,8 +40,8 @@
{
"button": {
"name": "娓呴櫎ID",
- "value": 0,
-"value2": 0,
+ "value": 0,
+ "value2": 0,
"address": "DB10.0"
},
"type": "3"
@@ -51,16 +51,16 @@
"read": 33,
"sending": 0,
"type": "0",
- "value": 0,
-"value2": 0
+ "value": 0,
+ "value2": 0
}
],
[
{
"button": {
"name": "D03鎵嬪姩鐘舵��",
- "value": 0,
-"value2": 0,
+ "value": 0,
+ "value2": 0,
"address": "DB10.0"
},
"type": "4"
@@ -68,8 +68,8 @@
{
"button": {
"name": "娓呴櫎ID",
- "value": 0,
-"value2": 0,
+ "value": 0,
+ "value2": 0,
"address": "DB10.0"
},
"type": "3"
@@ -79,16 +79,16 @@
"read": 33,
"sending": 0,
"type": "0",
- "value": 0,
-"value2": 0
+ "value": 0,
+ "value2": 0
}
],
[
{
"button": {
"name": "D04鎵嬪姩鐘舵��",
- "value": 0,
-"value2": 0,
+ "value": 0,
+ "value2": 0,
"address": "DB10.0"
},
"type": "4"
@@ -96,8 +96,8 @@
{
"button": {
"name": "娓呴櫎ID",
- "value": 0,
-"value2": 0,
+ "value": 0,
+ "value2": 0,
"address": "DB10.0"
},
"type": "3"
@@ -107,16 +107,16 @@
"read": 33,
"sending": 0,
"type": "0",
- "value": 0,
-"value2": 0
+ "value": 0,
+ "value2": 0
}
],
[
{
"button": {
"name": "D05鎵嬪姩鐘舵��",
- "value": 0,
-"value2": 0,
+ "value": 0,
+ "value2": 0,
"address": "DB10.0"
},
"type": "4"
@@ -124,8 +124,8 @@
{
"button": {
"name": "娓呴櫎ID",
- "value": 0,
-"value2": 0,
+ "value": 0,
+ "value2": 0,
"address": "DB10.0"
},
"type": "3"
@@ -135,16 +135,16 @@
"read": 33,
"sending": 0,
"type": "0",
- "value": 0,
-"value2": 0
+ "value": 0,
+ "value2": 0
}
],
[
{
"button": {
"name": "D06鎵嬪姩鐘舵��",
- "value": 0,
-"value2": 0,
+ "value": 0,
+ "value2": 0,
"address": "DB10.0"
},
"type": "4"
@@ -152,8 +152,8 @@
{
"button": {
"name": "娓呴櫎ID",
- "value": 0,
-"value2": 0,
+ "value": 0,
+ "value2": 0,
"address": "DB10.0"
},
"type": "3"
@@ -163,16 +163,16 @@
"read": 33,
"sending": 0,
"type": "0",
- "value": 0,
-"value2": 0
+ "value": 0,
+ "value2": 0
}
],
[
{
"button": {
"name": "A01鎵嬪姩鐘舵��",
- "value": 0,
-"value2": 0,
+ "value": 0,
+ "value2": 0,
"address": "DB10.0"
},
"type": "4"
@@ -180,8 +180,8 @@
{
"button": {
"name": "娓呴櫎ID",
- "value": 0,
-"value2": 0,
+ "value": 0,
+ "value2": 0,
"address": "DB10.0"
},
"type": "3"
@@ -191,26 +191,24 @@
"read": 33,
"sending": 0,
"type": "0",
- "value": 0,
-"value2": 0
+ "value": 0,
+ "value2": 0
},
{
"name": "ID2",
"read": 33,
"sending": 0,
"type": "0",
- "value": 0,
-"value2": 0
+ "value": 0,
+ "value2": 0
}
-
],
-
[
{
"button": {
"name": "A02鎵嬪姩鐘舵��",
- "value": 0,
-"value2": 0,
+ "value": 0,
+ "value2": 0,
"address": "DB10.0"
},
"type": "4"
@@ -218,8 +216,8 @@
{
"button": {
"name": "娓呴櫎ID",
- "value": 0,
-"value2": 0,
+ "value": 0,
+ "value2": 0,
"address": "DB10.0"
},
"type": "3"
@@ -229,26 +227,24 @@
"read": "ID28",
"sending": 0,
"type": "0",
- "value": 0,
-"value2": 0
+ "value": 0,
+ "value2": 0
}
],
[
{
"button": {
"name": "B01鎵嬪姩鐘舵��",
- "value": 0,
-"value2": 0
-
+ "value": 0,
+ "value2": 0
},
"type": "4"
},
{
"button": {
"name": "娓呴櫎ID",
- "value": 0,
-"value2": 0
-
+ "value": 0,
+ "value2": 0
},
"type": "3"
},
@@ -257,16 +253,16 @@
"read": "ID29",
"sending": 0,
"type": "0",
- "value": 0,
-"value2": 0
+ "value": 0,
+ "value2": 0
}
],
[
{
"button": {
"name": "B02鎵嬪姩鐘舵��",
- "value": 0,
-"value2": 0,
+ "value": 0,
+ "value2": 0,
"address": "DB10.0"
},
"type": "4"
@@ -274,9 +270,8 @@
{
"button": {
"name": "娓呴櫎ID",
- "value": 0,
-"value2": 0
-
+ "value": 0,
+ "value2": 0
},
"type": "3"
},
@@ -285,8 +280,8 @@
"read": "ID210",
"sending": 0,
"type": "0",
- "value": 0,
-"value2": 0
+ "value": 0,
+ "value2": 0
}
],
[
@@ -294,17 +289,16 @@
"name": "鎵弿鏋壂鐮佺殑ID",
"read": 0,
"sending": 0,
-
- "value": 0,
-"value2": 0
+ "value": 0,
+ "value2": 0
},
{
"name": "ID1",
"read": 66,
"sending": 0,
"type": "0",
- "value": 0,
-"value2": 0
+ "value": 0,
+ "value2": 0
}
],
[
@@ -312,17 +306,16 @@
"name": "鎵弿鏋壂鐮佺殑ID",
"read": 0,
"sending": 0,
-
- "value": 0,
-"value2": 0
+ "value": 0,
+ "value2": 0
},
{
"name": "ID2",
"read": 666,
"sending": 0,
"type": "0",
- "value": 0,
-"value2": 0
+ "value": 0,
+ "value2": 0
}
],
[
@@ -331,79 +324,72 @@
"read": 333,
"sending": 0,
"type": "0",
- "value": 0,
-"value2": 0
+ "value": 0,
+ "value2": 0
},
{
"name": "A02鎵�鍦ㄦ牸瀛�",
"read": 333,
"sending": 0,
"type": "0",
- "value": 0,
-"value2": 0
+ "value": 0,
+ "value2": 0
},
{
"name": "B01鎵�鍦ㄦ牸瀛�",
"read": 333,
"sending": 0,
"type": "0",
- "value": 0,
-"value2": 0
+ "value": 0,
+ "value2": 0
},
{
"name": "B02鎵�鍦ㄦ牸瀛�",
"read": 333,
"sending": 0,
"type": "0",
- "value": 0,
-"value2": 0
+ "value": 0,
+ "value2": 0
+ }
+ ],
+ [
+ {
+ "button": {
+ "name": "A01缁堟/缁х画",
+ "value": 0,
+ "address": "DB10.0",
+ "type": "66"
+ }
+ }
+ ],
+ [
+ {
+ "button": {
+ "name": "A02缁堟/缁х画",
+ "value": 0,
+ "address": "DB10.0",
+ "type": "66"
+ }
+ }
+ ],
+ [
+ {
+ "name": "瀛樼墖绛夊緟寤舵椂",
+ "read": 666,
+ "sending": 0,
+ "type": "0",
+ "value": 0,
+ "value2": 0
+ }
+ ],
+ [
+ {
+ "button": {
+ "name": "杞�ュ仠",
+ "value": 0,
+ "address": "DB10.0",
+ "type": "66"
+ }
}
]
- ,
- [
-
- {
- "button": {
- "name": "A01缁堟/缁х画",
- "value":0,
- "address":"DB10.0",
- "type":"66"
- }
- }],
-
-
- [
- {
- "button": {
- "name": "A02缁堟/缁х画",
- "value":0,
- "address":"DB10.0",
- "type":"66"
- }
- }],
- [
-
-
-
- {
- "name": "瀛樼墖绛夊緟寤舵椂",
- "read": 666,
- "sending": 0,
- "type": "0",
- "value": 0,
-"value2": 0
- }
-
-
- ],
- [
- {
- "button": {
- "name": "杞�ュ仠",
- "value":0,
- "address":"DB10.0",
- "type":"66"
- }
- }]
-
]
\ No newline at end of file
--
Gitblit v1.8.0