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

clll

2023-11-27 1ebc598658f85c07c7cbabaf289ab89838a8acc9

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

# Conflicts:
#	CanadaMes-ui/src/configuration/Parameter.json
#	CanadaMes-ui/src/configuration/Positioning1.json
#	CanadaMes-ui/src/configuration/Positioning2.json
#	CanadaMes-ui/src/configuration/ServoManualone.json
#	CanadaMes-ui/src/configuration/address.json
#	CanadaMes-ui/src/configuration/parameter1.json
#	CanadaMes-ui/src/configuration/parameter2.json
#	CanadaMes-ui/src/router/index.js
#	CanadaMes-ui/src/views/Electrical/Parameter1.vue
#	CanadaMes-ui/src/views/Electrical/Parameter2.vue
#	CanadaMes-ui/src/views/Electrical/Positioning1.vue
#	CanadaMes-ui/src/views/Electrical/Positioning2.vue
#	CanadaMes-ui/src/views/Electrical/ServoManualone.vue
#	CanadaMes-ui/src/views/Electrical/Servomanual.vue
#	springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java

 CanadaMes-ui/package-lock.json

@@ -15,6 +15,7 @@
        "js-cookie": "^3.0.1",
        "less": "^3.12.2",
        "less-loader": "^6.2.0",
        "lodash": "^4.17.21",
        "moment": "^2.29.4",
        "vue": "^2.6.11",
        "vue-i18n": "^8.26.5",
@@ -8652,9 +8653,8 @@
    },
    "node_modules/lodash": {
      "version": "4.17.21",
      "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.21.tgz?cache=0&sync_timestamp=1613835860585&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.21.tgz",
      "integrity": "sha1-Z5WRxWTDv/quhFTPCz3zcMPWkRw=",
      "dev": true
      "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
    },
    "node_modules/lodash.debounce": {
      "version": "4.0.8",
@@ -21507,9 +21507,8 @@
    },
    "lodash": {
      "version": "4.17.21",
      "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.21.tgz?cache=0&sync_timestamp=1613835860585&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.21.tgz",
      "integrity": "sha1-Z5WRxWTDv/quhFTPCz3zcMPWkRw=",
      "dev": true
      "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
    },
    "lodash.debounce": {
      "version": "4.0.8",

 CanadaMes-ui/package.json

@@ -15,6 +15,7 @@
    "js-cookie": "^3.0.1",
    "less": "^3.12.2",
    "less-loader": "^6.2.0",
    "lodash": "^4.17.21",
    "moment": "^2.29.4",
    "vue": "^2.6.11",
    "vue-i18n": "^8.26.5",

 CanadaMes-ui/src/configuration/Parameter.json

@@ -526,7 +526,7 @@
      "name": "A01 turn Target Angle(Manual)",
      "value": 0,
      "sending": 0,
      "unit": "°",
      "unit": "°",
      "state": "1",
      "type": "1",
      "page": "1"
@@ -535,7 +535,7 @@
      "name": "A02 turn Target Angle(Manual)",
      "value": 0,
      "sending": 0,
      "unit": "°",
      "unit": "°",
      "state": "1",
      "type": "1",
      "page": "1"
@@ -544,7 +544,7 @@
      "name": "A01 turn Angle1",
      "value": 0,
      "sending": 0,
      "unit": "°",
      "unit": "°",
      "state": "1",
      "type": "1",
      "page": "1"
@@ -553,7 +553,7 @@
      "name": "A01 turn Angle2",
      "value": 0,
      "sending": 0,
      "unit": "°",
      "unit": "°",
      "state": "1",
      "type": "1",
      "page": "1"
@@ -562,7 +562,7 @@
      "name": "A01 turn Angle3",
      "value": 0,
      "sending": 0,
      "unit": "°",
      "unit": "°",
      "state": "1",
      "type": "1",
      "page": "1"
@@ -571,7 +571,7 @@
      "name": "A01 turn Angle4",
      "value": 0,
      "sending": 0,
      "unit": "°",
      "unit": "°",
      "state": "1",
      "type": "1",
      "page": "1"
@@ -580,7 +580,7 @@
      "name": "A02 turn Angle1",
      "value": 0,
      "sending": 0,
      "unit": "°",
      "unit": "°",
      "state": "1",
      "type": "1",
      "page": "1"
@@ -589,7 +589,7 @@
      "name": "A02 turn Angle2",
      "value": 0,
      "sending": 0,
      "unit": "°",
      "unit": "°",
      "state": "1",
      "type": "1",
      "page": "1"
@@ -598,7 +598,7 @@
      "name": "A02 turn Angle3",
      "value": 0,
      "sending": 0,
      "unit": "°",
      "unit": "°",
      "state": "1",
      "type": "1",
      "page": "1"
@@ -607,7 +607,7 @@
      "name": "A02 turn Angle4",
      "value": 0,
      "sending": 0,
      "unit": "°",
      "unit": "°",
      "state": "1",
      "type": "1",
      "page": "1"

 CanadaMes-ui/src/configuration/Positioning1.json

@@ -1,4 +1,28 @@
[
    [{
      "name": "存片接片地址",
      "read": 33,
      "sending": 0,
      "type": "0",
      "value":"0"
      
    }],
    [{
      "name": "出片接片地址",
      "read": 33,
      "sending": 0,
      "type": "0",
      "value":"0"
      
    }],
    [{
      "name": "格子间距",
      "read": 33,
      "sending": 0,
      "type": "0",
      "value":"0"
      
    }],
    
    [
        {

 CanadaMes-ui/src/configuration/Positioning2.json

@@ -5,7 +5,7 @@
            "title": {
              "name": "B01格位置设定"
              
            }
            }, "type": "1"
          },
      {
        "name": "1#格地址",
@@ -13,31 +13,37 @@
        "sending": 0,
        "type": "0",
        "address":"DB100.0",
        "count":3
        "count":3,
        "value":"0"
      },
      {
        "name": "22#格地址",
        "read": 11,
        "sending": 0,
        "type": "0"
        ,
        "value":"0"
      },
      {
        "name": "43#格地址",
        "read": 22,
        "sending": 0,
        "type": "0"
        "type": "0",
        "value":"0"
      },
      {
        "name": "64#格地址",
        "read": 22,
        "sending": 0,
        "type": "0"
        "type": "0",
        "value":"0"
      },
      {
        "name": "85#格地址",
        "read": 22,
        "sending": 0,
        "type": "0"
        "type": "0",
        "value":"0"
      }
     
      
@@ -49,37 +55,42 @@
            "title": {
              "name": "B02位置设定"
              
            }
            }, "type": "1"
          },
          {
            "name": "106#格地址",
            "read": 22,
            "sending": 0,
            "type": "0"
            "type": "0",
            "value":"0"
          },
          {
            "name": "127#格地址",
            "read": 22,
            "sending": 0,
            "type": "0"
            "type": "0",
            "value":"0"
          },
          {
            "name": "148#格地址",
            "read": 22,
            "sending": 0,
            "type": "0"
            "type": "0",
            "value":"0"
          },
          {
            "name": "169#格地址",
            "read": 22,
            "sending": 0,
            "type": "0"
            "type": "0",
            "value":"0"
          },
          {
            "name": "190#格地址",
            "read": 22,
            "sending": 0,
            "type": "0"
            "type": "0",
            "value":"0"
          }
         
     

 CanadaMes-ui/src/configuration/ServoManualone.json

