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

ZengTao

2024-05-09 79e0a14068decac12cbd6c670639413f0fa9e18c

 CanadaMes-ui/src/configuration/Positioning1.json

@@ -5,7 +5,9 @@
    "sending": 0,
    "type": "0",
    "unit": "mm",
    "value":"0"
    "value":"0",
    "min": 0,
     "max": 75
    
  }],
    [{
@@ -14,7 +16,9 @@
      "sending": 0,
      "type": "0",
      "unit": "mm",
      "value":"0"
      "value":"0",
      "min":0,
      "max":22000
      
    }],
    [{
@@ -23,7 +27,9 @@
      "sending": 0,
      "type": "0",
      "unit": "mm",
      "value":"0"
      "value":"0",
      "min":0,
      "max":1000
      
    }],
    
@@ -44,7 +50,9 @@
        "unit": "mm",
        "value":"0",
        "address":"DB100.48",
        "count":10
        "count":10,
        "min":0,
        "max":22000
      },
      {
        "name": "22#格地址",
@@ -52,7 +60,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "43#格地址",
@@ -60,7 +70,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "64#格地址",
@@ -68,7 +80,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "85#格地址",
@@ -76,7 +90,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "106#格地址",
@@ -84,7 +100,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "127#格地址",
@@ -92,7 +110,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "148#格地址",
@@ -100,7 +120,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "169#格地址",
@@ -108,7 +130,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "190#格地址",
@@ -116,7 +140,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      }
     
      
@@ -139,7 +165,9 @@
        "unit": "mm",
        "value":"0",
        "address":"DB100.68",
        "count":10
        "count":10,
        "min":0,
        "max":22000
      },
      {
        "name": "22#格地址",
@@ -147,7 +175,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "43#格地址",
@@ -155,7 +185,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "64#格地址",
@@ -163,7 +195,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "85#格地址",
@@ -171,7 +205,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "106#格地址",
@@ -179,7 +215,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "127#格地址",
@@ -187,7 +225,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "148#格地址",
@@ -195,7 +235,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "169#格地址",
@@ -203,7 +245,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      },
      {
        "name": "190#格地址",
@@ -211,7 +255,9 @@
        "sending": 0,
        "type": "0" ,
        "unit": "mm",
        "value":"0"
        "value":"0",
        "min":0,
        "max":22000
      }
     
      
@@ -232,16 +278,19 @@
      "unit": "mm",
      "address":"DB100.0",
      "count":3,
      "value":"0"
      "value":"0",
      "min":0,
      "max":9999
    },
    {
      "name": "22#格地址",
      "read": 11,
      "sending": 0,
      "unit": "mm",
      "type": "0"
      ,
      "value":"0"
      "type": "0",
      "value":"0",
      "min":0,
      "max":9999
    },
    {
      "name": "43#格地址",
@@ -249,7 +298,9 @@
      "sending": 0,
      "unit": "mm",
      "type": "0",
      "value":"0"
      "value":"0",
      "min":0,
      "max":9999
    },
    {
      "name": "64#格地址",
@@ -257,7 +308,9 @@
      "sending": 0,
      "unit": "mm",
      "type": "0",
      "value":"0"
      "value":"0",
      "min":0,
      "max":9999
    },
    {
      "name": "85#格地址",
@@ -265,7 +318,9 @@
      "sending": 0,
      "unit": "mm",
      "type": "0",
      "value":"0"
      "value":"0",
      "min":0,
      "max":9999
    }
   
    
@@ -285,7 +340,9 @@
          "sending": 0,
          "unit": "mm",
          "type": "0",
          "value":"0"
          "value":"0",
          "min":0,
          "max":9999
        },
        {
          "name": "127#格地址",
@@ -293,7 +350,9 @@
          "sending": 0,
          "unit": "mm",
          "type": "0",
          "value":"0"
          "value":"0",
          "min":0,
          "max":9999
        },
        {
          "name": "148#格地址",
@@ -301,7 +360,9 @@
          "sending": 0,
          "unit": "mm",
          "type": "0",
          "value":"0"
          "value":"0",
          "min":0,
          "max":9999
        },
        {
          "name": "169#格地址",
@@ -309,7 +370,9 @@
          "sending": 0,
          "unit": "mm",
          "type": "0",
          "value":"0"
          "value":"0",
          "min":0,
      "max":9999
        },
        {
          "name": "190#格地址",
@@ -317,13 +380,42 @@
          "sending": 0,
          "unit": "mm",
          "type": "0",
          "value":"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"
     
    }
  ]