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

ZengTao

2023-11-30 2f78ef164653d5d30732d6e2e3f822a68de63010

 CanadaMes-ui/src/configuration/Manualoneposition.json

@@ -2,7 +2,7 @@
  [
    {
      "name": "A01手动格子",
      "value": 33,
      "value": 0,
      "sending": 0,
      "type": "0",
      "address": "DB100.0",
@@ -11,7 +11,7 @@
    },
    {
      "name": "A01定位速度",
      "value": 11,
      "value": 0,
      "sending": 0,
      "address": "DB100.0",
      "type": "0",
@@ -19,7 +19,7 @@
    },
    {
      "name": "A01当前格子",
      "value": 22,
      "value": 0,
      "sending": 0,
      "address": "DB100.0",
      "type": "0",
@@ -69,7 +69,7 @@
  [
    {
      "name": "A02手动格子",
      "value": 33,
      "value": 0,
      "sending": 0,
      "type": "0",
      "address": "DB100.0",
@@ -78,7 +78,7 @@
    },
    {
      "name": "A02定位速度",
      "value": 11,
      "value": 0,
      "sending": 0,
      "address": "DB100.0",
      "type": "0",
@@ -86,7 +86,7 @@
    },
    {
      "name": "A02当前格子",
      "value": 22,
      "value": 0,
      "sending": 0,
      "address": "DB100.0",
      "type": "0",
@@ -136,7 +136,7 @@
  [
    {
      "name": "B01手动格子",
      "value": 33,
      "value": 0,
      "sending": 0,
      "type": "0",
      "address": "DB100.0",
@@ -145,7 +145,7 @@
    },
    {
      "name": "B01定位速度",
      "value": 11,
      "value": 0,
      "sending": 0,
      "address": "DB100.0",
      "type": "0",
@@ -153,7 +153,7 @@
    },
    {
      "name": "B01当前格子",
      "value": 22,
      "value": 0,
      "sending": 0,
      "address": "DB100.0",
      "type": "0",
@@ -203,7 +203,7 @@
  [
    {
      "name": "B02手动格子",
      "value": 33,
      "value": 0,
      "sending": 0,
      "type": "0",
      "address": "DB100.0",
@@ -212,7 +212,7 @@
    },
    {
      "name": "B02定位速度",
      "value": 11,
      "value": 0,
      "sending": 0,
      "address": "DB100.0",
      "type": "0",
@@ -220,7 +220,7 @@
    },
    {
      "name": "B02当前格子",
      "value": 22,
      "value": 0,
      "sending": 0,
      "address": "DB100.0",
      "type": "0",
@@ -270,7 +270,7 @@
  [
    {
      "name": "A01实时位置",
      "value": 33,
      "value": 0,
      "sending": 4,
      "type": "0",
      "address": "DB100.0",
@@ -281,7 +281,7 @@
  [
    {
      "name": "A02实时位置",
      "value": 33,
      "value": 0,
      "sending": 5,
      "type": "0",
      "address": "DB100.0",
@@ -292,7 +292,7 @@
  [
    {
      "name": "B01实时位置",
      "value": 33,
      "value": 0,
      "sending": 6,
      "type": "0",
      "address": "DB100.0",
@@ -303,7 +303,7 @@
  [
    {
      "name": "B02实时位置",
      "value": 33,
      "value": 0,
      "sending": 7,
      "type": "0",
      "address": "DB100.0",