@@ -1,24 +1,5 @@
[
  [
    {
      "name": "大车自动速度",
      "read": 33,
      "sending": 0,
      "type": "0",
      "address": "DB100.0",
      "count": 3
    }
  ],
  [
    {
      "name": "小车自动速度",
      "read": 33,
      "sending": 0,
      "type": "0",
      "address": "DB100.0",
      "count": 3
    }
  ],
    
  [
    {
      "name": "A01 所在格子",
@@ -26,19 +7,58 @@
      "sending": 0,
      "type": "0",
      "address": "DB100.0",
      "count": 3
        "value":0
      
      },
      {
        "name": "数量",
        "read": 33,
        "sending": 0,
        "type": "0",
        "value":0
     
      
      },
      {
        "name": "进片ID",
        "read": 33,
        "sending": 0,
        "type": "0",
        "value":0
     
      
      },
      {
        "name": "长度",
        "read": 33,
        "sending": 0,
        "type": "0",
        "value":0
     
      
      },
      {
        "name": "高度",
        "read": 33,
        "sending": 0,
        "type": "0",
        "value":0
     
      
    },
    {
      "name": "取片格子",
      "read": 11,
      "sending": 0,
      "type": "0"
        "type": "0",
        "value":0
    },
    {
      "name": "存片格子",
      "read": 22,
      "sending": 0,
      "type": "0"
        "type": "0",
        "value":0
    },
    {
      "button": {
@@ -56,7 +76,14 @@
    },
    {
      "button": {
        "name": "自动启动",
          "name": "A01半自动",
          "value":0,
          "address":"DB10.0"
        }
      },
      {
        "button": {
          "name": "半自动启动",
        "value": 0,
        "address": "DB10.0"
      }
@@ -69,19 +96,40 @@
      "sending": 0,
      "type": "0",
      "address": "DB100.1",
      "count": 3
            "count":3,
            "value":0
    },
    {
      "name": "取片格子",
      "read": 11,
      "sending": 0,
      "type": "0"
            "type": "0",
            "value":0
    },
    {
      "name": "存片格子",
      "read": 22,
      "sending": 0,
      "type": "0"
            "type": "0",
            "value":0
          },
          {
            "name": "数量",
            "read": 33,
            "sending": 0,
            "type": "0",
            "value":0
         
          
          },
          {
            "name": "取片ID",
            "read": 33,
            "sending": 0,
            "type": "0",
            "value":0
         
          
    },
    {
      "button": {
@@ -99,27 +147,118 @@
    },
    {
      "button": {
        "name": "自动启动",
              "name": "A02半自动",
              "value":0,
              "address":"DB10.0"
            }
          },
          {
            "button": {
              "name": "半自动启动",
        "value": 0,
        "address": "DB10.0"
      }
    }
  ],
   
  [
      {
          "name": "A01翻转实时位置",
          "read": 33,
          "sending": 0,
          "type": "0",
          "address":"DB100.2",
          "count":3,
          "value":0
        },
        
        
        {
          "button": {
            "name": "故障",
            "value":0,
            "address":"DB10.0"
          }
        },
        {
          "button": {
            "name": "复位",
            "value":0,
        "address":"DB10.0"
          }
        },
        {
          "button": {
            "name": "未回零",
            "value":0,
        "address":"DB10.0"
          }
        },
        {
          "button": {
            "name": "回零",
            "value":0,
        "address":"DB10.0"
          }
        }
  ],[
    {
        "name": "A02翻转实时位置",
        "read": 33,
        "sending": 0,
        "type": "0",
        "address":"DB100.2",
        "count":3,
        "value":0
      },
      
      
      {
        "button": {
          "name": "故障",
          "value":0,
          "address":"DB10.0"
        }
      },
      {
        "button": {
          "name": "复位",
          "value":0,
      "address":"DB10.0"
        }
      },
      {
        "button": {
          "name": "未回零",
          "value":0,
      "address":"DB10.0"
        }
      },
      {
        "button": {
          "name": "回零",
          "value":0,
      "address":"DB10.0"
        }
      }
], [
    {
      "name": "B01 所在格子",
      "read": 33,
      "sending": 0,
      "type": "0",
      "address": "DB100.2",
      "count": 3
      "count":3,
      "value":0
    },
    {
      "name": "目标格子",
      "read": 11,
      "sending": 0,
      "type": "0"
      "type": "0",
      "value":0
    },
    
    {
      "button": {
        "name": "故障",
@@ -133,8 +272,22 @@
        "value": 0,
        "address": "DB10.0"
      }
    } ,{
      "button": {
        "name": "未回零",
        "value":0,
    "address":"DB10.0"
      }
    },
    {
      "button": {
        "name": "回零",
        "value":0,
    "address":"DB10.0"
      }
    }
  ],
    
  [
    {
      "name": "B02 所在格子",
@@ -142,14 +295,17 @@
      "sending": 0,
      "type": "0",
      "address": "DB100.3",
      "count": 3
            "count":3,
            "value":0
    },
    {
      "name": "目标格子",
      "read": 11,
      "sending": 0,
      "type": "0"
            "type": "0",
            "value":0
    },
          
    {
      "button": {
        "name": "故障",
@@ -162,57 +318,25 @@
        "name": "复位",
        "value": 0,
        "address": "DB10.0"

      }
    }
  ],
  [
    {
      "name": "B02 所在格子",
      "read": 33,
      "sending": 0,
      "type": "0",
      "address": "DB100.3",
      "count": 3
    },
    {
      "name": "目标格子",
      "read": 11,
      "sending": 0,
      "type": "0"
    },
    {
          } ,{
      "button": {
        "name": "故障",
              "name": "未回零",
        "value": 0,
        "address": "DB10.0"
      }
    },
    {
      "button": {
        "name": "复位",
              "name": "回零",
        "value": 0,
        "address": "DB10.0"
      }
    }
  ],
  [
    {
      "name": "存片接片地址",
      "read": 33,
      "sending": 0,
      "type": "0",
      "address": "DB100.4",
      "count": 3
    }
  ],
  [
    {
      "name": "出片接片地址",
      "read": 33,
      "sending": 0,
      "type": "0",
      "address": "DB100.5",
      "count": 3
    }
          
  ]
     
    
]
  

 CanadaMes-ui/src/configuration/address.json

@@ -1,4 +1,5 @@
{
    
  "parameter1": [
    {
      "name": "DB100.0",
@@ -14,11 +15,13 @@
  "parameter2": [
    {
      "name": "DB100.0",
      "count": 12
          "count": 12,
          "type": 0
    },
    {
      "name": "DB100.0",
      "count": 12
          "count": 12,
          "type": 1
    }
  ],
  "Positioning1": [
@@ -49,20 +52,6 @@
    {
      "name": "DB100.0",
      "count": 12
    }
  ],
  "Manualoneposition": [
    {
      "name": "DB100.0",
      "count": 72
    },
    {
      "name": "DB101.0",
      "count": 22
    },
    {
      "name": "DB102.0",
      "count": 33
    }
  ]
}

 CanadaMes-ui/src/configuration/parameter1.json

@@ -13,25 +13,29 @@
        "sending": 0,
        "type": "0",
        "address":"DB100.0",
        "count":3
        "count":3,
        "value":0
      },
      {
        "name": "高速线速度",
        "read": 11,
        "sending": 0,
        "type": "0"
        "type": "0",
        "value":0
      },
      {
        "name": "低速线速度",
        "read": 11,
        "sending": 0,
        "type": "0"
        "type": "0",
        "value":0
      },
      {
        "name": "手动速度",
        "read": 22,
        "sending": 0,
        "type": "0"
        "type": "0",
        "value":0
      }
      
     
@@ -50,25 +54,29 @@
      "sending": 0,
      "type": "0",
      "address":"DB100.0",
      "count":3
      "count":3,
      "value":0
    },
    {
      "name": "高速线速度",
      "read": 11,
      "sending": 0,
      "type": "0"
      "type": "0",
      "value":0
    },
    {
      "name": "低速线速度",
      "read": 11,
      "sending": 0,
      "type": "0"
      "type": "0",
      "value":0
    },
    {
      "name": "手动速度",
      "read": 22,
      "sending": 0,
      "type": "0"
      "type": "0",
      "value":0
    }
    
   
@@ -85,25 +93,56 @@
    "sending": 0,
    "type": "0",
    "address":"DB100.0",
    "count":3
    "count":3,
    "value":0
  },
  {
    "name": "高速线速度",
    "read": 11,
    "sending": 0,
    "type": "0"
    "type": "0",
    "value":0
  },
  {
    "name": "低速线速度",
    "read": 11,
    "sending": 0,
    "type": "0"
    "type": "0",
    "value":0
  },
  {
    "name": "手动速度",
    "read": 22,
    "sending": 0,
    "type": "0"
    "type": "0",
    "value":0
  }
  
 
]
,[
  
{
  "name": "翻转点动速度",
  "read": 33,
  "sending": 0,
  "type": "0",
  "address":"DB100.0",
  "count":3,
  "value":0
}


],
[
  

  {
    "name": "小车点动速度",
    "read": 11,
    "sending": 0,
    "type": "0",
    "value":0
  }
  
 

 CanadaMes-ui/src/configuration/parameter2.json

@@ -2,126 +2,314 @@
    
    [
        {
            "title": {
              "name": "A01输送"
              
            }
        "button": {
          "name": "D03手动状态",
          "value":0,
      "address":"DB10.0"
      },"type": "4"
          },
      {
        "name": "高速线速度",
        "button": {
          "name": "清除ID",
          "value":0,
      "address":"DB10.0"
        },"type": "3"
      },
      {
        "name": "ID",
        "read": 33,
        "sending": 0,
        "type": "0",
        "address":"DB100.0",
        "count":3
        "value":0
   
      }]
      ,[
      {
        "button": {
          "name": "D04手动状态",
          "value":0,
      "address":"DB10.0"
      },"type": "4"
      },
      {
        "name": "低速线速度",
        "read": 11,
        "sending": 0,
        "type": "0"
        "button": {
          "name": "清除ID",
          "value":0,
      "address":"DB10.0"
        },"type": "3"
      },
      {
        "name": "手动速度",
        "read": 22,
        "sending": 0,
        "type": "0"
      }
      
     
    ],

    [
        {
            "title": {
              "name": "B02输送"
              
            }
          },
      {
        "name": "高速线速度",
        "name": "ID",
        "read": 33,
        "sending": 0,
        "type": "0",
        "address":"DB100.0",
        "count":3
      },
      {
        "name": "低速线速度",
        "read": 11,
        "sending": 0,
        "type": "0"
      },
      {
        "name": "手动速度",
        "read": 22,
        "sending": 0,
        "type": "0"
      }
      
     
    ],
    [
        {
            "title": {
              "name": "A02输送"
        "value":0
              
            }
    ]
    ,[
      {
        "button": {
          "name": "D05手动状态",
          "value":0,
      "address":"DB10.0"
      },"type": "4"
          },
      {
        "name": "高速线速度",
        "button": {
          "name": "清除ID",
          "value":0,
      "address":"DB10.0"
        },"type": "3"
      },
      {
        "name": "ID",
        "read": 33,
        "sending": 0,
        "type": "0",
        "address":"DB100.0",
        "count":3
      },
      {
        "name": "低速线速度",
        "read": 11,
        "sending": 0,
        "type": "0"
      },
      {
        "name": "手动速度",
        "read": 22,
        "sending": 0,
        "type": "0"
      }
      
     
    ],
    [
        {
            "title": {
              "name": "B02输送"
        "value":0
              
            }
    ]
    ,[
      {
        "button": {
          "name": "D06手动状态",
          "value":0,
      "address":"DB10.0"
      },"type": "4"
          },
      {
        "name": "高速线速度",
        "button": {
          "name": "清除ID",
          "value":0,
      "address":"DB10.0"
        },"type": "3"
      },
      {
        "name": "ID",
        "read": 33,
        "sending": 0,
        "type": "0",
        "address":"DB100.0",
        "count":3
      },
      {
        "name": "低速线速度",
        "read": 11,
        "sending": 0,
        "type": "0"
      },
      {
        "name": "手动速度",
        "read": 22,
        "sending": 0,
        "type": "0"
        "value":0
   
      }
      
     
    ]
  
     ,[
      {
        "button": {
          "name": "A02手动状态",
          "value":0,
      "address":"DB10.0"
      },"type": "4"
      },
      {
        "button": {
          "name": "清除ID",
          "value":0,
      "address":"DB10.0"
        },"type": "3"
      },
      {
        "name": "ID",
        "read": 33,
        "sending": 0,
        "type": "0",
        "value":0
   
      }
      
     
    ]
    ,[
      {
        "button": {
          "name": "B01手动状态",
          "value":0,
      "address":"DB10.0"
      },"type": "4"
      },
      {
        "button": {
          "name": "清除ID",
          "value":0,
      "address":"DB10.0"
        },"type": "3"
      },
      {
        "name": "ID",
        "read": 33,
        "sending": 0,
        "type": "0",
        "value":0
   
      }
      
     
    ] ,[
      {
        "button": {
          "name": "B02手动状态",
          "value":0,
      "address":"DB10.0"
      },"type": "4"
      },
      {
        "button": {
          "name": "清除ID",
          "value":0,
      "address":"DB10.0"
        },"type": "3"
      },
      {
        "name": "ID",
        "read": 33,
        "sending": 0,
        "type": "0",
        "value":0
   
      }
      
     
    ]
    
    ,[
      {
        "button": {
          "name": "D01手动状态",
          "value":0,
      "address":"DB10.0"
      },"type": "4"
      },
      {
        "button": {
          "name": "清除ID",
          "value":0,
      "address":"DB10.0"
        },"type": "3"
      },
      {
        "name": "ID",
        "read": 33,
        "sending": 0,
        "type": "0",
        "value":0
   
      }
      
     
    ]
    ,[
      {
        "button": {
          "name": "D02手动状态",
          "value":0,
      "address":"DB10.0"
        },"type": "4"
      },
      {
        "button": {
          "name": "清除ID",
          "value":0,
      "address":"DB10.0"
        },"type": "3"
      },
      {
        "name": "ID",
        "read": 33,
        "sending": 0,
        "type": "0",
        "value":0
   
      }
      
     
    ],[
      {
        "button": {
          "name": "A01手动状态",
          "value":0,
      "address":"DB10.0"
      },"type": "4"
      },
      {
        "button": {
          "name": "清除ID",
          "value":0,
      "address":"DB10.0"
        },"type": "3"
      },
      {
        "name": "ID1",
        "read": 33,
        "sending": 0,
        "type": "0",
        "value":0
   
      },
      {
        "name": "ID2",
        "read": 33,
        "sending": 0,
        "type": "0",
        "value":0
   
      }
      
     
    ]
    
    ,[
      {
        "name": "扫描枪扫码的ID",
        "read": 33,
        "sending": 0,
        "type": "0",
        "value":0
   
      }
      
     
    ]
    ,[
      {
        "name": "A01当前格子",
        "read": 33,
        "sending": 0,
        "type": "0",
        "value":0
   
      },
      {
        "name": "A02所在格子",
        "read": 33,
        "sending": 0,
        "type": "0",
        "value":0
   
      },
      {
        "name": "B01所在格子",
        "read": 33,
        "sending": 0,
        "type": "0",
        "value":0
   
      },
      {
        "name": "B02所在格子",
        "read": 33,
        "sending": 0,
        "type": "0",
        "value":0
   
      }
      
     
    ]
   
    
  ]

 CanadaMes-ui/src/views/Electrical/Parameter.vue

@@ -57,18 +57,18 @@
      record: {

        params: [100, 200, 10, 10, 10, 10],

        xyData: [

          { name: "conveyor Velocity(Auto FAST)", value: 0, value2: 0, unit: "m/min" },

          { name: "conveyor Velocity(Auto SLOW)", value: 0, value2: 0, unit: "m/min" },

          { name: "conveyor Velocity(Manual)", value: 0, value2: 0, unit: "m/min" },

          { name: "A01 A02 TURN JOG Velocity", value: 0, value2: 0, unit: "mm/S" },

          { name: "A01 A02 TRAVEL JOG Velocity", value: 0, value2: 0, unit: "mm/S" },

          { name: "B01 B02 TRAVEL JOG Velocity", value: 0, value2: 0, unit: "mm/S" },

          { name: "A01 A02 TURN POS Velocity AUTO", value: 0, value2: 0, unit: "mm/S" },

          { name: "A01 A02 TURN POS Velocity manual", value: 0, value2: 0, unit: "mm/S" },

          { name: "A01 A02 TRAVEL POS Velocity AUTO", value: 0, value2: 0, unit: "mm/S" },

          { name: "A01 A02 TRAVEL POS Velocity manual", value: 0, value2: 0, unit: "mm/S" },

          { name: "B01 B02 TRAVEL POS Velocity AUTO", value: 0, value2: 0, unit: "mm/S" },

          { name: "B01 B02 TRAVEL POS Velocity manual", value: 0, value2: 0, unit: "mm/S" }

          { name: "conveyor Velocity(Auto FAST)", value: 0, value2: 1, unit: "m/min" },

          { name: "conveyor Velocity(Auto SLOW)", value: 0, value2: 1, unit: "m/min" },

          { name: "conveyor Velocity(Manual)", value: 0, value2: 1, unit: "m/min" },

          { name: "A01 A02 TURN JOG Velocity", value: 0, value2: 1, unit: "mm/S" },

          { name: "A01 A02 TRAVEL JOG Velocity", value: 0, value2: 1, unit: "mm/S" },

          { name: "B01 B02 TRAVEL JOG Velocity", value: 0, value2: 1, unit: "mm/S" },

          { name: "A01 A02 TURN POS Velocity AUTO", value: 0, value2: 1, unit: "mm/S" },

          { name: "A01 A02 TURN POS Velocity manual", value: 0, value2: 1, unit: "mm/S" },

          { name: "A01 A02 TRAVEL POS Velocity AUTO", value: 0, value2: 1, unit: "mm/S" },

          { name: "A01 A02 TRAVEL POS Velocity manual", value: 0, value2: 1, unit: "mm/S" },

          { name: "B01 B02 TRAVEL POS Velocity AUTO", value: 0, value2: 1, unit: "mm/S" },

          { name: "B01 B02 TRAVEL POS Velocity manual", value: 0, value2: 1, unit: "mm/S" }

        ],

        canshu: []

      },


 CanadaMes-ui/src/views/Electrical/Parameter1.vue

@@ -11,40 +11,24 @@
      }}</router-link>
      <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
      }}</router-link>
      <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{
        $t('ServoManual')
       <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual')
      }}</router-link>
    </el-breadcrumb>

    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
      <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{
        $t('Servomanualone')
      <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{ $t('Servomanualone')
      }}</router-link>
      <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
      }}</router-link>
      <!-- <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
        }}</router-link> -->
      <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{
        $t('Positioning1')
         <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
      }}</router-link>
      <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
        $t('Positioning2')
          <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning1')
      }}</router-link>
      <router-link to="/Electrical/Manualoneposition" tag="el-button" type="text" active-class="blue-button">{{
        $t('Manualoneposition')
      }}</router-link>
      <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
        $t('ManualonePosition2')
      }}</router-link>
      <router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
        $t('AutomaticParameterSetting')
      }}</router-link>
      <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
        $t('ManualJog')
           <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning2')
      }}</router-link>
    </el-breadcrumb>

    <el-row :gutter="18">
  <el-row :gutter="18"  class="card">
      <el-col :span="7" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
        <el-card class="json-block">
          <div class="button-row" style="display: flex; justify-content: space-between;">
