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/Positioning2.json | 214 ++++++++++++++++++++++++++++-------------------------
1 files changed, 112 insertions(+), 102 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/Positioning2.json b/CanadaMes-ui/src/configuration/Positioning2.json
index a01e428..31c7ad3 100644
--- a/CanadaMes-ui/src/configuration/Positioning2.json
+++ b/CanadaMes-ui/src/configuration/Positioning2.json
@@ -1,103 +1,113 @@
-[
-
- [
- {
- "title": {
- "name": "B01鏍间綅缃瀹�"
-
- }, "type": "1"
- },
- {
- "name": "1#鏍煎湴鍧�",
- "read": 33,
- "sending": 0,
- "type": "0",
- "address":"DB100.0",
- "count":3,
- "value":"0"
- },
- {
- "name": "22#鏍煎湴鍧�",
- "read": 11,
- "sending": 0,
- "type": "0"
- ,
- "value":"0"
- },
- {
- "name": "43#鏍煎湴鍧�",
- "read": 22,
- "sending": 0,
- "type": "0",
- "value":"0"
- },
- {
- "name": "64#鏍煎湴鍧�",
- "read": 22,
- "sending": 0,
- "type": "0",
- "value":"0"
- },
- {
- "name": "85#鏍煎湴鍧�",
- "read": 22,
- "sending": 0,
- "type": "0",
- "value":"0"
- }
-
-
-
- ],
-
- [
- {
- "title": {
- "name": "B02浣嶇疆璁惧畾"
-
- }, "type": "1"
- },
- {
- "name": "106#鏍煎湴鍧�",
- "read": 22,
- "sending": 0,
- "type": "0",
- "value":"0"
- },
- {
- "name": "127#鏍煎湴鍧�",
- "read": 22,
- "sending": 0,
- "type": "0",
- "value":"0"
- },
- {
- "name": "148#鏍煎湴鍧�",
- "read": 22,
- "sending": 0,
- "type": "0",
- "value":"0"
- },
- {
- "name": "169#鏍煎湴鍧�",
- "read": 22,
- "sending": 0,
- "type": "0",
- "value":"0"
- },
- {
- "name": "190#鏍煎湴鍧�",
- "read": 22,
- "sending": 0,
- "type": "0",
- "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"
+ }
+
+
+
+
+ ]
+
+
+ ]
\ No newline at end of file
--
Gitblit v1.8.0