From 0f3ea8b9dd921b942015d30c5dfce06af25cd71c Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 13 十二月 2023 09:15:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/configuration/Positioning1.json | 132 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 131 insertions(+), 1 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/Positioning1.json b/CanadaMes-ui/src/configuration/Positioning1.json
index 740a03a..0a4f289 100644
--- a/CanadaMes-ui/src/configuration/Positioning1.json
+++ b/CanadaMes-ui/src/configuration/Positioning1.json
@@ -4,6 +4,7 @@
"read": 33,
"sending": 0,
"type": "0",
+ "unit": "mm",
"value":"0"
}],
@@ -12,6 +13,7 @@
"read": 33,
"sending": 0,
"type": "0",
+ "unit": "mm",
"value":"0"
}],
@@ -20,6 +22,7 @@
"read": 33,
"sending": 0,
"type": "0",
+ "unit": "mm",
"value":"0"
}],
@@ -38,6 +41,7 @@
"read": 33,
"sending": 0,
"type": "0",
+ "unit": "mm",
"value":"0",
"address":"DB100.48",
"count":10
@@ -46,6 +50,7 @@
"name": "22#鏍煎湴鍧�",
"read": 11,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -53,6 +58,7 @@
"name": "43#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -60,6 +66,7 @@
"name": "64#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -67,6 +74,7 @@
"name": "85#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -74,6 +82,7 @@
"name": "106#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -81,6 +90,7 @@
"name": "127#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -88,6 +98,7 @@
"name": "148#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -95,6 +106,7 @@
"name": "169#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -102,6 +114,7 @@
"name": "190#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
}
@@ -123,6 +136,7 @@
"read": 33,
"sending": 0,
"type": "0" ,
+ "unit": "mm",
"value":"0",
"address":"DB100.68",
"count":10
@@ -131,6 +145,7 @@
"name": "22#鏍煎湴鍧�",
"read": 11,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -138,6 +153,7 @@
"name": "43#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -145,6 +161,7 @@
"name": "64#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -152,6 +169,7 @@
"name": "85#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -159,6 +177,7 @@
"name": "106#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -166,6 +185,7 @@
"name": "127#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -173,6 +193,7 @@
"name": "148#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -180,6 +201,7 @@
"name": "169#鏍煎湴鍧�",
"read": 22,
"sending": 0,
+ "unit": "mm",
"type": "0" ,
"value":"0"
},
@@ -188,12 +210,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