@@ -55,7 +39,7 @@
          <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
            <div class="item-row">
              <span class="name" style="width:250px;">{{ item.name }}</span>
              <el-input v-if="item.type === '0'" v-model="item.value" class="input-box"></el-input>
            <el-input v-if="item.type === '0'" v-model="item.value" class="input-box"  @keyup.enter.native="submitDataToBackend"></el-input>
            </div>
          </div>

@@ -69,7 +53,8 @@
<script>
import LanguageMixin from '../../lang/LanguageMixin'
import data from '../../configuration/parameter1'

import { throttle } from 'lodash';
let socket;
export default {
  name: "Parameter1",
  mixins: [LanguageMixin],
@@ -77,6 +62,10 @@
    return {
      jsonData: data // 加载整个data.json文件作为jsonData
    }
}, created () {
    this.initWebSocket();
    // console.log('jsonData:', this.jsonData); 

  },
  methods: {
    updateButtonValue (dataGroup, itemIndex) {
@@ -86,18 +75,129 @@
      const inputData = this.jsonData.map(dataGroup => {
        return dataGroup.map(item => {
          if (item.type === '0') {
            return { name: item.name, value: item.value, address: item.address };
        return { value: parseInt(item.value) };
          } else if (item.button) {
            return { name: item.title.name, value: item.title.value, address: item.title.address };
        return { value: parseInt(item.button.value) };
          }
          return null;
        });
      });

      // 模拟提交数据到后端的操作，实际情况下需要根据你的后端API进行修改
      console.log('提交以下数据到后端:', inputData);
  // 将inputData转换为整数数组
  const integerArray = inputData.map(dataGroup => {
    return dataGroup.map(item => {
      if (item !== null) {
        return item.value;
      }
      return null;
    });
  });
  // 构建JSON对象
  const jsonObject = { data: integerArray };
 
  // 提交数据到后端
  const jsonString = JSON.stringify(jsonObject);
  console.log('提交以下数据到后端:', jsonString);
  socket?.send(jsonString);
},
    initWebSocket () {
 
      let viewname = "Parameter1";

      if (typeof WebSocket === "undefined") {
        console.log("您的浏览器不支持WebSocket");
      } else {
        let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname;

        if (socket != null) {
          socket.close();
          socket = null;
        }

        // 开启一个websocket服务
        socket = new WebSocket(socketUrl);

        // 打开事件
        socket.onopen = function () {
          console.log("websocket已打开");
        };

        // 收到消息
        socket.onmessage = (msg) => {
  if (!msg.data) {
    return; // 如果收到空数据，则直接返回，不执行后续逻辑
  }

  let obj = JSON.parse(msg.data);
  const jsonData2 = this.jsonData;

  const handleMouseMove = throttle(function(event) {
    const inputBox = document.querySelectorAll('.el-card__body');
  const target = event.target;
  if (inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
      const parms = obj.params;
      const fanzhuan = obj.fanzhuan;
      const xiaoche = obj.xiaoche;
      
      // console.log('parms:', parms);
      // console.log('fanzhuan:', fanzhuan);
      // console.log('xiaoche:', xiaoche);
      
      let index = 0;
      for (let i = 0; i < jsonData2.length; i++) {
        let arr = jsonData2[i];
        for (let j = 0; j < arr.length; j++) {
          let obj = arr[j];
          if (obj.type === '0' && Object.prototype.hasOwnProperty.call(obj, 'value')) {
            if (Array.isArray(parms) && Array.isArray(parms[0]) && parms[0][index] !== undefined) {
              obj.value = parms[0][index];
              index++;
            }
          }
        }
      }
      if (Array.isArray(fanzhuan) && Array.isArray(fanzhuan[0]) && fanzhuan[0][0] !== undefined) {
        jsonData2[3][0]['value'] = fanzhuan[0][0];
      }
      if (Array.isArray(xiaoche) && Array.isArray(xiaoche[0]) && xiaoche[0][0] !== undefined) {
        jsonData2[4][0]['value'] = xiaoche[0][0];
      }
    }
  }, 200);

  document.addEventListener('mouseover', handleMouseMove);
};






        // 关闭事件
        socket.onclose = function () {
          console.log("websocket已关闭");
        };

        // 发生错误事件
        socket.onerror = function () {
          console.log("websocket发生了错误");
        };
     

    }
     
    },
    replaceChineseWithEnglish () {
      const translation = this.$t('Parameter1');
      this.jsonData = this.jsonData.map(item => { return { name: translation[item.name] || item.name, value: item.value }; });
      // console.log(translation);
    },
    send () {
     
     
      socket?.send(JSON.stringify(this.messagepack));
    },

  }
}
</script>
@@ -106,8 +206,7 @@
.item-row {
  display: flex;
  align-items: center;
  margin-bottom: 5px;
  /* 调整每个项目之间的间距 */
margin-bottom: 5px; /* 调整每个项目之间的间距 */
}

