From 0417fafe757f09bfb166b1dd1d9f096e966a30d8 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期六, 11 五月 2024 09:38:43 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/configuration/Positioning1.json | 160 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 125 insertions(+), 35 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/Positioning1.json b/CanadaMes-ui/src/configuration/Positioning1.json
index c39530e..f9345d6 100644
--- a/CanadaMes-ui/src/configuration/Positioning1.json
+++ b/CanadaMes-ui/src/configuration/Positioning1.json
@@ -7,7 +7,7 @@
"unit": "mm",
"value":"0",
"min": 0,
- "max": 100
+ "max": 75
}],
[{
@@ -16,7 +16,9 @@
"sending": 0,
"type": "0",
"unit": "mm",
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
}],
[{
@@ -25,7 +27,9 @@
"sending": 0,
"type": "0",
"unit": "mm",
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":1000
}],
@@ -46,7 +50,9 @@
"unit": "mm",
"value":"0",
"address":"DB100.48",
- "count":10
+ "count":10,
+ "min":0,
+ "max":22000
},
{
"name": "22#鏍煎湴鍧�",
@@ -54,7 +60,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "43#鏍煎湴鍧�",
@@ -62,7 +70,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "64#鏍煎湴鍧�",
@@ -70,7 +80,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "85#鏍煎湴鍧�",
@@ -78,7 +90,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "106#鏍煎湴鍧�",
@@ -86,7 +100,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "127#鏍煎湴鍧�",
@@ -94,7 +110,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "148#鏍煎湴鍧�",
@@ -102,7 +120,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "169#鏍煎湴鍧�",
@@ -110,7 +130,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "190#鏍煎湴鍧�",
@@ -118,7 +140,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
}
@@ -141,7 +165,9 @@
"unit": "mm",
"value":"0",
"address":"DB100.68",
- "count":10
+ "count":10,
+ "min":0,
+ "max":22000
},
{
"name": "22#鏍煎湴鍧�",
@@ -149,7 +175,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "43#鏍煎湴鍧�",
@@ -157,7 +185,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "64#鏍煎湴鍧�",
@@ -165,7 +195,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "85#鏍煎湴鍧�",
@@ -173,7 +205,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "106#鏍煎湴鍧�",
@@ -181,7 +215,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "127#鏍煎湴鍧�",
@@ -189,7 +225,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "148#鏍煎湴鍧�",
@@ -197,7 +235,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "169#鏍煎湴鍧�",
@@ -205,7 +245,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "190#鏍煎湴鍧�",
@@ -213,7 +255,9 @@
"sending": 0,
"type": "0" ,
"unit": "mm",
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
}
@@ -234,16 +278,19 @@
"unit": "mm",
"address":"DB100.0",
"count":3,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":9999
},
{
"name": "22#鏍煎湴鍧�",
"read": 11,
"sending": 0,
"unit": "mm",
- "type": "0"
- ,
- "value":"0"
+ "type": "0",
+ "value":"0",
+ "min":0,
+ "max":9999
},
{
"name": "43#鏍煎湴鍧�",
@@ -251,7 +298,9 @@
"sending": 0,
"unit": "mm",
"type": "0",
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":9999
},
{
"name": "64#鏍煎湴鍧�",
@@ -259,7 +308,9 @@
"sending": 0,
"unit": "mm",
"type": "0",
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":9999
},
{
"name": "85#鏍煎湴鍧�",
@@ -267,7 +318,9 @@
"sending": 0,
"unit": "mm",
"type": "0",
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":9999
}
@@ -287,7 +340,9 @@
"sending": 0,
"unit": "mm",
"type": "0",
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":9999
},
{
"name": "127#鏍煎湴鍧�",
@@ -295,7 +350,9 @@
"sending": 0,
"unit": "mm",
"type": "0",
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":9999
},
{
"name": "148#鏍煎湴鍧�",
@@ -303,7 +360,9 @@
"sending": 0,
"unit": "mm",
"type": "0",
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":9999
},
{
"name": "169#鏍煎湴鍧�",
@@ -311,7 +370,9 @@
"sending": 0,
"unit": "mm",
"type": "0",
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":9999
},
{
"name": "190#鏍煎湴鍧�",
@@ -319,13 +380,42 @@
"sending": 0,
"unit": "mm",
"type": "0",
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":9999
}
]
+
+ ,
+ [
+ {
+ "button": {
+ "name": "A01鍘熺偣璁板繂",
+ "value": 0,
+ "value2": 0,
+ "address": "DB10.0",
+ "state": 1
+
+ },"type": "1"
+
+ },
+ {
+ "button": {
+ "name": "A02鍘熺偣璁板繂",
+ "value": 0,
+ "value2": 0,
+ "address": "DB10.0",
+ "state": 1
+
+ },
+ "type": "1"
+
+ }
+ ]
--
Gitblit v1.8.0