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

wu

2023-12-20 903a5090b1624bc7a95e70ef52c4ccb1ac04d588

 CanadaMes-ui/src/configuration/Manualoneposition.json

@@ -8,6 +8,7 @@
      "address": "DB100.0",

      "count": 3,

      "state": 1

  
    },

    {

      "name": "A01定位速度",

@@ -15,7 +16,9 @@
      "sending": 0,

      "address": "DB100.0",

      "type": "0",

      "state": 1

      "state": 1,

      "min":0,

      "max":3000

    },

    {

      "name": "A01当前格子",

@@ -24,6 +27,7 @@
      "address": "DB100.0",

      "type": "0",

      "state": 1

    
    },

    {

      "button": {

@@ -59,6 +63,8 @@
      "address": "DB100.0",

      "count": 3,

      "state": 1

     
      
    },

    {

      "name": "A02定位速度",

@@ -66,7 +72,9 @@
      "sending": 0,

      "address": "DB100.0",

      "type": "0",

      "state": 1

      "state": 1,

      "min":0,

      "max":3000

    },

    {

      "name": "A02当前格子",

@@ -75,6 +83,7 @@
      "address": "DB100.0",

      "type": "0",

      "state": 1

      
    },

    {

      "button": {

@@ -109,7 +118,9 @@
      "type": "0",

      "address": "DB100.0",

      "count": 3,

      "state": 1

      "state": 1,

      "min":1,

      "max":105

    },

    {

      "name": "B01定位速度",

@@ -117,7 +128,9 @@
      "sending": 0,

      "address": "DB100.0",

      "type": "0",

      "state": 1

      "state": 1,

      "min":0,

      "max":2000

    },

    {

      "name": "B01当前格子",

@@ -126,6 +139,7 @@
      "address": "DB100.0",

      "type": "0",

      "state": 1



    },

    {

      "button": {

@@ -171,12 +185,14 @@
  [

    {

      "name": "B02手动格子",

      "value": 0,

      "value": "",

      "sending": 0,

      "type": "0",

      "address": "DB100.0",

      "count": 3,

      "state": 1

      "state": 1,

      "min":106,

      "max":210

    },

    {

      "name": "B02定位速度",

@@ -184,7 +200,9 @@
      "sending": 0,

      "address": "DB100.0",

      "type": "0",

      "state": 1

      "state": 1,

      "min":0,

      "max":2000

    },

    {

      "name": "B02当前格子",

@@ -193,6 +211,7 @@
      "address": "DB100.0",

      "type": "0",

      "state": 1

     
    },

    {

      "button": {