.action-button {
@@ -115,7 +214,6 @@
  background: #66b1ff;
  color: #FFF;
}

.blue-button {
  background-color: skyblue;
}

 CanadaMes-ui/src/views/Electrical/Parameter2.vue

@@ -11,51 +11,44 @@
      }}</router-link>
      <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
      }}</router-link>
      <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{
        $t('ServoManual')
         <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual')
      }}</router-link>
    </el-breadcrumb>

    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
      <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{
        $t('Servomanualone')
        <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{ $t('Servomanualone')
      }}</router-link>
      <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
      }}</router-link>
      <!-- <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
          }}</router-link> -->
      <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{
        $t('Positioning1')
         <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
      }}</router-link>
      <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
        $t('Positioning2')
            <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning1')
      }}</router-link>
      <router-link to="/Electrical/Manualoneposition" tag="el-button" type="text" active-class="blue-button">{{
        $t('Manualoneposition')
      }}</router-link>
      <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
        $t('ManualonePosition2')
      }}</router-link>
      <router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
        $t('AutomaticParameterSetting')
      }}</router-link>
      <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
        $t('ManualJog')
            <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning2')
      }}</router-link>
    </el-breadcrumb>

    <el-row :gutter="20">
      <el-col :span="12" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
        <el-card class="json-block">
      <el-col :span="6" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
        <el-card class="json-block"  style="width:260px;">
          <div class="button-row" style="display: flex; justify-content: space-between;">
            <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
              <span v-if="item.title" :name="item.title.name" class="action-button">{{ item.title.name }}</span>
            </div>
          </div>

          <div class="button-row" style="display: flex; justify-content: space-between;">
            <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
              <el-button v-if="item.button" :name="item.button.name" v-model="item.button.value" class="action-button"
  @click="updateButtonValue(dataGroup, itemIndex);submitDataToBackend(item.button.name)"
  :class="{ 'green-button': item.button.value === 0  && item.button.name !== '清除ID','red-button': item.button.value === 1 && item.button.name !== '清除ID' }">{{ item.button.name }}</el-button>
            </div>
          </div>
          <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
            <div class="item-row">
              <span class="name" style="width:250px;">{{ item.name }}</span>
              <el-input v-if="item.type === '0'" v-model="item.value" class="input-box"></el-input>

              <span class="name" style="width:150px;">{{ item.name }}</span>
              <el-input v-if="item.type === '0'" v-model="item.value" readonly="readonly"    style="width:150px;" class="input-box"></el-input>
            </div>
          </div>

@@ -69,35 +62,152 @@
<script>
import LanguageMixin from '../../lang/LanguageMixin'
import data from '../../configuration/parameter2'

  let socket;
export default {
  name: "Parameter2",
  mixins: [LanguageMixin],
  data () {
    return {
      jsonData: data // 加载整个data.json文件作为jsonData
      jsonData: data ,

      // 加载整个data.json文件作为jsonData
    }
  },
  created () {
    this.initWebSocket();
    // console.log('jsonData:', this.jsonData); 

  },
  methods: {
    updateButtonValue (dataGroup, itemIndex) {
      this.$set(dataGroup[itemIndex].button, 'value', 1); // 点击按钮后将值改为1
  // 将当前按钮的值设为1

    this.$set(dataGroup[itemIndex].button, 'value', 1);
  

  // 将其他按钮的值全部设为0

    },
    submitDataToBackend () {
    submitDataToBackend(currentButtonName) {
  if (currentButtonName === '清除ID') {
      const inputData = this.jsonData.map(dataGroup => {
        return dataGroup.map(item => {
          if (item.type === '0') {
            return { name: item.name, value: item.value, address: item.address };
          } else if (item.button) {
            return { name: item.title.name, value: item.title.value, address: item.title.address };
        if (item.type === '3') {
          return { value: item.button.value };
          }
          return null;
        });
      });

      // 模拟提交数据到后端的操作，实际情况下需要根据你的后端API进行修改
      console.log('提交以下数据到后端:', inputData);
    const values = inputData.flat().filter(item => item !== null).map(item => item.value);

    const jsonObject = { data: values };
 
 // 提交数据到后端
 const jsonString = JSON.stringify(jsonObject);
   console.log('Type为3的value:', jsonString);
     socket?.send(jsonString);
  }
},
    initWebSocket () {
 
      let viewname = "Parameter2";

      if (typeof WebSocket === "undefined") {
        console.log("您的浏览器不支持WebSocket");
      } else {
        let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname;

        if (socket != null) {
          socket.close();
          socket = null;
        }

        // 开启一个websocket服务
        socket = new WebSocket(socketUrl);

        // 打开事件
        socket.onopen = function () {
          console.log("websocket已打开");
        };

        // 收到消息
        socket.onmessage = (msg) => {
  if (!msg.data) {
    return; // 如果收到空数据，则直接返回，不执行后续逻辑
  }

  let obj = JSON.parse(msg.data);
 
  const jsonData2 = this.jsonData;
 
      // 如果鼠标不在输入框内，更新输入框的值
      // this.submitDataToBackend()
      const parms = obj.params;
      // console.log(parms);

      for (let i = 0; i < jsonData2.length; i++) {
  let arr = jsonData2[i];
  for (let j = 0; j < arr.length; j++) {
    let obj = arr[j];
    if (obj.type === '0') {
      obj.value = parms[1][i];
    }
  }


    }

for (let i = 0; i < jsonData2.length; i++) {
  let arr = jsonData2[i];
  for (let j = 0; j < arr.length; j++) {
    let obj = arr[j];
    if (obj.type === '4') {
      obj.button.value = parms[2][i];
    }
  }

     
}

for (let i = 0; i < jsonData2.length; i++) {
  let arr = jsonData2[i];
  for (let j = 0; j < arr.length; j++) {
    let obj = arr[j];
    if (obj.type === '3') {
      obj.button.value = parms[0][i];
    }
  }

     
}

//  console.log(jsonData2);

  
};




        // 关闭事件
        socket.onclose = function () {
          console.log("websocket已关闭");
        };

        // 发生错误事件
        socket.onerror = function () {
          console.log("websocket发生了错误");
        };

      }
    },
    send () {
     
     
      socket?.send(JSON.stringify(this.messagepack));
    }

  }
}
</script>
@@ -106,8 +216,7 @@
.item-row {
  display: flex;
  align-items: center;
  margin-bottom: 5px;
  /* 调整每个项目之间的间距 */
  margin-bottom: 5px; /* 调整每个项目之间的间距 */
}

.action-button {
@@ -115,8 +224,16 @@
  background: #66b1ff;
  color: #FFF;
}

.blue-button {
  background-color: skyblue;
}

.green-button {
  background-color: green;
}

.red-button{
  background-color: red;
}

</style>

 CanadaMes-ui/src/views/Electrical/Positioning1.vue

@@ -11,41 +11,25 @@
      }}</router-link>
      <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
      }}</router-link>
      <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{
        $t('ServoManual')
         <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual')
      }}</router-link>
    </el-breadcrumb>

    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
      <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{
        $t('Servomanualone')
        <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{ $t('Servomanualone')
      }}</router-link>
      <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
      }}</router-link>
      <!-- <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
          }}</router-link> -->
      <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{
        $t('Positioning1')
         <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
      }}</router-link>
      <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
        $t('Positioning2')
           <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning1')
      }}</router-link>
      <router-link to="/Electrical/Manualoneposition" tag="el-button" type="text" active-class="blue-button">{{
        $t('Manualoneposition')
      }}</router-link>
      <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
        $t('ManualonePosition2')
      }}</router-link>
      <router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
        $t('AutomaticParameterSetting')
      }}</router-link>
      <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
        $t('ManualJog')
            <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning2')
      }}</router-link>
    </el-breadcrumb>

    <el-row :gutter="18">
      <el-col :span="7" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex" class='card'>
    <el-row :gutter="18" class='card'>
      <el-col :span="7" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex" >
        <el-card class="json-block">
          <div class="button-row" style="display: flex; justify-content: space-between;">
            <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
@@ -56,7 +40,10 @@
            <div class="item-row">
              <span class="name" style="width:250px;">{{ item.name }}</span>
              <el-input v-if="item.type === '0'" v-model="item.value" class="input-box"></el-input>
              <el-button v-if="item.type === '0'" class="input-box" @click="submitDataToBackend();">取地址</el-button>
              

              
              <el-button v-if="item.type === '0' && item.name !== '格子间距'  && item.name !== '出片接片地址'   && item.name !== '存片接片地址'"  class="input-box"  @click="submitDataToBackend();">取地址</el-button>
            </div>
          </div>

@@ -82,7 +69,7 @@
  },
  created () {
    this.initWebSocket();
    console.log('jsonData:', this.jsonData);
    // console.log('jsonData:', this.jsonData); 

  },
  methods: {
@@ -115,7 +102,7 @@

      // 提交数据到后端
      const jsonString = JSON.stringify(jsonObject);
      console.log('提交以下数据到后端:', jsonString);
  // console.log('提交以下数据到后端:', jsonString);
      socket?.send(jsonString);
    },
    initWebSocket () {
@@ -149,29 +136,32 @@
          let obj = JSON.parse(msg.data);
          const jsonData2 = this.jsonData;
          document.addEventListener('mouseover', function (event) {
            const inputBox = document.querySelector('.card'); // 根据你的实际情况选择正确的选择器
            if (inputBox && !inputBox.contains(event.target)) {
    const inputBox = document.querySelectorAll('.el-card__body');
  const target = event.target;
  if (inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
              // 如果鼠标不在输入框内，更新输入框的值
              // this.submitDataToBackend()
              const params = obj.params;
      const parms = obj.params;


              // this.submitDataToBackend()
              let currentIndex = 0;

              jsonData2.forEach((group, groupIndex) => {
                group.forEach((item) => {
                  if (item.type !== '1') {
                    if (params[groupIndex] && params[groupIndex][currentIndex] !== undefined) {
                      item.value = params[groupIndex][currentIndex];
let index = 0;
for (let i = 0; i < jsonData2.length; i++) {
  let arr = jsonData2[i];
  for (let j = 0; j < arr.length; j++) {
    let obj = arr[j];
    if (obj.type === '0' && Object.prototype.hasOwnProperty.call(obj, 'value')) {
      obj.value = parms[0][index];
      index++;
                    }
                    currentIndex++;
                  }
                });
                currentIndex = 0; // 手动重置索引，准备处理下一个分组
              });
}

              console.log(jsonData2);




// console.log(jsonData2);

            }
          });
@@ -206,8 +196,7 @@
.item-row {
  display: flex;
  align-items: center;
  margin-bottom: 5px;
  /* 调整每个项目之间的间距 */
  margin-bottom: 5px; /* 调整每个项目之间的间距 */
}

.action-button {
@@ -215,7 +204,6 @@
  background: #66b1ff;
  color: #FFF;
}

.blue-button {
  background-color: skyblue;
}

 CanadaMes-ui/src/views/Electrical/Positioning2.vue

@@ -11,40 +11,24 @@
      }}</router-link>
      <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
      }}</router-link>
      <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{
        $t('ServoManual')
       <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual')
      }}</router-link>
    </el-breadcrumb>

    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
      <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{
        $t('Servomanualone')
      <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{ $t('Servomanualone')
      }}</router-link>
      <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
      }}</router-link>
      <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
      }}</router-link>
      <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{
        $t('Positioning1')
         <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning1')
      }}</router-link>
      <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
        $t('Positioning2')
      }}</router-link>
      <router-link to="/Electrical/Manualoneposition" tag="el-button" type="text" active-class="blue-button">{{
        $t('Manualoneposition')
      }}</router-link>
      <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
        $t('ManualonePosition2')
      }}</router-link>
      <router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
        $t('AutomaticParameterSetting')
      }}</router-link>
      <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
        $t('ManualJog')
          <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning2')
      }}</router-link>
    </el-breadcrumb>

    <el-row :gutter="18">
  <el-row :gutter="18" class='card'>
      <el-col :span="7" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
        <el-card class="json-block">
          <div class="button-row" style="display: flex; justify-content: space-between;">
