Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

wu

2023-11-30 0ece3ba8c92df0438af52b8de6b9225d8ada4103

 CanadaMes-ui/src/configuration/Manualoneposition2.json

@@ -2,7 +2,7 @@
  [
    {
      "name": "手动位置",
      "read": 33,
      "value": 33,
      "sending": 0,
      "type": "0",
      "address": "DB100.0",
@@ -10,14 +10,14 @@
    },
    {
      "name": "定位速度",
      "read": 11,
      "value": 11,
      "sending": 0,
      "address": "DB100.0",
      "type": "0"
    },
    {
      "name": "A01翻转实时位置",
      "read": 22,
      "value": 22,
      "sending": 0,
      "address": "DB100.0",
      "type": "0"
@@ -27,7 +27,7 @@
        "name": "A01翻转启动",
        "value": 0,
        "address": "DB10.0",
        "state": 0
        "state": 1
      }
    },
    {
@@ -35,7 +35,7 @@
        "name": "故障",
        "value": 0,
        "address": "DB10.0",
        "state": 0
        "state": 1
      }
    },
    {
@@ -43,7 +43,7 @@
        "name": "复位",
        "value": 0,
        "address": "DB10.0",
        "state": 0
        "state": 1
      }
    },
    {
@@ -66,7 +66,7 @@
  [
    {
      "name": "手动位置",
      "read": 33,
      "value": 33,
      "sending": 0,
      "type": "0",
      "address": "DB100.0",
@@ -74,14 +74,14 @@
    },
    {
      "name": "定位速度",
      "read": 11,
      "value": 11,
      "sending": 0,
      "address": "DB100.0",
      "type": "0"
    },
    {
      "name": "A02翻转实时位置",
      "read": 22,
      "value": 22,
      "sending": 0,
      "address": "DB100.0",
      "type": "0"
@@ -91,7 +91,7 @@
        "name": "A02翻转启动",
        "value": 0,
        "address": "DB10.0",
        "state": 0
        "state": 1
      }
    },
    {
@@ -99,7 +99,7 @@
        "name": "故障",
        "value": 0,
        "address": "DB10.0",
        "state": 0
        "state": 1
      }
    },
    {
@@ -107,7 +107,7 @@
        "name": "复位",
        "value": 0,
        "address": "DB10.0",
        "state": 0
        "state": 1
      }
    },
    {