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

wuyouming666

2023-11-29 d973e1b1509da56217a47fa74d4860fbf854c172

 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,