@@ -56,8 +40,7 @@
            <div class="item-row">
              <span class="name" style="width:250px;">{{ item.name }}</span>
              <el-input v-if="item.type === '0'" v-model="item.value" class="input-box"></el-input>
              <el-button v-if="item.type === '0'" v-model="item.value" class="input-box"
                @click="submitDataToBackend();">取地址</el-button>
            <el-button v-if="item.type === '0'"  class="input-box"  @click="submitDataToBackend();">取地址</el-button>
            </div>
          </div>

@@ -69,6 +52,7 @@
</template>
  
<script>
let socket;
import LanguageMixin from '../../lang/LanguageMixin'
import data from '../../configuration/Positioning2'

@@ -80,6 +64,11 @@
      jsonData: data // 加载整个data.json文件作为jsonData
    }
  },
created () {
  this.initWebSocket();
  // console.log('jsonData:', this.jsonData); 

},
  methods: {
    updateButtonValue (dataGroup, itemIndex) {
      this.$set(dataGroup[itemIndex].button, 'value', 1); // 点击按钮后将值改为1
@@ -88,18 +77,108 @@
      const inputData = this.jsonData.map(dataGroup => {
        return dataGroup.map(item => {
          if (item.type === '0') {
            return { name: item.name, value: item.value, address: item.address };
      return { value: parseInt(item.value) };
          } else if (item.button) {
            return { name: item.title.name, value: item.title.value, address: item.title.address };
      return { value: parseInt(item.title.value) };
          }
          return null;
        });
      });

      // 模拟提交数据到后端的操作，实际情况下需要根据你的后端API进行修改
      console.log('提交以下数据到后端:', inputData);
// 将inputData转换为整数数组
const integerArray = inputData.map(dataGroup => {
  return dataGroup.map(item => {
    if (item !== null) {
      return item.value;
    }
    return null;
  });
});
// 构建JSON对象
const jsonObject = { data: integerArray };

// 提交数据到后端
const jsonString = JSON.stringify(jsonObject);
// console.log('提交以下数据到后端:', jsonString);
socket?.send(jsonString);
},
  initWebSocket () {

    let viewname = "Positioning2";

    if (typeof WebSocket === "undefined") {
      console.log("您的浏览器不支持WebSocket");
    } else {
      let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname;

      if (socket != null) {
        socket.close();
        socket = null;
      }

      // 开启一个websocket服务
      socket = new WebSocket(socketUrl);

      // 打开事件
      socket.onopen = function () {
        console.log("websocket已打开");
      };

      // 收到消息
      socket.onmessage = (msg) => {
if (!msg.data) {
  return; // 如果收到空数据，则直接返回，不执行后续逻辑
}

let obj = JSON.parse(msg.data);
const jsonData2 = this.jsonData;
document.addEventListener('mouseover', function(event) {
  const inputBox = document.querySelectorAll('.el-card__body');
  const target = event.target;
  if (inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
    // 如果鼠标不在输入框内，更新输入框的值
    // this.submitDataToBackend()
    const parms = obj.params;
    
 
    let index = 0;
for (let i = 0; i < jsonData2.length; i++) {
  let arr = jsonData2[i];
  for (let j = 0; j < arr.length; j++) {
    let obj = arr[j];
    if (obj.type === '0' && Object.prototype.hasOwnProperty.call(obj, 'value')) {
      obj.value = parms[0][index];
      index++;
    }
  }
}
// console.log(jsonData2);

    }
});
};




      // 关闭事件
      socket.onclose = function () {
        console.log("websocket已关闭");
      };

      // 发生错误事件
      socket.onerror = function () {
        console.log("websocket发生了错误");
      };

    }
  },
  send () {
   
   
    socket?.send(JSON.stringify(this.messagepack));
  },

  }
}
</script>
@@ -108,8 +187,7 @@
.item-row {
  display: flex;
  align-items: center;
  margin-bottom: 5px;
  /* 调整每个项目之间的间距 */
margin-bottom: 5px; /* 调整每个项目之间的间距 */
}

.action-button {
@@ -117,7 +195,6 @@
  background: #66b1ff;
  color: #FFF;
}

.blue-button {
  background-color: skyblue;
}

 CanadaMes-ui/src/views/Electrical/ServoManualone.vue

@@ -11,59 +11,47 @@
      }}</router-link>
      <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
      }}</router-link>
      <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{
        $t('ServoManual')
         <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual')
      }}</router-link>
    </el-breadcrumb>

    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">

      <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{
        $t('Servomanualone')
        <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{ $t('Servomanualone')
      }}</router-link>
      <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
      }}</router-link>
      <!-- <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
        }}</router-link> -->
      <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{
        $t('Positioning1')
           <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
      }}</router-link>
      <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
        $t('Positioning2')
          <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning1')
      }}</router-link>
      <router-link to="/Electrical/Manualoneposition" tag="el-button" type="text" active-class="blue-button">{{
        $t('Manualoneposition')
      }}</router-link>
      <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
        $t('ManualonePosition2')
      }}</router-link>
      <router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
        $t('AutomaticParameterSetting')
      }}</router-link>
      <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
        $t('ManualJog')
            <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning2')
      }}</router-link>
    </el-breadcrumb>

    <el-row :gutter="20">
    <el-row :gutter="26">
      <el-col :span="12" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
        <el-card class="json-block" style="width:450px;">
          <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
    <el-card class="json-block"  style="width:auto;">
      <el-row >
        <el-col v-for="(item, itemIndex) in dataGroup" :key="itemIndex" :span="12">
          <div class="item-container">
            <div class="item-row">
              <span class="name" style="width:100px;">{{ item.name }}</span>
              <el-input style="width:250px;" v-if="item.type === '0'" v-model="item.value" class="input-box"></el-input>
              <span class="name" style='width:230px;'>{{ item.name }}</span>
              <el-input v-if="item.type === '0'" v-model="item.value"   class='input-box' :class="{ 'special-class': groupIndex === 0,'special-class2': groupIndex === 1 }" v-show="groupIndex !== 0 && groupIndex !== 1"  ></el-input>
            </div>
          </div>
        </el-col>
      </el-row>
          <div class="button-row" style="display: flex; justify-content: space-between;">
            <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
              <el-button v-if="item.button" :name="item.button.name" class="action-button"
                @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend();">{{ item.button.name
                }}</el-button>
          <el-button v-if="item.button" :name="item.button.name" v-model="item.button.value" :class="{'action-button': true, 'error-button': item.button.name === '故障' && item.button.value === 1}" @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend(item.button.name);">{{ item.button.name }}</el-button>

            </div>
          </div>
        </el-card>
      </el-col>
    </el-row>

    <!-- <el-button @click="submitDataToBackend">提交数据到后端</el-button> -->
  </div>
</template>
@@ -71,45 +59,211 @@
<script>
import LanguageMixin from '../../lang/LanguageMixin'
import data from '../../configuration/ServoManualone'

