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

wu

2023-11-30 0ece3ba8c92df0438af52b8de6b9225d8ada4103

 CanadaMes-ui/src/configuration/parameter2.json

@@ -1,19 +1,20 @@
[
    
    [
      {
        "button": {
          "name": "D01手动状态",
          "value":0,
      "address":"DB10.0"
      },"type": "4"
      },
      "type": "4"
      },
      {
        "button": {
          "name": "清除ID",
          "value":0,
      "address":"DB10.0"
        },"type": "3"
      },
      "type": "3"
      },
      {
        "name": "ID",
@@ -21,22 +22,24 @@
        "sending": 0,
        "type": "0",
        "value":0
   
      }]
      ,[
    }
  ],
  [
      {
        "button": {
          "name": "D02手动状态",
          "value":0,
      "address":"DB10.0"
      },"type": "4"
      },
      "type": "4"
      },
      {
        "button": {
          "name": "清除ID",
          "value":0,
      "address":"DB10.0"
        },"type": "3"
      },
      "type": "3"
      },
      {
        "name": "ID",
@@ -44,23 +47,24 @@
        "sending": 0,
        "type": "0",
        "value":0
   
      }
    ]
    ,[
  ],
  [
      {
        "button": {
          "name": "D03手动状态",
          "value":0,
      "address":"DB10.0"
      },"type": "4"
      },
      "type": "4"
      },
      {
        "button": {
          "name": "清除ID",
          "value":0,
      "address":"DB10.0"
        },"type": "3"
      },
      "type": "3"
      },
      {
        "name": "ID",
@@ -68,23 +72,24 @@
        "sending": 0,
        "type": "0",
        "value":0
   
      }
    ]
    ,[
  ],
  [
      {
        "button": {
          "name": "D04手动状态",
          "value":0,
      "address":"DB10.0"
      },"type": "4"
      },
      "type": "4"
      },
      {
        "button": {
          "name": "清除ID",
          "value":0,
      "address":"DB10.0"
        },"type": "3"
      },
      "type": "3"
      },
      {
        "name": "ID",
@@ -92,26 +97,24 @@
        "sending": 0,
        "type": "0",
        "value":0
   
      }
      
     
    ]

     ,[
  ],
  [
      {
        "button": {
          "name": "D05手动状态",
          "value":0,
      "address":"DB10.0"
      },"type": "4"
      },
      "type": "4"
      },
      {
        "button": {
          "name": "清除ID",
          "value":0,
      "address":"DB10.0"
        },"type": "3"
      },
      "type": "3"
      },
      {
        "name": "ID",
@@ -119,25 +122,24 @@
        "sending": 0,
        "type": "0",
        "value":0
   
      }
      
     
    ]
    ,[
  ],
  [
      {
        "button": {
          "name": "D06手动状态",
          "value":0,
      "address":"DB10.0"
      },"type": "4"
      },
      "type": "4"
      },
      {
        "button": {
          "name": "清除ID",
          "value":0,
      "address":"DB10.0"
        },"type": "3"
      },
      "type": "3"
      },
      {
        "name": "ID",
@@ -145,24 +147,24 @@
        "sending": 0,
        "type": "0",
        "value":0
   
      }
      
     
    ] ,[
  ],
  [
      {
        "button": {
          "name": "A01手动状态",
          "value":0,
      "address":"DB10.0"
      },"type": "4"
      },
      "type": "4"
      },
      {
        "button": {
          "name": "清除ID",
          "value":0,
      "address":"DB10.0"
        },"type": "3"
      },
      "type": "3"
      },
      {
        "name": "ID1",
@@ -170,33 +172,31 @@
        "sending": 0,
        "type": "0",
        "value":0
   
      },{
    },
    {
        "name": "ID2",
        "read": 33,
        "sending": 0,
        "type": "0",
        "value":0
   
      }
      
     
    ]
    
    ,[
  ],
  [
      {
        "button": {
          "name": "A02手动状态",
          "value":0,
      "address":"DB10.0"
      },"type": "4"
      },
      "type": "4"
      },
      {
        "button": {
          "name": "清除ID",
          "value":0,
      "address":"DB10.0"
        },"type": "3"
      },
      "type": "3"
      },
      {
        "name": "ID",
@@ -204,25 +204,24 @@
        "sending": 0,
        "type": "0",
        "value":0
   
      }
      
     
    ]
    ,[
  ],
  [
      {
        "button": {
          "name": "B01手动状态",
          "value":0,
      "address":"DB10.0"
        },"type": "4"
      },
      "type": "4"
      },
      {
        "button": {
          "name": "清除ID",
          "value":0,
      "address":"DB10.0"
        },"type": "3"
      },
      "type": "3"
      },
      {
        "name": "ID",
@@ -230,24 +229,24 @@
        "sending": 0,
        "type": "0",
        "value":0
   
      }
      
     
    ],[
  ],
  [
      {
        "button": {
          "name": "B02手动状态",
          "value":0,
      "address":"DB10.0"
      },"type": "4"
      },
      "type": "4"
      },
      {
        "button": {
          "name": "清除ID",
          "value":0,
      "address":"DB10.0"
        },"type": "3"
      },
      "type": "3"
      },
      {
        "name": "ID",
@@ -255,33 +254,24 @@
        "sending": 0,
        "type": "0",
        "value":0
   
      }
      
      
     
    ]
    
    ,[
  ],
  [
      {
        "name": "扫描枪扫码的ID",
        "read": 66,
        "sending": 0,
        "type": "0",
        "value":0
   
      }
      
     
    ]
    ,[
  ],
  [
      {
        "name": "A01当前格子",
        "read": 333,
        "sending": 0,
        "type": "0",
        "value":0
   
      },
      {
        "name": "A02所在格子",
@@ -289,7 +279,6 @@
        "sending": 0,
        "type": "0",
        "value":0
   
      },
      {
        "name": "B01所在格子",
@@ -297,7 +286,6 @@
        "sending": 0,
        "type": "0",
        "value":0
   
      },
      {
        "name": "B02所在格子",
@@ -305,12 +293,6 @@
        "sending": 0,
        "type": "0",
        "value":0
   
      }
      
     
    ]
   
    
  ]