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

ZengTao

2023-12-21 12c065f48d6a4f5b1489da95f2091edb9a831196

 CanadaMes-ui/src/configuration/Positioning1.json

@@ -7,7 +7,7 @@
    "unit": "mm",
    "value":"0",
    "min": 0,
     "max": 100
     "max": 75
    
  }],
    [{
@@ -18,7 +18,7 @@
      "unit": "mm",
      "value":"0",
      "min":0,
      "max":100
      "max":22000
      
    }],
    [{
@@ -52,7 +52,7 @@
        "address":"DB100.48",
        "count":10,
        "min":0,
        "max":100
        "max":22000
      },
      {
        "name": "22#格地址",
@@ -62,7 +62,7 @@
        "type": "0" ,
        "value":"0",
        "min":0,
        "max":100
        "max":22000
      },
      {
        "name": "43#格地址",
@@ -72,7 +72,7 @@
        "type": "0" ,
        "value":"0",
        "min":0,
        "max":100
        "max":22000
      },
      {
        "name": "64#格地址",
@@ -82,7 +82,7 @@
        "type": "0" ,
        "value":"0",
        "min":0,
        "max":100
        "max":22000
      },
      {
        "name": "85#格地址",
@@ -92,7 +92,7 @@
        "type": "0" ,
        "value":"0",
        "min":0,
        "max":100
        "max":22000
      },
      {
        "name": "106#格地址",
@@ -102,7 +102,7 @@
        "type": "0" ,
        "value":"0",
        "min":0,
        "max":100
        "max":22000
      },
      {
        "name": "127#格地址",
@@ -112,7 +112,7 @@
        "type": "0" ,
        "value":"0",
        "min":0,
        "max":100
        "max":22000
      },
      {
        "name": "148#格地址",
@@ -122,7 +122,7 @@
        "type": "0" ,
        "value":"0",
        "min":0,
        "max":100
        "max":22000
      },
      {
        "name": "169#格地址",
@@ -132,7 +132,7 @@
        "type": "0" ,
        "value":"0",
        "min":0,
        "max":100
        "max":22000
      },
      {
        "name": "190#格地址",
@@ -142,7 +142,7 @@
        "type": "0" ,
        "value":"0",
        "min":0,
        "max":100
        "max":22000
      }
     
      
@@ -167,7 +167,7 @@
        "address":"DB100.68",
        "count":10,
        "min":0,
        "max":100
        "max":22000
      },
      {
        "name": "22#格地址",
@@ -177,7 +177,7 @@
        "type": "0" ,
        "value":"0",
        "min":0,
        "max":100
        "max":22000
      },
      {
        "name": "43#格地址",
@@ -187,7 +187,7 @@
        "type": "0" ,
        "value":"0",
        "min":0,
        "max":100
        "max":22000
      },
      {
        "name": "64#格地址",
@@ -197,7 +197,7 @@
        "type": "0" ,
        "value":"0",
        "min":0,
        "max":100
        "max":22000
      },
      {
        "name": "85#格地址",
@@ -207,7 +207,7 @@
        "type": "0" ,
        "value":"0",
        "min":0,
        "max":100
        "max":22000
      },
      {
        "name": "106#格地址",
@@ -217,7 +217,7 @@
        "type": "0" ,
        "value":"0",
        "min":0,
        "max":100
        "max":22000
      },
      {
        "name": "127#格地址",
@@ -227,7 +227,7 @@
        "type": "0" ,
        "value":"0",
        "min":0,
        "max":100
        "max":22000
      },
      {
        "name": "148#格地址",
@@ -237,7 +237,7 @@
        "type": "0" ,
        "value":"0",
        "min":0,
        "max":100
        "max":22000
      },
      {
        "name": "169#格地址",
@@ -247,7 +247,7 @@
        "type": "0" ,
        "value":"0",
        "min":0,
        "max":100
        "max":22000
      },
      {
        "name": "190#格地址",
@@ -257,7 +257,7 @@
        "unit": "mm",
        "value":"0",
        "min":0,
        "max":100
        "max":22000
      }
     
      
@@ -280,7 +280,7 @@
      "count":3,
      "value":"0",
      "min":0,
      "max":100
      "max":9999
    },
    {
      "name": "22#格地址",
@@ -290,7 +290,7 @@
      "type": "0",
      "value":"0",
      "min":0,
      "max":100
      "max":9999
    },
    {
      "name": "43#格地址",
@@ -300,7 +300,7 @@
      "type": "0",
      "value":"0",
      "min":0,
      "max":100
      "max":9999
    },
    {
      "name": "64#格地址",
@@ -310,7 +310,7 @@
      "type": "0",
      "value":"0",
      "min":0,
      "max":100
      "max":9999
    },
    {
      "name": "85#格地址",
@@ -320,7 +320,7 @@
      "type": "0",
      "value":"0",
      "min":0,
      "max":100
      "max":9999
    }
   
    
@@ -342,7 +342,7 @@
          "type": "0",
          "value":"0",
          "min":0,
          "max":100
          "max":9999
        },
        {
          "name": "127#格地址",
@@ -352,7 +352,7 @@
          "type": "0",
          "value":"0",
          "min":0,
          "max":100
          "max":9999
        },
        {
          "name": "148#格地址",
@@ -362,7 +362,7 @@
          "type": "0",
          "value":"0",
          "min":0,
          "max":100
          "max":9999
        },
        {
          "name": "169#格地址",
@@ -372,7 +372,7 @@
          "type": "0",
          "value":"0",
          "min":0,
          "max":100
      "max":9999
        },
        {
          "name": "190#格地址",
@@ -382,7 +382,7 @@
          "type": "0",
          "value":"0",
          "min":0,
          "max":100
          "max":9999
        }