From 2a6d8a858ca7e41436548b35db147b5cdad4e4be Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 14 十二月 2023 14:08:17 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/configuration/Positioning1.json | 136 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 134 insertions(+), 2 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/Positioning1.json b/CanadaMes-ui/src/configuration/Positioning1.json
index 740a03a..c39530e 100644
--- a/CanadaMes-ui/src/configuration/Positioning1.json
+++ b/CanadaMes-ui/src/configuration/Positioning1.json
@@ -4,7 +4,10 @@
"read": 33,
"sending": 0,
"type": "0",
- "value":"0"
+ "unit": "mm",
+ "value":"0",
+ "min": 0,
+ "max": 100
}],
[{
@@ -12,6 +15,7 @@
"read": 33,
"sending": 0,
"type": "0",
+ "unit": "mm",
"value":"0"
}],
@@ -20,6 +24,7 @@
"read": 33,
"sending": 0,
"type": "0",
+ "unit": "mm",
"value":"0"
}],
@@ -38,6 +43,7 @@
"read": 33,
"sending": 0,
"type": "0",
+ "unit": "mm",
"value":"0",
"address":"DB100.48",
"count":10
@@ -46,6 +52,7 @@
"name": "22#鏍煎湴鍧�",
"read": 11,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -53,6 +60,7 @@
"name": "43#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -60,6 +68,7 @@
"name": "64#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -67,6 +76,7 @@
"name": "85#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -74,6 +84,7 @@
"name": "106#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -81,6 +92,7 @@
"name": "127#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -88,6 +100,7 @@
"name": "148#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -95,6 +108,7 @@
"name": "169#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -102,6 +116,7 @@
"name": "190#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
}
@@ -123,6 +138,7 @@
"read": 33,
"sending": 0,
"type": "0" ,
+ "unit": "mm",
"value":"0",
"address":"DB100.68",
"count":10
@@ -131,6 +147,7 @@
"name": "22#鏍煎湴鍧�",
"read": 11,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -138,6 +155,7 @@
"name": "43#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -145,6 +163,7 @@
"name": "64#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -152,6 +171,7 @@
"name": "85#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -159,6 +179,7 @@
"name": "106#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -166,6 +187,7 @@
"name": "127#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -173,6 +195,7 @@
"name": "148#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -180,6 +203,7 @@
"name": "169#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -188,12 +212,120 @@
"read": 22,
"sending": 0,
"type": "0" ,
+ "unit": "mm",
"value":"0"
}
- ]
+ ],
+ [
+ {
+ "title": {
+ "name": "B01鏍间綅缃瀹�"
+
+ }, "type": "1"
+ },
+ {
+ "name": "1#鏍煎湴鍧�",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "unit": "mm",
+ "address":"DB100.0",
+ "count":3,
+ "value":"0"
+ },
+ {
+ "name": "22#鏍煎湴鍧�",
+ "read": 11,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0"
+ ,
+ "value":"0"
+ },
+ {
+ "name": "43#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0"
+ },
+ {
+ "name": "64#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0"
+ },
+ {
+ "name": "85#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0"
+ }
+
+
+
+ ],
+
+ [
+ {
+ "title": {
+ "name": "B02浣嶇疆璁惧畾"
+
+ }, "type": "1"
+ },
+ {
+ "name": "106#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0"
+ },
+ {
+ "name": "127#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0"
+ },
+ {
+ "name": "148#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0"
+ },
+ {
+ "name": "169#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0"
+ },
+ {
+ "name": "190#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "unit": "mm",
+ "type": "0",
+ "value":"0"
+ }
+
+
+
+
+ ]
--
Gitblit v1.8.0