import { throttle } from 'lodash';
let socket;
export default {
  name: "ServoManualone",
  mixins: [LanguageMixin],
  data () {
    return {
      jsonData: data // 加载整个data.json文件作为jsonData
      jsonData: data ,

      // 加载整个data.json文件作为jsonData
    }
  },
  created () {
    this.initWebSocket();
    // console.log('jsonData:', this.jsonData); 

  },
  methods: {
    updateButtonValue (dataGroup, itemIndex) {
      this.$set(dataGroup[itemIndex].button, 'value', 1); // 点击按钮后将值改为1
  // 将当前按钮的值设为1

    this.$set(dataGroup[itemIndex].button, 'value', 1);
    
  

    },
    submitDataToBackend () {
      const inputData = this.jsonData.map(dataGroup => {
        return dataGroup.map(item => {
          if (item.type === '0') {
            return { name: item.name, value: item.value, address: item.address };
          } else if (item.button) {
            return { name: item.button.name, value: item.button.value, address: item.button.address };
          }
          return null;
        });
submitDataToBackend(currentButtonName) {
  if (currentButtonName === '半自动启动') {
    const data = [];

for (let i = 0; i < 2; i++) {
  const inputData = this.jsonData[i].filter(item => item.type === '0').map(item => {
    return { value: item.value };
      });

      // 模拟提交数据到后端的操作，实际情况下需要根据你的后端API进行修改
      console.log('提交以下数据到后端:', inputData);
  const values = inputData.map(item => item.value);

  data.push(values);
}



const jsonObject = { data };

// 提交数据到后端
const jsonString = JSON.stringify(jsonObject);
console.log('所有Type为0的value:', jsonString);
socket?.send(jsonString);

    }

  if (currentButtonName === '复位') {

    const data2 = [];
    const resetButtonValues = this.jsonData.map(item => {
  const buttonItem = item.find(subItem => subItem.button && subItem.button.name === '复位');
  return buttonItem ? buttonItem.button.value : null;
}).filter(value => value !== null);

// 将得到的值添加到 data 数组中
data2.push(...resetButtonValues);
const jsonObject2 = { data2 };

// 提交数据到后端
const jsonString2 = JSON.stringify(jsonObject2);
console.log('所有Type为0的value:', jsonString2);
socket?.send(jsonString2);


}
  if (currentButtonName === 'A01半自动') {
    const elements = document.getElementsByClassName('special-class');
    for (let i = 0; i < elements.length; i++) {
      if (elements[i].style.display === 'none') {
        elements[i].style.display = ''; // 显示元素
      } 
    }
  }

  if (currentButtonName === 'A02半自动') {
    const elements = document.getElementsByClassName('special-class2');
    for (let i = 0; i < elements.length; i++) {
      if (elements[i].style.display === 'none') {
        elements[i].style.display = ''; // 显示元素
      } 
    }
  }

 

  
},


    initWebSocket () {
 
      let viewname = "ServoManualone";

      if (typeof WebSocket === "undefined") {
        console.log("您的浏览器不支持WebSocket");
      } else {
        let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname;

        if (socket != null) {
          socket.close();
          socket = null;
        }

        // 开启一个websocket服务
        socket = new WebSocket(socketUrl);

        // 打开事件
        socket.onopen = function () {
          console.log("websocket已打开");
        };

        // 收到消息
        socket.onmessage = (msg) => {
  if (!msg.data) {
    return; // 如果收到空数据，则直接返回，不执行后续逻辑
  }

  let obj = JSON.parse(msg.data);
  // console.log(obj)
  const jsonData2 = this.jsonData;

  const handleMouseMove = throttle(function(event) {
  const inputBox = document.querySelectorAll('.el-card__body');
  const target = event.target;
  if (inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
    // 执行更新逻辑
    for (let i = 0; i < 6; i++) {
  jsonData2[i].forEach((item, index) => {
    if (typeof item.value !== 'undefined' && typeof obj[`zuhe${i+1}`][0][index] !== 'undefined') {
      item.value = obj[`zuhe${i+1}`][0][index];
    }
  });
}

// 遍历guzhang数组
for (let i = 0; i < obj.guzhang[0].length; i++) {
  const guzhangValue = obj.guzhang[0][i];
  
  // 查找jsonData2中带有"button"的对象，并且name等于"故障"
  for (let j = 0; j < jsonData2.length; j++) {
    const section = jsonData2[j];
    
    for (let k = 0; k < section.length; k++) {
      const item = section[k];
      
      if (item.button && item.button.name === "故障") {
        // 更新value属性
        item.button.value = guzhangValue;
        break;
      }
    }
    
  
  }
}







  }
}, 200);

  document.addEventListener('mouseover', handleMouseMove);
};




        // 关闭事件
        socket.onclose = function () {
          console.log("websocket已关闭");
        };

        // 发生错误事件
        socket.onerror = function () {
          console.log("websocket发生了错误");
        };

      }
    },
    send () {
     
     
      socket?.send(JSON.stringify(this.messagepack));
    }

  }
}
</script>

<style scoped>


.item-row {
  display: flex;
  align-items: center;
  margin-bottom: 2px;
  /* 调整每个项目之间的间距 */
  margin-bottom: 2px; /* 调整每个项目之间的间距 */
}

.action-button {
@@ -117,8 +271,12 @@
  background: #66b1ff;
  color: #FFF;
}

.blue-button {
  background-color: skyblue;
}
.error-button {
  background-color: red;
}


</style>

 CanadaMes-ui/src/views/Electrical/Servomanual.vue

@@ -11,43 +11,29 @@
      }}</router-link>
      <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
      }}</router-link>
      <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{
        $t('ServoManual')
         <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual')
      }}</router-link>

    </el-breadcrumb>

    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">

      <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{
        $t('Servomanualone')
       <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{ $t('Servomanualone')
      }}</router-link>
      <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
      }}</router-link>
      <!-- <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
          }}</router-link> -->
      <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{
        $t('Positioning1')
          <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
      }}</router-link>
      <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
        $t('Positioning2')
            <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning1')
      }}</router-link>
      <router-link to="/Electrical/Manualoneposition" tag="el-button" type="text" active-class="blue-button">{{
        $t('Manualoneposition')
      }}</router-link>
      <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
        $t('ManualonePosition2')
      }}</router-link>
      <router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
        $t('AutomaticParameterSetting')
      }}</router-link>
      <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
        $t('ManualJog')
            <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning2')
      }}</router-link>
    </el-breadcrumb>


  </div>


</template>
<script>
import LanguageMixin from '../../lang/LanguageMixin'
@@ -72,16 +58,13 @@
.item-row {
  display: flex;
  align-items: center;
  margin-bottom: 10px;
  /* 调整每个项目之间的间距 */
  margin-bottom: 10px; /* 调整每个项目之间的间距 */
}


.action-button {
  margin-right: 60px;
  /* 调整按钮之间的间距 */
  margin-right: 60px; /* 调整按钮之间的间距 */
}

.blue-button {
  background-color: skyblue;
}

 CanadaMes-ui/src/views/device/talkvue.vue

New file
@@ -0,0 +1,22 @@
<template>
  <div class="container">
    <iframe src="http://localhost:8080/GERP/optimize/optimize/html/youhuacaidan.jsp"></iframe>
  </div>
</template>

<style>
.container {
  position: fixed;
 
  left: 5;


  width: 100%;
  height: 100%;
}

iframe {
  width: 96%;
  height: 99%;
}
</style>

 CanadaMes-ui/src/views/home/index.vue

@@ -207,7 +207,7 @@
                    <el-table-column :width="130" prop="orderId" :label="$t('Order Nmuber')"></el-table-column>

                    <el-table-column prop="list" :label="$t('List Number')"></el-table-column>

                    <el-table-column prop="box" :label="$t('Box Number')"></el-table-column>

                    <el-table-column prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>

                    <el-table-column :width="230" prop="lengthWidth" :label="$t('Length(inch) and Width(inch)')"></el-table-column>

                    <el-table-column :label="$t('Operate')">

                        <template slot-scope='scope'>

                            <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

@@ -222,7 +222,7 @@
                    <el-table-column :width="130" prop="orderId" :label="$t('Order Nmuber')"></el-table-column>

                    <el-table-column prop="list" :label="$t('List Number')"></el-table-column>

                    <el-table-column prop="box" :label="$t('Box Number')"></el-table-column>

                    <el-table-column prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>

                    <el-table-column :width="230"  prop="lengthWidth" :label="$t('Length(inch) and Width(inch)')"></el-table-column>

                    <el-table-column :label="$t('Operate')">

                        <template slot-scope='scope'>

                            <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

@@ -311,10 +311,10 @@
                <el-form-item :label="$t('order')">

                    <el-input v-model="form.orderId" readonly autocomplete="off" />

                </el-form-item>

                <el-form-item :label="$t('length')">

                <el-form-item :label="$t('length(inch)')">

                    <el-input v-model="form.height" readonly autocomplete="off" />

                </el-form-item>

                <el-form-item :label="$t('width')">

                <el-form-item :label="$t('width(inch)')">

                    <el-input v-model="form.width" readonly autocomplete="off" />

                </el-form-item>

                <el-form-item :label="$t('Barcodid')">

@@ -470,7 +470,7 @@
                <el-table-column :width="100" prop="orderId" :label="$t('Order Number')"></el-table-column>

                <el-table-column :width="100" prop="list" :label="$t('List Number')"></el-table-column>

                <el-table-column :width="100" prop="box" :label="$t('Box Number')"></el-table-column>

                <el-table-column :width="170" prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>

                <el-table-column :width="170" prop="lengthWidth" :label="$t('Length(inch) and Width(inch)')"></el-table-column>

                <el-table-column :width="280" :label="$t('Operate')">

                    <template slot-scope='scope'>

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"


 springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java

@@ -136,7 +136,7 @@
          }

          // 将消息值写入 PLC
          S7control.getinstance().WriteWord(addressList, messageValues);
//          S7control.getinstance().WriteWord(addressList, messageValues);
          System.out.println("messageValues：" + messageValues);
          System.out.println("addressList：" + addressList);
          // 清空消息列表

 springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1.java

New file
@@ -0,0 +1,178 @@
package com.example.springboot.component;

import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import org.apache.commons.io.FileUtils;

import java.io.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

public class PlcParameter1 extends Thread {
  String name = "";
  Integer count = 0;

  public static String readFileToString(String filePath) throws IOException {
    File file = new File(filePath);
    return FileUtils.readFileToString(file, "UTF-8");
  }

  public void readValue() {
    String str = "";
    BufferedReader bufferedReader = null;
    FileInputStream fileInputStream;
    try {
      // 从文件中读取字节数据存入 fileInputStream
      fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/address.json");
      // 读取 fileInputStream 中字节并将其解码为字符
      InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");
      // 提高读取效率，在 BufferedReader 内包装 InputStreamReader
      bufferedReader = new BufferedReader(inputStreamReader);
      String line = null;
      // 将 bufferedReader 内容一行一行赋值给str
      while ((line = bufferedReader.readLine()) != null) {
        str += line;
      }

      // 将str字符串格式转为json
      JSONObject jsonObject = new JSONObject(str);

      // 获取json中的值
      JSONArray address = jsonObject.getJSONArray("address");
      for (int i = 0; i < address.size(); i++) {
        JSONObject ress = (JSONObject) address.get(i);

        this.name = ress.getStr("name");
        this.count = ress.getInt("count");

      }

    } catch (FileNotFoundException e) {
      e.printStackTrace();
    } catch (UnsupportedEncodingException e) {
      e.printStackTrace();
    } catch (IOException e) {
      e.printStackTrace();
    }
  }

