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

ZengTao

2023-12-04 ff6fd31ba5a4b6a6e74096786ff6d61293d15c73

 CanadaMes-ui/src/configuration/parameter2.json

@@ -180,7 +180,9 @@
      "type": "0",
      "value": 0
    }
    
  ],
 
  [
    {
      "button": {
@@ -199,8 +201,8 @@
      "type": "3"
    },
    {
      "name": "ID",
      "read": 33,
      "name": "A02ID",
      "read": "ID28",
      "sending": 0,
      "type": "0",
      "value": 0
@@ -210,22 +212,22 @@
    {
      "button": {
        "name": "B01手动状态",
        "value": 0,
        "address": "DB10.0"
        "value": 0
      
      },
      "type": "4"
    },
    {
      "button": {
        "name": "清除ID",
        "value": 0,
        "address": "DB10.0"
        "value": 0
        
      },
      "type": "3"
    },
    {
      "name": "ID",
      "read": 33,
      "name": "B01ID",
      "read": "ID29",
      "sending": 0,
      "type": "0",
      "value": 0
@@ -243,14 +245,14 @@
    {
      "button": {
        "name": "清除ID",
        "value": 0,
        "address": "DB10.0"
        "value": 0
    
      },
      "type": "3"
    },
    {
      "name": "ID",
      "read": 33,
      "name": "B02ID",
      "read": "ID210",
      "sending": 0,
      "type": "0",
      "value": 0
@@ -259,6 +261,13 @@
  [
    {
      "name": "扫描枪扫码的ID",
      "read": 0,
      "sending": 0,
      
      "value": 0
    },
    {
      "name": "ID1",
      "read": 66,
      "sending": 0,
      "type": "0",
@@ -267,6 +276,22 @@
  ],
  [
    {
      "name": "扫描枪扫码的ID",
      "read": 0,
      "sending": 0,
      
      "value": 0
    },
    {
      "name": "ID2",
      "read": 666,
      "sending": 0,
      "type": "0",
      "value": 0
    }
  ],
  [
    {
      "name": "A01当前格子",
      "read": 333,
      "sending": 0,