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

wu

2023-12-07 9e8a54035a7b13ef75558c6e44ae7a7cd55693c9

 CanadaMes-ui/src/configuration/ServoManualone.json

@@ -79,6 +79,7 @@
        "button": {
          "name": "A01半自动",
          "value":0,
          "type":66,
          "address":"DB10.0"
        }
      },
@@ -86,6 +87,7 @@
        "button": {
          "name": "A01半自动启动",
          "value":0,
          "type":66,
          "address":"DB10.0"
        }
      }
@@ -150,6 +152,7 @@
            "button": {
              "name": "A02半自动",
              "value":0,
              "type":66,
              "address":"DB10.0"
            }
          },
@@ -157,6 +160,7 @@
            "button": {
              "name": "A02半自动启动",
              "value":0,
              "type":66,
              "address":"DB10.0"
            }
          }
@@ -342,6 +346,17 @@
          }
          
    ]
    , [
      {
          "button": {
            "name": "急停后中止/继续选择",
            "value":0,
            "address":"DB10.0",
            "type":"66"
          }
        }
        
  ]
     
    
  ]