From 0ece3ba8c92df0438af52b8de6b9225d8ada4103 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 30 十一月 2023 08:46:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 CanadaMes-ui/src/configuration/Manualoneposition.json |   46 +++++++++++++++++++++++-----------------------
 1 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/CanadaMes-ui/src/configuration/Manualoneposition.json b/CanadaMes-ui/src/configuration/Manualoneposition.json
index c5a52bf..652a959 100644
--- a/CanadaMes-ui/src/configuration/Manualoneposition.json
+++ b/CanadaMes-ui/src/configuration/Manualoneposition.json
@@ -2,7 +2,7 @@
   [
     {
       "name": "A01鎵嬪姩鏍煎瓙",
-      "read": 33,
+      "value": 33,
       "sending": 0,
       "type": "0",
       "address": "DB100.0",
@@ -11,7 +11,7 @@
     },
     {
       "name": "A01瀹氫綅閫熷害",
-      "read": 11,
+      "value": 11,
       "sending": 0,
       "address": "DB100.0",
       "type": "0",
@@ -19,7 +19,7 @@
     },
     {
       "name": "A01褰撳墠鏍煎瓙",
-      "read": 22,
+      "value": 22,
       "sending": 0,
       "address": "DB100.0",
       "type": "0",
@@ -36,7 +36,7 @@
     {
       "button": {
         "name": "鏁呴殰",
-        "value": 0,
+        "value": 1,
         "address": "DB10.0",
         "state": 1
       }
@@ -69,7 +69,7 @@
   [
     {
       "name": "A02鎵嬪姩鏍煎瓙",
-      "read": 33,
+      "value": 33,
       "sending": 0,
       "type": "0",
       "address": "DB100.0",
@@ -78,7 +78,7 @@
     },
     {
       "name": "A02瀹氫綅閫熷害",
-      "read": 11,
+      "value": 11,
       "sending": 0,
       "address": "DB100.0",
       "type": "0",
@@ -86,7 +86,7 @@
     },
     {
       "name": "A02褰撳墠鏍煎瓙",
-      "read": 22,
+      "value": 22,
       "sending": 0,
       "address": "DB100.0",
       "type": "0",
@@ -136,7 +136,7 @@
   [
     {
       "name": "B01鎵嬪姩鏍煎瓙",
-      "read": 33,
+      "value": 33,
       "sending": 0,
       "type": "0",
       "address": "DB100.0",
@@ -145,7 +145,7 @@
     },
     {
       "name": "B01瀹氫綅閫熷害",
-      "read": 11,
+      "value": 11,
       "sending": 0,
       "address": "DB100.0",
       "type": "0",
@@ -153,7 +153,7 @@
     },
     {
       "name": "B01褰撳墠鏍煎瓙",
-      "read": 22,
+      "value": 22,
       "sending": 0,
       "address": "DB100.0",
       "type": "0",
@@ -203,7 +203,7 @@
   [
     {
       "name": "B02鎵嬪姩鏍煎瓙",
-      "read": 33,
+      "value": 33,
       "sending": 0,
       "type": "0",
       "address": "DB100.0",
@@ -212,7 +212,7 @@
     },
     {
       "name": "B02瀹氫綅閫熷害",
-      "read": 11,
+      "value": 11,
       "sending": 0,
       "address": "DB100.0",
       "type": "0",
@@ -220,7 +220,7 @@
     },
     {
       "name": "B02褰撳墠鏍煎瓙",
-      "read": 22,
+      "value": 22,
       "sending": 0,
       "address": "DB100.0",
       "type": "0",
@@ -237,9 +237,9 @@
     {
       "button": {
         "name": "鏁呴殰",
-        "value": 0,
+        "value": 1,
         "address": "DB10.0",
-        "state": 0
+        "state": 1
       }
     },
     {
@@ -270,8 +270,8 @@
   [
     {
       "name": "A01瀹炴椂浣嶇疆",
-      "read": 33,
-      "sending": 0,
+      "value": 33,
+      "sending": 4,
       "type": "0",
       "address": "DB100.0",
       "count": 3,
@@ -281,8 +281,8 @@
   [
     {
       "name": "A02瀹炴椂浣嶇疆",
-      "read": 33,
-      "sending": 0,
+      "value": 33,
+      "sending": 5,
       "type": "0",
       "address": "DB100.0",
       "count": 3,
@@ -292,8 +292,8 @@
   [
     {
       "name": "B01瀹炴椂浣嶇疆",
-      "read": 33,
-      "sending": 0,
+      "value": 33,
+      "sending": 6,
       "type": "0",
       "address": "DB100.0",
       "count": 3,
@@ -303,8 +303,8 @@
   [
     {
       "name": "B02瀹炴椂浣嶇疆",
-      "read": 33,
-      "sending": 0,
+      "value": 33,
+      "sending": 7,
       "type": "0",
       "address": "DB100.0",
       "count": 3,

--
Gitblit v1.8.0