From 1de312a18d164c2fa3718a1a975b8c5804723bcf Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期一, 27 十一月 2023 13:46:12 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 CanadaMes-ui/src/configuration/Positioning1.json |  402 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 201 insertions(+), 201 deletions(-)

diff --git a/CanadaMes-ui/src/configuration/Positioning1.json b/CanadaMes-ui/src/configuration/Positioning1.json
index 39833bb..740a03a 100644
--- a/CanadaMes-ui/src/configuration/Positioning1.json
+++ b/CanadaMes-ui/src/configuration/Positioning1.json
@@ -1,202 +1,202 @@
-[
-  [{
-    "name": "鏍煎瓙闂磋窛",
-    "read": 33,
-    "sending": 0,
-    "type": "0",
-    "value":"0"
-    
-  }],
-    [{
-      "name": "瀛樼墖鎺ョ墖鍦板潃",
-      "read": 33,
-      "sending": 0,
-      "type": "0",
-      "value":"0"
-      
-    }],
-    [{
-      "name": "鍑虹墖鎺ョ墖鍦板潃",
-      "read": 33,
-      "sending": 0,
-      "type": "0",
-      "value":"0"
-      
-    }],
-    
-
-    [
-        {
-            "title": {
-              "name": "瀛樼墖鏍间綅缃瀹�"
-              
-            }, "type": "1"
-           
-          },
-      {
-        "name": "1#鏍煎湴鍧�",
-        "read": 33,
-        "sending": 0,
-        "type": "0",
-        "value":"0",
-        "address":"DB100.48",
-        "count":10
-      },
-      {
-        "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"
-      },
-      {
-        "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": "鍑虹墖鏍间綅缃瀹�"
-              
-            },"type": "1",
-            "value":"0"
-          },
-      {
-        "name": "1#鏍煎湴鍧�",
-        "read": 33,
-        "sending": 0,
-        "type": "0" ,
-        "value":"0",
-        "address":"DB100.68",
-        "count":10
-      },
-      {
-        "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"
-      },
-      {
-        "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"
-      }
-     
-      
-     
-    ]
-
-   
-    
-  ]
-
+[
+  [{
+    "name": "鏍煎瓙闂磋窛",
+    "read": 33,
+    "sending": 0,
+    "type": "0",
+    "value":"0"
+    
+  }],
+    [{
+      "name": "瀛樼墖鎺ョ墖鍦板潃",
+      "read": 33,
+      "sending": 0,
+      "type": "0",
+      "value":"0"
+      
+    }],
+    [{
+      "name": "鍑虹墖鎺ョ墖鍦板潃",
+      "read": 33,
+      "sending": 0,
+      "type": "0",
+      "value":"0"
+      
+    }],
+    
+
+    [
+        {
+            "title": {
+              "name": "瀛樼墖鏍间綅缃瀹�"
+              
+            }, "type": "1"
+           
+          },
+      {
+        "name": "1#鏍煎湴鍧�",
+        "read": 33,
+        "sending": 0,
+        "type": "0",
+        "value":"0",
+        "address":"DB100.48",
+        "count":10
+      },
+      {
+        "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"
+      },
+      {
+        "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": "鍑虹墖鏍间綅缃瀹�"
+              
+            },"type": "1",
+            "value":"0"
+          },
+      {
+        "name": "1#鏍煎湴鍧�",
+        "read": 33,
+        "sending": 0,
+        "type": "0" ,
+        "value":"0",
+        "address":"DB100.68",
+        "count":10
+      },
+      {
+        "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"
+      },
+      {
+        "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"
+      }
+     
+      
+     
+    ]
+
+   
+    
+  ]
+
   
\ No newline at end of file

--
Gitblit v1.8.0