  @Override
  public void run() {
    while (this != null) {
      try {
        Thread.sleep(1000);

      } catch (InterruptedException e) {
        e.printStackTrace();
      }
//      this.readValue();
//      String PlcAddress = this.name;
//      Integer Plccount = this.count;

      // System.out.println(stt);
      // List<Short> arraylist = S7control.getinstance().ReadWord("DB100.0", 12);
      // List<Short> fanzhuan1 = S7control.getinstance().ReadWord("DB100.8", 1);
      // List<Short> xiaoche1 = S7control.getinstance().ReadWord("DB100.12", 1);
      Short[] values1 = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
      List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
      Short[] fanzhuan = { 4 };
      List<Short> fanzhuan1 = new ArrayList<>(Arrays.asList(fanzhuan));
      Short[] xiaoche = {5};
      List<Short> xiaoche1 = new ArrayList<>(Arrays.asList(xiaoche));



      JSONObject jsonObject = new JSONObject();
      // new short[]{1,1, 1, 1, 1, 1, 2, 33, 2,3, 4, 5}
      // new short[]{0,0, 0, 0, 0, 0, 0, 0, 0, 0}

      jsonObject.append("params", arraylist);
      jsonObject.append("fanzhuan", fanzhuan1);
      jsonObject.append("xiaoche", xiaoche1);

      WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter1");
      if (sendwServer != null) {
        sendwServer.sendMessage(jsonObject.toString());
      }

      WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Parameter1");
      if (webSocketServer != null) {
        List<String> messages = webSocketServer.getMessages();
        String addressList1 = "DB100.0";
        String addressList2 = "DB100.8";
        String addressList3 = "DB100.12";

        if (!messages.isEmpty()) {
          // 将最后一个消息转换为 short 类型的列表
          String lastMessage = messages.get(messages.size() - 1);
//        System.out.println("lastMessage：" + lastMessage);
          JSONArray messageArray = new JSONArray(lastMessage);

          // 整合第 1 到 3 个数组并去掉 null 元素
          List<Short> mergedList = new ArrayList<>();
          for (int i = 0; i < 3; i++) {
            JSONArray sublist = messageArray.getJSONArray(i);
            for (int j = 0; j < sublist.size(); j++) {
              Object value = sublist.get(j);
              if (value != null && !value.toString().equals("null")) {
                try {
                  String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
                  short sValue = Short.parseShort(cleanedValue.trim());
                  mergedList.add(sValue);
                } catch (NumberFormatException e) {
                  // 如果无法解析为 short 类型，则忽略该部分
                  System.err.println("Could not parse value: " + value);
                }
              }
            }
          }

          // 写入第一个地址
          if (messageArray.getJSONArray(3).size() > 0) {
            Object value = messageArray.getJSONArray(3).get(0);
            if (value != null && !value.toString().equals("null")) {
              try {
                String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
                short sValue = Short.parseShort(cleanedValue.trim());
//                S7control.getinstance().WriteWord(addressList1, Arrays.asList(sValue));
                System.out.println("messageValue：" + Arrays.asList(sValue) + " written to PLC at address " + addressList1);
              } catch (NumberFormatException e) {
                // 如果无法解析为 short 类型，则忽略该部分
                System.err.println("Could not parse value: " + value);
              }
            }
          }

          // 写入第二个地址
          if (messageArray.getJSONArray(4).size() > 0) {
            Object value = messageArray.getJSONArray(4).get(0);
            if (value != null && !value.toString().equals("null")) {
              try {
                String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
                short sValue = Short.parseShort(cleanedValue.trim());
//                S7control.getinstance().WriteWord(addressList2, Arrays.asList(sValue));
                System.out.println("messageValue：" + Arrays.asList(sValue) + " written to PLC at address " + addressList2);
              } catch (NumberFormatException e) {
                // 如果无法解析为 short 类型，则忽略该部分
                System.err.println("Could not parse value: " + value);
              }
            }
          }

          // 写入第三个地址
          if (!mergedList.isEmpty()) {
//            S7control.getinstance().WriteWord(addressList3, mergedList);
            System.out.println("messageValue：" + mergedList + " written to PLC at address " + addressList3);
          }

          // 清空消息列表
          webSocketServer.clearMessages();
        }
      

    }

    }
  }
}

 springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java

New file
@@ -0,0 +1,144 @@
package com.example.springboot.component;

import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import org.apache.commons.io.FileUtils;

import java.io.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

public class PlcParameter2 extends Thread {
  String name = "";
  Integer count = 0;

  public static String readFileToString(String filePath) throws IOException {
    File file = new File(filePath);
    return FileUtils.readFileToString(file, "UTF-8");
  }

  public void readValue() {
    String str = "";
    BufferedReader bufferedReader = null;
    FileInputStream fileInputStream;
    try {
      // 从文件中读取字节数据存入 fileInputStream
      fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/address.json");
      // 读取 fileInputStream 中字节并将其解码为字符
      InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");
      // 提高读取效率，在 BufferedReader 内包装 InputStreamReader
      bufferedReader = new BufferedReader(inputStreamReader);
      String line = null;
      // 将 bufferedReader 内容一行一行赋值给str
      while ((line = bufferedReader.readLine()) != null) {
        str += line;
      }

      // 将str字符串格式转为json
      JSONObject jsonObject = new JSONObject(str);

      // 获取json中的值
      JSONArray address = jsonObject.getJSONArray("Positioning1");
      for (int i = 0; i < address.size(); i++) {
        JSONObject ress = (JSONObject) address.get(i);

        this.name = ress.getStr("name");
        this.count = ress.getInt("count");

      }

    } catch (FileNotFoundException e) {
      e.printStackTrace();
    } catch (UnsupportedEncodingException e) {
      e.printStackTrace();
    } catch (IOException e) {
      e.printStackTrace();
    }
  }

  @Override
  public void run() {
    while (this != null) {
      try {
        Thread.sleep(500);

      } catch (InterruptedException e) {
        e.printStackTrace();
      }
//      this.readValue();
//      String PlcAddress = this.name;
//      Integer Plccount = this.count;

      // System.out.println(stt);
      // List<Short> arraylist = S7control.getinstance().ReadWord("DB100.0", 12);
      // List<Short> state = S7control.getinstance().ReadWord("DB103.0", 10);

      Boolean[] values = { false, true, true, true, true, true, true, true, true,
              true};
      List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
      Short[] values1 = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
      List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));

      Short[] values2 = { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 };
      List<Short> state = new ArrayList<>(Arrays.asList(values2));

      JSONObject jsonObject = new JSONObject();
      short[] params = new short[paramlist.size()];
      for (int i = 0; i < paramlist.size(); i++) {
        boolean value = paramlist.get(i);
        params[i] = value ? (short) 1 : (short) 0;
      }
      // new short[]{1,1, 1, 1, 1, 1, 2, 33, 2,3, 4, 5}
      // new short[]{0,0, 0, 0, 0, 0, 0, 0, 0, 0}
      jsonObject.append("params", params);
      jsonObject.append("params", arraylist);
      jsonObject.append("params", state);

      WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter2");
      if (sendwServer != null) {
        sendwServer.sendMessage(jsonObject.toString());
      }

      WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Parameter2");
      if (webSocketServer != null) {

        List<String> messages = webSocketServer.getMessages();

        String addressList = "DB2.0.0";

        if (!messages.isEmpty()) {
          // 将最后一个消息转换为整数类型的列表
          String lastMessage = messages.get(messages.size() - 1);
          System.out.println("messages：" + messages);
          String[] parts = lastMessage.split(",");
          List<Integer> messageValues = new ArrayList<>();
          for (String part : parts) {
            try {
              // 使用正则表达式清除非数字字符
              String cleanedPart = part.replaceAll("[^0-9-]", "");
              Integer value = Integer.parseInt(cleanedPart.trim());
              messageValues.add(value);
            } catch (NumberFormatException e) {
              // 如果无法解析为整数类型，则忽略该部分
//              e.printStackTrace();
            }
          }

          // 将消息值转换为布尔列表
          List<Boolean> messageBooleans = new ArrayList<>();
          for (Integer value : messageValues) {
            messageBooleans.add(value == 1 ? true : false);
          }

          // 将布尔列表写入 PLC
//          S7control.getinstance().WriteBit(addressList, messageBooleans);
          System.out.println("messageValues：" + messageBooleans);
          System.out.println("addressList：" + addressList);
          // 清空消息列表
          webSocketServer.clearMessages();
        }
      }
    }
  }
}

 springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java

New file
@@ -0,0 +1,151 @@
package com.example.springboot.component;



import cn.hutool.json.JSONArray;

import cn.hutool.json.JSONObject;



import java.util.ArrayList;

import java.util.List;

import java.util.Arrays;

import java.io.BufferedReader;

import java.io.File;

import java.io.FileInputStream;

import java.io.FileNotFoundException;

import java.io.IOException;

import java.io.InputStreamReader;

import java.io.UnsupportedEncodingException;



import org.apache.commons.io.FileUtils;



public class PlcPositioning1 extends Thread {

    String name = "";

    Integer count = 0;



    public static String readFileToString(String filePath) throws IOException {

        File file = new File(filePath);

        return FileUtils.readFileToString(file, "UTF-8");

    }



    public void readValue() {

        String str = "";

        BufferedReader bufferedReader = null;

        FileInputStream fileInputStream;

        try {

            // 从文件中读取字节数据存入 fileInputStream

            fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/address.json");

            // 读取 fileInputStream 中字节并将其解码为字符

            InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");

            // 提高读取效率，在 BufferedReader 内包装 InputStreamReader

            bufferedReader = new BufferedReader(inputStreamReader);

            String line = null;

            // 将 bufferedReader 内容一行一行赋值给str

            while ((line = bufferedReader.readLine()) != null) {

                str += line;

            }



            // 将str字符串格式转为json

            JSONObject jsonObject = new JSONObject(str);



            // 获取json中的值

            JSONArray address = jsonObject.getJSONArray("Positioning1");

            for (int i = 0; i < address.size(); i++) {

                JSONObject ress = (JSONObject) address.get(i);



                this.name = ress.getStr("name");

                this.count = ress.getInt("count");

                System.out.println("messageValues：" + this.name);

                System.out.println("messageValues：" + this.count);

            }



        } catch (FileNotFoundException e) {

            e.printStackTrace();

        } catch (UnsupportedEncodingException e) {

            e.printStackTrace();

        } catch (IOException e) {

            e.printStackTrace();

        }

    }



    @Override

    public void run() {

        while (this != null) {

            try {

                Thread.sleep(1000);



            } catch (InterruptedException e) {

                e.printStackTrace();

            }

//        this.readValue();

//            String PlcAddress = this.name;

//            Integer Plccount = this.count;



            // System.out.println(stt);

            // List<Short> arraylist = S7control.getinstance().ReadWord("DB100.0", 12);

            // List<Short> state = S7control.getinstance().ReadWord("DB103.0", 10);

//            Short[] 存片 = { 1 };

//            List<Short> 存片1 = new ArrayList<>(Arrays.asList(存片));

//            Short[] 接片 = { 1 };

//            List<Short> 接片1 = new ArrayList<>(Arrays.asList(接片));

//            Short[] 间距 = { 1 };

//            List<Short> 间距1 = new ArrayList<>(Arrays.asList(间距));

            Short[] values1 = {1,1,1, 1,2, 3, 4, 5, 6, 7, 8, 9, 10,11, 12,13,14,15,16,17,18,19,20 };

            List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));





            JSONObject jsonObject = new JSONObject();





            jsonObject.append("params", arraylist);





            WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Positioning1");

            if (sendwServer != null) {

                sendwServer.sendMessage(jsonObject.toString());

            }



            WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Positioning1");

