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

wu

2023-12-20 903a5090b1624bc7a95e70ef52c4ccb1ac04d588

 CanadaMes-ui/src/configuration/Positioning1.json

@@ -16,7 +16,9 @@
      "sending": 0,
      "type": "0",
      "unit": "mm",
      "value":"0"
      "value":"0",
      "min":0,
      "max":100
      
    }],
    [{
@@ -25,7 +27,9 @@
      "sending": 0,
      "type": "0",
      "unit": "mm",
      "value":"0"
      "value":"0",
      "min":0,
      "max":100
      
    }],
    
@@ -46,7 +50,9 @@
        "unit": "mm",
        "value":"0",
        "address":"DB100.48",
        "count":10
        "count":10,
        "min":0,
        "max":100
      },
      {
        "name": "22#格地址",
@@ -54,7 +60,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":100
      },
      {
        "name": "43#格地址",
@@ -62,7 +70,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":100
      },
      {
        "name": "64#格地址",
@@ -70,7 +80,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":100
      },
      {
        "name": "85#格地址",
@@ -78,7 +90,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":100
      },
      {
        "name": "106#格地址",
@@ -86,7 +100,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":100
      },
      {
        "name": "127#格地址",
@@ -94,7 +110,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":100
      },
      {
        "name": "148#格地址",
@@ -102,7 +120,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":100
      },
      {
        "name": "169#格地址",
@@ -110,7 +130,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":100
      },
      {
        "name": "190#格地址",
@@ -118,7 +140,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":100
      }
     
      
@@ -141,7 +165,9 @@
        "unit": "mm",
        "value":"0",
        "address":"DB100.68",
        "count":10
        "count":10,
        "min":0,
        "max":100
      },
      {
        "name": "22#格地址",
@@ -149,7 +175,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":100
      },
      {
        "name": "43#格地址",
@@ -157,7 +185,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":100
      },
      {
        "name": "64#格地址",
@@ -165,7 +195,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":100
      },
      {
        "name": "85#格地址",
@@ -173,7 +205,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":100
      },
      {
        "name": "106#格地址",
@@ -181,7 +215,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":100
      },
      {
        "name": "127#格地址",
@@ -189,7 +225,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":100
      },
      {
        "name": "148#格地址",
@@ -197,7 +235,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":100
      },
      {
        "name": "169#格地址",
@@ -205,7 +245,9 @@
        "sending": 0,
        "unit": "mm",
        "type": "0" ,
        "value":"0"
        "value":"0",
        "min":0,
        "max":100
      },
      {
        "name": "190#格地址",
@@ -213,7 +255,9 @@
        "sending": 0,
        "type": "0" ,
        "unit": "mm",
        "value":"0"
        "value":"0",
        "min":0,
        "max":100
      }
     
      
@@ -234,16 +278,19 @@
      "unit": "mm",
      "address":"DB100.0",
      "count":3,
      "value":"0"
      "value":"0",
      "min":0,
      "max":100
    },
    {
      "name": "22#格地址",
      "read": 11,
      "sending": 0,
      "unit": "mm",
      "type": "0"
      ,
      "value":"0"
      "type": "0",
      "value":"0",
      "min":0,
      "max":100
    },
    {
      "name": "43#格地址",
@@ -251,7 +298,9 @@
      "sending": 0,
      "unit": "mm",
      "type": "0",
      "value":"0"
      "value":"0",
      "min":0,
      "max":100
    },
    {
      "name": "64#格地址",
@@ -259,7 +308,9 @@
      "sending": 0,
      "unit": "mm",
      "type": "0",
      "value":"0"
      "value":"0",
      "min":0,
      "max":100
    },
    {
      "name": "85#格地址",
@@ -267,7 +318,9 @@
      "sending": 0,
      "unit": "mm",
      "type": "0",
      "value":"0"
      "value":"0",
      "min":0,
      "max":100
    }
   
    
@@ -287,7 +340,9 @@
          "sending": 0,
          "unit": "mm",
          "type": "0",
          "value":"0"
          "value":"0",
          "min":0,
          "max":100
        },
        {
          "name": "127#格地址",
@@ -295,7 +350,9 @@
          "sending": 0,
          "unit": "mm",
          "type": "0",
          "value":"0"
          "value":"0",
          "min":0,
          "max":100
        },
        {
          "name": "148#格地址",
@@ -303,7 +360,9 @@
          "sending": 0,
          "unit": "mm",
          "type": "0",
          "value":"0"
          "value":"0",
          "min":0,
          "max":100
        },
        {
          "name": "169#格地址",
@@ -311,7 +370,9 @@
          "sending": 0,
          "unit": "mm",
          "type": "0",
          "value":"0"
          "value":"0",
          "min":0,
          "max":100
        },
        {
          "name": "190#格地址",
@@ -319,7 +380,9 @@
          "sending": 0,
          "unit": "mm",
          "type": "0",
          "value":"0"
          "value":"0",
          "min":0,
          "max":100
        }