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

ZengTao

2024-05-09 79e0a14068decac12cbd6c670639413f0fa9e18c

 CanadaMes-ui/src/configuration/Positioning1.json

@@ -4,7 +4,10 @@
    "read": 33,
    "sending": 0,
    "type": "0",
    "value":"0"
    "unit": "mm",
    "value":"0",
    "min": 0,
     "max": 75
    
  }],
    [{
@@ -12,7 +15,10 @@
      "read": 33,
      "sending": 0,
      "type": "0",
      "value":"0"
      "unit": "mm",
      "value":"0",
      "min":0,
      "max":22000
      
    }],
    [{
@@ -20,7 +26,10 @@
      "read": 33,
      "sending": 0,
      "type": "0",
      "value":"0"
      "unit": "mm",
      "value":"0",
      "min":0,
      "max":1000
      
    }],
    
@@ -38,72 +47,102 @@
        "read": 33,
        "sending": 0,
        "type": "0",
        "unit": "mm",
        "value":"0",
        "address":"DB100.48",
        "count":10
        "count":10,
        "min":0,
        "max":22000
      },
      {
        "name": "22#格地址",
        "read": 11,
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "43#格地址",
        "read": 22,
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "64#格地址",
        "read": 22,
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "85#格地址",
        "read": 22,
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "106#格地址",
        "read": 22,
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "127#格地址",
        "read": 22,
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "148#格地址",
        "read": 22,
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "169#格地址",
        "read": 22,
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "190#格地址",
        "read": 22,
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      }
     
      
@@ -123,77 +162,260 @@
        "read": 33,
        "sending": 0,
        "type": "0" ,
        "unit": "mm",
        "value":"0",
        "address":"DB100.68",
        "count":10
        "count":10,
        "min":0,
        "max":22000
      },
      {
        "name": "22#格地址",
        "read": 11,
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "43#格地址",
        "read": 22,
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "64#格地址",
        "read": 22,
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "85#格地址",
        "read": 22,
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "106#格地址",
        "read": 22,
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "127#格地址",
        "read": 22,
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "148#格地址",
        "read": 22,
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "169#格地址",
        "read": 22,
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "190#格地址",
        "read": 22,
        "sending": 0,
        "type": "0" ,
        "value":"0"
        "unit": "mm",
        "value":"0",
        "min":0,
        "max":22000
      }
     
      
     
    ]
    ],
    [
      {
          "title": {
            "name": "B01格位置设定"
            
          }, "type": "1"
        },
    {
      "name": "1#格地址",
      "read": 33,
      "sending": 0,
      "type": "0",
      "unit": "mm",
      "address":"DB100.0",
      "count":3,
      "value":"0",
      "min":0,
      "max":9999
    },
    {
      "name": "22#格地址",
      "read": 11,
      "sending": 0,
      "unit": "mm",
      "type": "0",
      "value":"0",
      "min":0,
      "max":9999
    },
    {
      "name": "43#格地址",
      "read": 22,
      "sending": 0,
      "unit": "mm",
      "type": "0",
      "value":"0",
      "min":0,
      "max":9999
    },
    {
      "name": "64#格地址",
      "read": 22,
      "sending": 0,
      "unit": "mm",
      "type": "0",
      "value":"0",
      "min":0,
      "max":9999
    },
    {
      "name": "85#格地址",
      "read": 22,
      "sending": 0,
      "unit": "mm",
      "type": "0",
      "value":"0",
      "min":0,
      "max":9999
    }
   
    
   
  ],

  [
      {
          "title": {
            "name": "B02位置设定"
            
          }, "type": "1"
        },
        {
          "name": "106#格地址",
          "read": 22,
          "sending": 0,
          "unit": "mm",
          "type": "0",
          "value":"0",
          "min":0,
          "max":9999
        },
        {
          "name": "127#格地址",
          "read": 22,
          "sending": 0,
          "unit": "mm",
          "type": "0",
          "value":"0",
          "min":0,
          "max":9999
        },
        {
          "name": "148#格地址",
          "read": 22,
          "sending": 0,
          "unit": "mm",
          "type": "0",
          "value":"0",
          "min":0,
          "max":9999
        },
        {
          "name": "169#格地址",
          "read": 22,
          "sending": 0,
          "unit": "mm",
          "type": "0",
          "value":"0",
          "min":0,
      "max":9999
        },
        {
          "name": "190#格地址",
          "read": 22,
          "sending": 0,
          "unit": "mm",
          "type": "0",
          "value":"0",
          "min":0,
          "max":9999
        }
       
   
    
   
  ]
  
  ,
  [
    {
      "button": {
        "name": "A01原点记忆",
        "value": 0,
        "value2": 0,
        "address": "DB10.0",
        "state": 1
      
      },"type": "1"
     
    },
    {
      "button": {
        "name": "A02原点记忆",
        "value": 0,
        "value2": 0,
        "address": "DB10.0",
        "state": 1
      
      },
      "type": "1"
     
    }
  ]