From ff6fd31ba5a4b6a6e74096786ff6d61293d15c73 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 04 十二月 2023 09:08:57 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 CanadaMes-ui/src/configuration/Manualoneposition2.json |  258 +++++++++++++++++++++++++-------------------------
 1 files changed, 129 insertions(+), 129 deletions(-)

diff --git a/CanadaMes-ui/src/configuration/Manualoneposition2.json b/CanadaMes-ui/src/configuration/Manualoneposition2.json
index 4f43f7c..a7bb6f1 100644
--- a/CanadaMes-ui/src/configuration/Manualoneposition2.json
+++ b/CanadaMes-ui/src/configuration/Manualoneposition2.json
@@ -1,130 +1,130 @@
-[
-  [
-    {
-      "name": "鎵嬪姩浣嶇疆",
-      "value": 0,
-      "sending": 0,
-      "type": "0",
-      "address": "DB100.0",
-      "count": 3
-    },
-    {
-      "name": "瀹氫綅閫熷害",
-      "value": 0,
-      "sending": 0,
-      "address": "DB100.0",
-      "type": "0"
-    },
-    {
-      "name": "A01缈昏浆瀹炴椂浣嶇疆",
-      "value": 0,
-      "sending": 0,
-      "address": "DB100.0",
-      "type": "0"
-    },
-    {
-      "button": {
-        "name": "A01缈昏浆鍚姩",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      }
-    },
-    {
-      "button": {
-        "name": "鏁呴殰",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      }
-    },
-    {
-      "button": {
-        "name": "澶嶄綅",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      }
-    },
-    {
-      "button": {
-        "name": "鏈洖闆�",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      }
-    },
-    {
-      "button": {
-        "name": "鍥為浂",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      }
-    }
-  ],
-  [
-    {
-      "name": "鎵嬪姩浣嶇疆",
-      "value": 0,
-      "sending": 0,
-      "type": "0",
-      "address": "DB100.0",
-      "count": 3
-    },
-    {
-      "name": "瀹氫綅閫熷害",
-      "value": 0,
-      "sending": 0,
-      "address": "DB100.0",
-      "type": "0"
-    },
-    {
-      "name": "A02缈昏浆瀹炴椂浣嶇疆",
-      "value": 0,
-      "sending": 0,
-      "address": "DB100.0",
-      "type": "0"
-    },
-    {
-      "button": {
-        "name": "A02缈昏浆鍚姩",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      }
-    },
-    {
-      "button": {
-        "name": "鏁呴殰",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      }
-    },
-    {
-      "button": {
-        "name": "澶嶄綅",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      }
-    },
-    {
-      "button": {
-        "name": "鏈洖闆�",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      }
-    },
-    {
-      "button": {
-        "name": "鍥為浂",
-        "value": 0,
-        "address": "DB10.0",
-        "state": 1
-      }
-    }
-  ]
+[
+  [
+    {
+      "name": "A01鎵嬪姩浣嶇疆",
+      "value": 0,
+      "sending": 0,
+      "type": "0",
+      "address": "DB100.0",
+      "count": 3
+    },
+    {
+      "name": "A01瀹氫綅閫熷害",
+      "value": 0,
+      "sending": 0,
+      "address": "DB100.0",
+      "type": "0"
+    },
+    {
+      "name": "A01缈昏浆瀹炴椂浣嶇疆",
+      "value": 0,
+      "sending": 0,
+      "address": "DB100.0",
+      "type": "0"
+    },
+    {
+      "button": {
+        "name": "A01缈昏浆鍚姩",
+        "value": 0,
+        "address": "DB10.0",
+        "state": 1
+      }
+    },
+    {
+      "button": {
+        "name": "鏁呴殰",
+        "value": 0,
+        "address": "DB10.0",
+        "state": 1
+      }
+    },
+    {
+      "button": {
+        "name": "澶嶄綅",
+        "value": 0,
+        "address": "DB10.0",
+        "state": 1
+      }
+    },
+    {
+      "button": {
+        "name": "鏈洖闆�",
+        "value": 0,
+        "address": "DB10.0",
+        "state": 1
+      }
+    },
+    {
+      "button": {
+        "name": "鍥為浂",
+        "value": 0,
+        "address": "DB10.0",
+        "state": 1
+      }
+    }
+  ],
+  [
+    {
+      "name": "A02鎵嬪姩浣嶇疆",
+      "value": 0,
+      "sending": 0,
+      "type": "0",
+      "address": "DB100.0",
+      "count": 3
+    },
+    {
+      "name": "A02瀹氫綅閫熷害",
+      "value": 0,
+      "sending": 0,
+      "address": "DB100.0",
+      "type": "0"
+    },
+    {
+      "name": "A02缈昏浆瀹炴椂浣嶇疆",
+      "value": 0,
+      "sending": 0,
+      "address": "DB100.0",
+      "type": "0"
+    },
+    {
+      "button": {
+        "name": "A02缈昏浆鍚姩",
+        "value": 0,
+        "address": "DB10.0",
+        "state": 1
+      }
+    },
+    {
+      "button": {
+        "name": "鏁呴殰",
+        "value": 0,
+        "address": "DB10.0",
+        "state": 1
+      }
+    },
+    {
+      "button": {
+        "name": "澶嶄綅",
+        "value": 0,
+        "address": "DB10.0",
+        "state": 1
+      }
+    },
+    {
+      "button": {
+        "name": "鏈洖闆�",
+        "value": 0,
+        "address": "DB10.0",
+        "state": 1
+      }
+    },
+    {
+      "button": {
+        "name": "鍥為浂",
+        "value": 0,
+        "address": "DB10.0",
+        "state": 1
+      }
+    }
+  ]
 ]
\ No newline at end of file

--
Gitblit v1.8.0