            if (webSocketServer != null) {

                List<String> messages = webSocketServer.getMessages();



                String addressList3 = "DB100.12";



                if (!messages.isEmpty()) {

                    // 将最后一个消息转换为 short 类型的列表

                    String lastMessage = messages.get(messages.size() - 1);

//        System.out.println("lastMessage：" + lastMessage);

                    JSONArray messageArray = new JSONArray(lastMessage);



                    // 整合第 1 到 3 个数组并去掉 null 元素

                    List<Short> mergedList = new ArrayList<>();

                    for (int i = 0; i < 5; i++) {

                        JSONArray sublist = messageArray.getJSONArray(i);

                        for (int j = 0; j < sublist.size(); j++) {

                            Object value = sublist.get(j);

                            if (value != null && !value.toString().equals("null")) {

                                try {

                                    String cleanedValue = value.toString().replaceAll("[^0-9-]", "");

                                    short sValue = Short.parseShort(cleanedValue.trim());

                                    mergedList.add(sValue);

                                } catch (NumberFormatException e) {

                                    // 如果无法解析为 short 类型，则忽略该部分

                                    System.err.println("Could not parse value: " + value);

                                }

                            }

                        }

                    }





                    // 写入第yi个地址

                    if (!mergedList.isEmpty()) {

//            S7control.getinstance().WriteWord(addressList3, mergedList);

                        System.out.println("messageValue：" + mergedList + " written to PLC at address " + addressList3);

                    }



                    // 清空消息列表

                    webSocketServer.clearMessages();

                }





            }

        }

    }

}


 springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning2.java

New file
@@ -0,0 +1,139 @@
package com.example.springboot.component;



import cn.hutool.json.JSONArray;

import cn.hutool.json.JSONObject;

import org.apache.commons.io.FileUtils;



import java.io.*;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;



public class PlcPositioning2 extends Thread {

    String name = "";

    Integer count = 0;



    public static String readFileToString(String filePath) throws IOException {

        File file = new File(filePath);

        return FileUtils.readFileToString(file, "UTF-8");

    }



    public void readValue() {

        String str = "";

        BufferedReader bufferedReader = null;

        FileInputStream fileInputStream;

        try {

            // 从文件中读取字节数据存入 fileInputStream

            fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/address.json");

            // 读取 fileInputStream 中字节并将其解码为字符

            InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");

            // 提高读取效率，在 BufferedReader 内包装 InputStreamReader

            bufferedReader = new BufferedReader(inputStreamReader);

            String line = null;

            // 将 bufferedReader 内容一行一行赋值给str

            while ((line = bufferedReader.readLine()) != null) {

                str += line;

            }



            // 将str字符串格式转为json

            JSONObject jsonObject = new JSONObject(str);



            // 获取json中的值

            JSONArray address = jsonObject.getJSONArray("Positioning2");

            for (int i = 0; i < address.size(); i++) {

                JSONObject ress = (JSONObject) address.get(i);



                this.name = ress.getStr("name");

                this.count = ress.getInt("count");

                System.out.println("messageValues：" + this.name);

                System.out.println("messageValues：" + this.count);

            }



        } catch (FileNotFoundException e) {

            e.printStackTrace();

        } catch (UnsupportedEncodingException e) {

            e.printStackTrace();

        } catch (IOException e) {

            e.printStackTrace();

        }

    }



    @Override

    public void run() {

        while (this != null) {

            try {

                Thread.sleep(1000);



            } catch (InterruptedException e) {

                e.printStackTrace();

            }

//        this.readValue();

//            String PlcAddress = this.name;

//            Integer Plccount = this.count;



            // System.out.println(stt);

            // List<Short> arraylist = S7control.getinstance().ReadWord("DB100.0", 12);

            // List<Short> state = S7control.getinstance().ReadWord("DB103.0", 10);

            Short[] values1 = { 1,2, 3, 4, 5 , 11, 12,13,14,15};

            List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));





            JSONObject jsonObject = new JSONObject();

            // new short[]{1,1, 1, 1, 1, 1, 2, 33, 2,3, 4, 5}

            // new short[]{0,0, 0, 0, 0, 0, 0, 0, 0, 0}



            jsonObject.append("params", arraylist);





            WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Positioning2");

            if (sendwServer != null) {

                sendwServer.sendMessage(jsonObject.toString());

            }



            WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Positioning2");

            if (webSocketServer != null) {

                List<String> messages = webSocketServer.getMessages();



                String addressList3 = "DB100.12";



                if (!messages.isEmpty()) {

                    // 将最后一个消息转换为 short 类型的列表

                    String lastMessage = messages.get(messages.size() - 1);

//        System.out.println("lastMessage：" + lastMessage);

                    JSONArray messageArray = new JSONArray(lastMessage);



                    // 整合第 1 到 3 个数组并去掉 null 元素

                    List<Short> mergedList = new ArrayList<>();

                    for (int i = 0; i < 2; i++) {

                        JSONArray sublist = messageArray.getJSONArray(i);

                        for (int j = 0; j < sublist.size(); j++) {

                            Object value = sublist.get(j);

                            if (value != null && !value.toString().equals("null")) {

                                try {

                                    String cleanedValue = value.toString().replaceAll("[^0-9-]", "");

                                    short sValue = Short.parseShort(cleanedValue.trim());

                                    mergedList.add(sValue);

                                } catch (NumberFormatException e) {

                                    // 如果无法解析为 short 类型，则忽略该部分

                                    System.err.println("Could not parse value: " + value);

                                }

                            }

                        }

                    }





                    // 写入第yi个地址

                    if (!mergedList.isEmpty()) {

//            S7control.getinstance().WriteWord(addressList3, mergedList);

                        System.out.println("messageValue：" + mergedList + " written to PLC at address " + addressList3);

                    }



                    // 清空消息列表

                    webSocketServer.clearMessages();

                }





            }

        }

    }

}


 springboot-vue3/src/main/java/com/example/springboot/component/S7control.java

@@ -90,6 +90,8 @@
        s7PLC.writeMultiData(addressWrite);
    }



    /**
     * 按指定的地址 写入一个Bit
     * 
@@ -162,6 +164,56 @@
        return s7PLC.readInt16(address);
    }

    public List<Short> readWords(List<String> addresses) {
        if (s7PLC == null) {
            return null;
        }

        List<Short> data = new ArrayList<>();

        for (String address : addresses) {
            if (address.contains("-")) {
                String[] range = address.split("-");
                String startAddress = range[0];
                String endAddress = range[1];

                if (startAddress.equals(endAddress)) {
                    // 单个地址
                    Short value = s7PLC.readInt16(startAddress);
                    data.add(value);
                } else {
                    // 范围地址
                    int startIndex = getIndexFromAddress(startAddress);
                    int endIndex = getIndexFromAddress(endAddress);

                    for (int i = startIndex; i <= endIndex; i++) {
                        String currentAddress = getAddressFromIndex(i);
                        Short value = s7PLC.readInt16(currentAddress);
                        data.add(value);
                    }
                }
            } else {
                // 单个地址
                Short value = s7PLC.readInt16(address);
                data.add(value);
            }
        }

        return data;
    }

    private int getIndexFromAddress(String address) {

        // 可以解析出地址中的数字部分，并转换为整数
        return 0;
    }

    private String getAddressFromIndex(int index) {

        // 整数转换为地址格式的字符串
        return "";
    }

    /**
     * 按指定的地址 读取word结果集
     * 

 springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java

@@ -7,13 +7,17 @@
import org.springframework.stereotype.Component;

import com.example.springboot.component.PlcHold;
import com.example.springboot.component.PlcManualonePosition;
import com.example.springboot.component.PlcParameter;
import com.example.springboot.component.Plcaction;
import com.example.springboot.component.Plchome;
import com.example.springboot.component.Plcalarm;
import com.example.springboot.component.Plcsign;
import com.example.springboot.component.Plcstate;
import com.example.springboot.component.PlcPositioning1;
import com.example.springboot.component.PlcPositioning2;
import com.example.springboot.component.PlcParameter2;
import com.example.springboot.component.PlcParameter1;
import com.example.springboot.component.PlcServoManualone;

@Component
@Order(1)
@@ -28,18 +32,21 @@

    // new PlcHold().start();

    new Plcaction().start();

//  new Plcaction().start();
//
    // new Plchome().start();

    new PlcParameter().start();

    new Plcalarm().start();

    new Plcsign().start();

    new Plcstate().start();

    // new PlcManualonePosition().start();
//
//  new PlcParameter().start();
//
//    new Plcalarm().start();
//
//    new Plcsign().start();
//
//    new Plcstate().start();
 new PlcPositioning1().start();
      new PlcPositioning2().start();
      new PlcParameter2().start();
      new PlcParameter1().start();
      new PlcServoManualone().start();
  }
}

 springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java

@@ -32,7 +32,7 @@
  List<StorageCage> selectRack4();

  // 根据任务类型查询当前正在出片，进片的玻璃信息
  @Select("select *,concat(glasswidth,' x ',glassheight) as lengthwidth from storage_cage where state=#{task_type} limit 1")
  @Select("select a.*,concat(round(a.glasswidth*b.conversionrate,2),' x ',round(a.glassheight*b.conversionrate,2)) as lengthwidth from storage_cage as a,conver as b where a.state=#{task_type} limit 1")
  List<StorageCage> selectinout(@Param("task_type") Integer task_type);

  // 查询是否存在此订单
@@ -68,7 +68,7 @@
  List<alarmmg> SelectAlarmmgInfo();

  //获取理片笼内玻璃信息
  @Select("select *,concat(round(a.glasswidth*b.Conversionrate,2),' x ',round(a.glassheight*b.Conversionrate,2)) as lengthwidth from storage_cage  as a,glass as b  ")
  @Select("select *,concat(round(a.glasswidth*b.conversionrate,2),' x ',round(a.glassheight*b.conversionrate,2)) as lengthwidth from storage_cage  as a,conver as b  ")
  List<StorageCage> SelectCageInfo(short cage);

  @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null where glass_id=#{glassid}")
@@ -87,12 +87,7 @@
  StorageCage SelectGlassInfo(String glassid);

  //查询玻璃信息
//  @Select("select * from glass where glassid=#{glassid}")
  @Select("SELECT id,glassid,orderid,\n" +
          "       ROUND(width * Conversionrate, 2) AS width,\n" +
          "       ROUND(height * Conversionrate, 2) AS height\n" +
          "FROM glass\n" +
          "where glassid=#{glassid};")
 @Select("select * from glass where glassid=#{glassid}")
  Glass SelectGlassByGlassID(String glassid);

  //启用/禁用理片笼格子