From ab458edbd053107077ae95acaca214ffb1d37828 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 27 十一月 2023 09:20:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 CanadaMes-ui/src/views/Electrical/Positioning2.vue                                  |  201 ++
 CanadaMes-ui/src/views/home/index.vue                                               |   10 
 springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java   |  144 +
 springboot-vue3/src/main/java/com/example/springboot/entity/alarmmg.java            |    5 
 CanadaMes-ui/src/router/index.js                                                    |   24 
 springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java |  151 +
 springboot-vue3/src/main/java/com/example/springboot/component/S7control.java       |   52 
 CanadaMes-ui/src/views/Electrical/Parameter2.vue                                    |  239 ++
 CanadaMes-ui/src/views/Electrical/State.vue                                         |   21 
 CanadaMes-ui/src/views/Electrical/Parameter.vue                                     |  148 +
 springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java              |   89 
 springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java         |   85 
 springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java         |   11 
 CanadaMes-ui/src/configuration/Positioning2.json                                    |  103 +
 CanadaMes-ui/package.json                                                           |    1 
 CanadaMes-ui/src/views/Electrical/Positioning1.vue                                  |  210 ++
 springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java    |  168 +
 springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java        |   62 
 springboot-vue3/pom.xml                                                             |   12 
 CanadaMes-ui/src/views/Electrical/Action.vue                                        |   62 
 CanadaMes-ui/src/configuration/State.json                                           |   40 
 CanadaMes-ui/package-lock.json                                                      |   11 
 CanadaMes-ui/src/views/device/talkvue.vue                                           |   22 
 CanadaMes-ui/src/configuration/parameter2.json                                      |  316 +++
 springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1.java   |  178 +
 springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java       |  126 
 CanadaMes-ui/src/configuration/Positioning1.json                                    |  201 ++
 CanadaMes-ui/src/views/Electrical/Servomanual.vue                                   |   71 
 CanadaMes-ui/src/views/Electrical/Sign.vue                                          |  168 -
 .vscode/settings.json                                                               |    3 
 CanadaMes-ui/src/configuration/Parameter.json                                       |   94 +
 springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning2.java |  139 +
 CanadaMes-ui/src/configuration/ServoManualone.json                                  |  342 +++
 springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java |  443 ++--
 CanadaMes-ui/src/configuration/address.json                                         |   57 
 CanadaMes-ui/src/lang/locales/zh-CN.json                                            |  284 ++-
 springboot-vue3/src/main/java/com/example/springboot/entity/out_slice.java          |   90 
 CanadaMes-ui/src/configuration/parameter1.json                                      |  153 +
 springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java    |   32 
 CanadaMes-ui/src/configuration/Action.json                                          |   88 
 CanadaMes-ui/src/views/Electrical/Parameter1.vue                                    |  220 ++
 CanadaMes-ui/src/views/Electrical/ServoManualone.vue                                |  282 +++
 CanadaMes-ui/src/configuration/Sign.json                                            |  295 +++
 43 files changed, 4,767 insertions(+), 686 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..c5f3f6b
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "interactive"
+}
\ No newline at end of file
diff --git a/CanadaMes-ui/package-lock.json b/CanadaMes-ui/package-lock.json
index 4409180..335332b 100644
--- a/CanadaMes-ui/package-lock.json
+++ b/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",
diff --git a/CanadaMes-ui/package.json b/CanadaMes-ui/package.json
index f49cf5a..741fcd8 100644
--- a/CanadaMes-ui/package.json
+++ b/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",
diff --git a/CanadaMes-ui/src/configuration/Action.json b/CanadaMes-ui/src/configuration/Action.json
new file mode 100644
index 0000000..91e8990
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/Action.json
@@ -0,0 +1,88 @@
+{
+  "action": [
+    {
+      "name": "D01 VFD conveyor"
+    },
+    {
+      "name": "D02 VFD conveyor"
+    },
+    {
+      "name": "D03 VFD conveyor"
+    },
+    {
+      "name": "D04 VFD conveyor"
+    },
+    {
+      "name": "D05 VFD conveyor"
+    },
+    {
+      "name": "D06 VFD conveyor"
+    },
+    {
+      "name": "A01 VFD conveyor"
+    },
+    {
+      "name": "A02 VFD conveyor"
+    },
+    {
+      "name": "B01 VFD conveyor"
+    },
+    {
+      "name": "B02 VFD conveyor"
+    },
+    {
+      "name": "A01 SERVE TURN JOG+"
+    },
+    {
+      "name": "A02 SERVE TURN JOG-"
+    },
+    {
+      "name": "A01 SERVE TRAVEL JOG+"
+    },
+    {
+      "name": "A02 SERVE TRAVEL JOG-"
+    },
+    {
+      "name": "B01 SERVE TRAVEL JOG+"
+    },
+    {
+      "name": "B02 SERVE TRAVEL JOG-"
+    },
+    {
+      "name": "A01 SERVE TURN POS"
+    },
+    {
+      "name": "A02 SERVE TURN POS"
+    },
+    {
+      "name": "A01 SERVE TRAVEL POS"
+    },
+    {
+      "name": "A02 SERVE TRAVEL POS"
+    },
+    {
+      "name": "B01 SERVE TRAVEL POS"
+    },
+    {
+      "name": "B02 SERVE TRAVEL POS"
+    },
+    {
+      "name": "B01 YV TURN"
+    },
+    {
+      "name": "B01 YV UP DOWN"
+    },
+    {
+      "name": "B02 YV TURN"
+    },
+    {
+      "name": "B02 YV UP DOWN"
+    }
+  ],
+  "address": [
+    {
+      "name": "DB2.0.0",
+      "count": 26
+    }
+  ]
+}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/Parameter.json b/CanadaMes-ui/src/configuration/Parameter.json
new file mode 100644
index 0000000..5104731
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/Parameter.json
@@ -0,0 +1,94 @@
+{
+  "para": [
+    {
+      "name": "conveyor Velocity(Auto FAST)",
+      "read": 33,
+      "sending": 0,
+       "unit": "m/min",
+      "value":0,
+ "value2":0
+     
+      
+    },
+    {
+      "name": "conveyor Velocity(Auto SLOW)",
+      "read": 11,
+      "sending": 0,
+       "unit": "m/min",
+      "value":0,
+ "value2":0
+    },
+    {
+      "name": "conveyor Velocity(Manual)",
+      "read": 22,
+      "sending": 0,
+       "unit": "m/min",
+      "value":0,
+ "value2":0
+    },
+    {
+      "name": "A01 A02 TURN JOG Velocity",
+      "read": 0,
+      "sending": 0,
+      "unit": "mm/S"
+    },
+    {
+      "name": "A01 A02 TRAVEL JOG Velocity",
+      "read": 0,
+      "sending": 0,
+      "unit": "mm/S"
+    },
+    {
+      "name": "B01 B02 TRAVEL JOG Velocity",
+      "read": 0,
+      "sending": 0,
+      "unit": "mm/S"
+    },
+    {
+      "name": "A01 A02 TURN POS Velocity AUTO",
+      "read": 0,
+      "sending": 0,
+      "unit": "mm/S"
+    },
+    {
+      "name": "A01 A02 TURN POS Velocity manual",
+      "read": 0,
+      "sending": 0,
+      "unit": "mm/S"
+    },
+    {
+      "name": "A01 A02 TRAVEL POS Velocity AUTO",
+      "read": 0,
+      "sending": 0,
+      "unit": "mm/S"
+    },
+    {
+      "name": "A01 A02 TRAVEL POS Velocity manual",
+      "read": 0,
+      "sending": 0,
+      "unit": "mm/S"
+    },
+    {
+      "name": "B01 B02 TRAVEL POS Velocity AUTO",
+      "read": 0,
+      "sending": 0,
+      "unit": "mm/S"
+    },
+    {
+      "name": "B01 B02 TRAVEL POS Velocity manual",
+      "read": 0,
+      "sending": 0,
+      "unit": "mm/S"
+    }
+  ],
+  "address": [
+    {
+      "name": "DB100.0",
+      "count": 12
+    },
+    {
+      "name": "DB100.0",
+      "count": 12
+    }
+  ]
+}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/Positioning1.json b/CanadaMes-ui/src/configuration/Positioning1.json
new file mode 100644
index 0000000..b5a6a4c
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/Positioning1.json
@@ -0,0 +1,201 @@
+[
+    [{
+      "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"
+      
+    }],
+
+    [
+        {
+            "title": {
+              "name": "瀛樼墖鏍间綅缃瀹�"
+              
+            }, "type": "1"
+           
+          },
+      {
+        "name": "1#鏍煎湴鍧�",
+        "read": 33,
+        "sending": 0,
+        "type": "0",
+        "value":"0",
+        "address":"DB100.48",
+        "count":10
+      },
+      {
+        "name": "22#鏍煎湴鍧�",
+        "read": 11,
+        "sending": 0,
+        "type": "0" ,
+        "value":"0"
+      },
+      {
+        "name": "43#鏍煎湴鍧�",
+        "read": 22,
+        "sending": 0,
+        "type": "0" ,
+        "value":"0"
+      },
+      {
+        "name": "64#鏍煎湴鍧�",
+        "read": 22,
+        "sending": 0,
+        "type": "0" ,
+        "value":"0"
+      },
+      {
+        "name": "85#鏍煎湴鍧�",
+        "read": 22,
+        "sending": 0,
+        "type": "0" ,
+        "value":"0"
+      },
+      {
+        "name": "106#鏍煎湴鍧�",
+        "read": 22,
+        "sending": 0,
+        "type": "0" ,
+        "value":"0"
+      },
+      {
+        "name": "127#鏍煎湴鍧�",
+        "read": 22,
+        "sending": 0,
+        "type": "0" ,
+        "value":"0"
+      },
+      {
+        "name": "148#鏍煎湴鍧�",
+        "read": 22,
+        "sending": 0,
+        "type": "0" ,
+        "value":"0"
+      },
+      {
+        "name": "169#鏍煎湴鍧�",
+        "read": 22,
+        "sending": 0,
+        "type": "0" ,
+        "value":"0"
+      },
+      {
+        "name": "190#鏍煎湴鍧�",
+        "read": 22,
+        "sending": 0,
+        "type": "0" ,
+        "value":"0"
+      }
+     
+      
+     
+    ],
+
+    [
+        {
+            "title": {
+              "name": "鍑虹墖鏍间綅缃瀹�"
+              
+            },"type": "1",
+            "value":"0"
+          },
+      {
+        "name": "1#鏍煎湴鍧�",
+        "read": 33,
+        "sending": 0,
+        "type": "0" ,
+        "value":"0",
+        "address":"DB100.68",
+        "count":10
+      },
+      {
+        "name": "22#鏍煎湴鍧�",
+        "read": 11,
+        "sending": 0,
+        "type": "0" ,
+        "value":"0"
+      },
+      {
+        "name": "43#鏍煎湴鍧�",
+        "read": 22,
+        "sending": 0,
+        "type": "0" ,
+        "value":"0"
+      },
+      {
+        "name": "64#鏍煎湴鍧�",
+        "read": 22,
+        "sending": 0,
+        "type": "0" ,
+        "value":"0"
+      },
+      {
+        "name": "85#鏍煎湴鍧�",
+        "read": 22,
+        "sending": 0,
+        "type": "0" ,
+        "value":"0"
+      },
+      {
+        "name": "106#鏍煎湴鍧�",
+        "read": 22,
+        "sending": 0,
+        "type": "0" ,
+        "value":"0"
+      },
+      {
+        "name": "127#鏍煎湴鍧�",
+        "read": 22,
+        "sending": 0,
+        "type": "0" ,
+        "value":"0"
+      },
+      {
+        "name": "148#鏍煎湴鍧�",
+        "read": 22,
+        "sending": 0,
+        "type": "0" ,
+        "value":"0"
+      },
+      {
+        "name": "169#鏍煎湴鍧�",
+        "read": 22,
+        "sending": 0,
+        "type": "0" ,
+        "value":"0"
+      },
+      {
+        "name": "190#鏍煎湴鍧�",
+        "read": 22,
+        "sending": 0,
+        "type": "0" ,
+        "value":"0"
+      }
+     
+      
+     
+    ]
+
+   
+    
+  ]
+
+  
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/Positioning2.json b/CanadaMes-ui/src/configuration/Positioning2.json
new file mode 100644
index 0000000..a01e428
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/Positioning2.json
@@ -0,0 +1,103 @@
+[
+    
+    [
+        {
+            "title": {
+              "name": "B01鏍间綅缃瀹�"
+              
+            }, "type": "1"
+          },
+      {
+        "name": "1#鏍煎湴鍧�",
+        "read": 33,
+        "sending": 0,
+        "type": "0",
+        "address":"DB100.0",
+        "count":3,
+        "value":"0"
+      },
+      {
+        "name": "22#鏍煎湴鍧�",
+        "read": 11,
+        "sending": 0,
+        "type": "0"
+        ,
+        "value":"0"
+      },
+      {
+        "name": "43#鏍煎湴鍧�",
+        "read": 22,
+        "sending": 0,
+        "type": "0",
+        "value":"0"
+      },
+      {
+        "name": "64#鏍煎湴鍧�",
+        "read": 22,
+        "sending": 0,
+        "type": "0",
+        "value":"0"
+      },
+      {
+        "name": "85#鏍煎湴鍧�",
+        "read": 22,
+        "sending": 0,
+        "type": "0",
+        "value":"0"
+      }
+     
+      
+     
+    ],
+
+    [
+        {
+            "title": {
+              "name": "B02浣嶇疆璁惧畾"
+              
+            }, "type": "1"
+          },
+          {
+            "name": "106#鏍煎湴鍧�",
+            "read": 22,
+            "sending": 0,
+            "type": "0",
+            "value":"0"
+          },
+          {
+            "name": "127#鏍煎湴鍧�",
+            "read": 22,
+            "sending": 0,
+            "type": "0",
+            "value":"0"
+          },
+          {
+            "name": "148#鏍煎湴鍧�",
+            "read": 22,
+            "sending": 0,
+            "type": "0",
+            "value":"0"
+          },
+          {
+            "name": "169#鏍煎湴鍧�",
+            "read": 22,
+            "sending": 0,
+            "type": "0",
+            "value":"0"
+          },
+          {
+            "name": "190#鏍煎湴鍧�",
+            "read": 22,
+            "sending": 0,
+            "type": "0",
+            "value":"0"
+          }
+         
+     
+      
+     
+    ]
+   
+    
+  ]
+  
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/ServoManualone.json b/CanadaMes-ui/src/configuration/ServoManualone.json
new file mode 100644
index 0000000..3b7d999
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/ServoManualone.json
@@ -0,0 +1,342 @@
+[
+    
+    [
+      {
+        "name": "A01 鎵�鍦ㄦ牸瀛�",
+        "read": 33,
+        "sending": 0,
+        "type": "0",
+        "address":"DB100.0",
+        "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",
+        "value":0
+      },
+      {
+        "name": "瀛樼墖鏍煎瓙",
+        "read": 22,
+        "sending": 0,
+        "type": "0",
+        "value":0
+      },
+      {
+        "button": {
+          "name": "鏁呴殰",
+          "value":0,
+          "address":"DB10.0"
+        }
+      },
+      {
+        "button": {
+          "name": "澶嶄綅",
+          "value":0,
+          "address":"DB10.0"
+        }
+      },
+      {
+        "button": {
+          "name": "A01鍗婅嚜鍔�",
+          "value":0,
+          "address":"DB10.0"
+        }
+      },
+      {
+        "button": {
+          "name": "鍗婅嚜鍔ㄥ惎鍔�",
+          "value":0,
+          "address":"DB10.0"
+        }
+      }
+    ],
+    [
+        {
+            "name": "A02 鎵�鍦ㄦ牸瀛�",
+            "read": 33,
+            "sending": 0,
+            "type": "0",
+            "address":"DB100.1",
+            "count":3,
+            "value":0
+          },
+          {
+            "name": "鍙栫墖鏍煎瓙",
+            "read": 11,
+            "sending": 0,
+            "type": "0",
+            "value":0
+          },
+          {
+            "name": "瀛樼墖鏍煎瓙",
+            "read": 22,
+            "sending": 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": {
+              "name": "鏁呴殰",
+              "value":0,
+              "address":"DB10.0"
+            }
+          },
+          {
+            "button": {
+              "name": "澶嶄綅",
+              "value":0,
+              "address":"DB10.0"
+            }
+          },
+          {
+            "button": {
+              "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,
+      "value":0
+    },
+    {
+      "name": "鐩爣鏍煎瓙",
+      "read": 11,
+      "sending": 0,
+      "type": "0",
+      "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": "B02 鎵�鍦ㄦ牸瀛�",
+            "read": 33,
+            "sending": 0,
+            "type": "0",
+            "address":"DB100.3",
+            "count":3,
+            "value":0
+          },
+          {
+            "name": "鐩爣鏍煎瓙",
+            "read": 11,
+            "sending": 0,
+            "type": "0",
+            "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"
+            }
+          }
+          
+    ]
+     
+    
+  ]
+  
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/Sign.json b/CanadaMes-ui/src/configuration/Sign.json
new file mode 100644
index 0000000..c634375
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/Sign.json
@@ -0,0 +1,295 @@
+{
+  "sign": [
+    {
+      "name": "D01.SR dec",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "D01.SR in pos",
+      "value": "0",
+      "state": "1"
+    },
+    {
+      "name": "D02.SR dec",
+      "value": "0",
+      "state": "1"
+    },
+    {
+      "name": "D02.SR in pos",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "D03.SR into",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "D03.SR dec",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "D03.SR in pos",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "D04.SR dec",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "D04.SR in pos",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "D05.SR dec",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "D05.SR in pos",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "D06.SR dec",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "D06.SR in pos",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B01.SR out dec",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B01.SR out in pos",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B01.SR in dec",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B01.SR in in pos",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B01.SR turn on",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B01.SR turn off",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B01.SR up",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B01.SR down",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B02.SR out dec",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B02.SR out in pos",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B02.SR in dec",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B02.SR in in pos",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B02.SR turn on",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B02.SR turn off",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B02.SR up",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B02.SR down",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B01.SR out safety",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B01.SR in safety",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B02.SR out safety",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "SB.start(+)",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "SB.stop(1)",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "SB.reset",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "SB.auto/manul",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "SB.pause",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "SB.emg",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "D01.SB.start",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "D06.SB.start",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B02.SR in safety",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "SAFETYDOOR.requset",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "SAFETYDOOR.confirm",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "SAFETYDOOR.reset",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "LED.red",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "LED.green",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "LED.yellow",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "D01.LED.green",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "D06.LED.green",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B01.YV.turn",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B01.YV.up down",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B01.YV.gassing",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B02.YV.turn",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B02.YV.up down",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "B02.YV.gassing",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "SAFETYDOOR.led",
+      "value": "1",
+      "state": "1"
+    },
+    {
+      "name": "SAFETYDOOR.open",
+      "value": "1",
+      "state": "1"
+    }
+  ],
+  "address": [
+    {
+      "name": "DB102.0.0",
+      "count": 58
+    }
+  ]
+}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/State.json b/CanadaMes-ui/src/configuration/State.json
new file mode 100644
index 0000000..f823304
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/State.json
@@ -0,0 +1,40 @@
+{
+  "state": [
+    {
+      "name": "D01.State"
+    },
+    {
+      "name": "D02.State"
+    },
+    {
+      "name": "B01.State"
+    },
+    {
+      "name": "B02.State"
+    },
+    {
+      "name": "A01.State"
+    },
+    {
+      "name": "A02.State"
+    },
+    {
+      "name": "D03.State"
+    },
+    {
+      "name": "D04.State"
+    },
+    {
+      "name": "D05.State"
+    },
+    {
+      "name": "D06.State"
+    }
+  ],
+  "address": [
+    {
+      "name": "DB103.0",
+      "count": 10
+    }
+  ]
+}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/address.json b/CanadaMes-ui/src/configuration/address.json
new file mode 100644
index 0000000..c26211e
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/address.json
@@ -0,0 +1,57 @@
+{
+    
+    "parameter1": [
+      {
+        "name": "DB100.0",
+        "type":"w",
+        "count": 12
+      },
+      {
+        "name": "DB100.0",
+        "type":"x",
+        "count": 12
+      }
+    ],
+    "parameter2": [
+        {
+          "name": "DB100.0",
+          "count": 12,
+          "type": 0
+        },
+        {
+          "name": "DB100.0",
+          "count": 12,
+          "type": 1
+        }
+      ],
+      "Positioning1": [
+        {
+          "name": "DB100.0",
+          "count": 12
+        },
+        {
+          "name": "DB100.0",
+          "count": 12
+        }
+      ],
+      "Positioning2": [
+        {
+          "name": "DB100.0",
+          "count": 12
+        },
+        {
+          "name": "DB100.0",
+          "count": 12
+        }
+      ],
+      "ServoManualone": [
+        {
+          "name": "DB100.0",
+          "count": 12
+        },
+        {
+          "name": "DB100.0",
+          "count": 12
+        }
+      ]
+  }
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/parameter1.json b/CanadaMes-ui/src/configuration/parameter1.json
new file mode 100644
index 0000000..b81638e
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/parameter1.json
@@ -0,0 +1,153 @@
+[
+    
+    [
+        {
+            "title": {
+              "name": "D01~D06杈撻��"
+              
+            }
+          },
+      {
+        "name": "鏈�楂橀�熷害",
+        "read": 33,
+        "sending": 0,
+        "type": "0",
+        "address":"DB100.0",
+        "count":3,
+        "value":0
+      },
+      {
+        "name": "楂橀�熺嚎閫熷害",
+        "read": 11,
+        "sending": 0,
+        "type": "0",
+        "value":0
+      },
+      {
+        "name": "浣庨�熺嚎閫熷害",
+        "read": 11,
+        "sending": 0,
+        "type": "0",
+        "value":0
+      },
+      {
+        "name": "鎵嬪姩閫熷害",
+        "read": 22,
+        "sending": 0,
+        "type": "0",
+        "value":0
+      }
+      
+     
+    ],
+
+    [
+      {
+          "title": {
+            "name": "A01~A02杈撻��"
+            
+          }
+        },
+    {
+      "name": "鏈�楂橀�熷害",
+      "read": 33,
+      "sending": 0,
+      "type": "0",
+      "address":"DB100.0",
+      "count":3,
+      "value":0
+    },
+    {
+      "name": "楂橀�熺嚎閫熷害",
+      "read": 11,
+      "sending": 0,
+      "type": "0",
+      "value":0
+    },
+    {
+      "name": "浣庨�熺嚎閫熷害",
+      "read": 11,
+      "sending": 0,
+      "type": "0",
+      "value":0
+    },
+    {
+      "name": "鎵嬪姩閫熷害",
+      "read": 22,
+      "sending": 0,
+      "type": "0",
+      "value":0
+    }
+    
+   
+  ],[
+    {
+        "title": {
+          "name": "B01~B02杈撻��"
+          
+        }
+      },
+  {
+    "name": "鏈�楂橀�熷害",
+    "read": 33,
+    "sending": 0,
+    "type": "0",
+    "address":"DB100.0",
+    "count":3,
+    "value":0
+  },
+  {
+    "name": "楂橀�熺嚎閫熷害",
+    "read": 11,
+    "sending": 0,
+    "type": "0",
+    "value":0
+  },
+  {
+    "name": "浣庨�熺嚎閫熷害",
+    "read": 11,
+    "sending": 0,
+    "type": "0",
+    "value":0
+  },
+  {
+    "name": "鎵嬪姩閫熷害",
+    "read": 22,
+    "sending": 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
+  }
+  
+  
+  ]
+   
+    
+  ]
+  
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/parameter2.json b/CanadaMes-ui/src/configuration/parameter2.json
new file mode 100644
index 0000000..2c4dce2
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/parameter2.json
@@ -0,0 +1,316 @@
+[
+    
+    [
+      {
+        "button": {
+          "name": "D03鎵嬪姩鐘舵��",
+          "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": "D04鎵嬪姩鐘舵��",
+          "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": "D05鎵嬪姩鐘舵��",
+          "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": "D06鎵嬪姩鐘舵��",
+          "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": "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
+   
+      }
+      
+     
+    ]
+   
+    
+  ]
+  
\ No newline at end of file
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index fa58c91..0b55a8b 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -196,10 +196,8 @@
   "langResetButton": "閲嶇疆",
   "langCancelButton": "鍙栨秷",
   "langRegisterSuccessMessage": "娉ㄥ唽鎴愬姛",
-
-  "娣诲姞鐢ㄦ埛鎴愬姛":"娣诲姞鐢ㄦ埛鎴愬姛",
+  "娣诲姞鐢ㄦ埛鎴愬姛": "娣诲姞鐢ㄦ埛鎴愬姛",
   "confirmResetPassword": "纭閲嶇疆瀵嗙爜涓洪粯璁ゅ�煎悧锛�",
-  
   "confirm": "纭畾",
   "cancel": "鍙栨秷",
   "passwordResetSuccess": "瀵嗙爜宸查噸缃负榛樿鍊�",
@@ -210,67 +208,60 @@
   "addUserSuccess": "娣诲姞鐢ㄦ埛鎴愬姛",
   "editUserSuccess": "淇敼鐢ㄦ埛鎴愬姛",
   "effective": "鏈夋晥",
-"invalid": "鏃犳晥",
-
-"addSuccessMessage": "娣诲姞鎴愬姛",
-"deleteConfirmMessage": "纭畾瑕佸垹闄よ鏉冮檺鍚楋紵",
-
-"confirmButtonText": "纭畾",
-"cancelButtonText": "鍙栨秷",
-"deleteSuccessMessage": "鍒犻櫎鎴愬姛",
-"deleteCancelledMessage": "宸插彇娑堝垹闄ゆ搷浣�",
-
-
-
-  "Enter the glass lD":"杈撳叆鐜荤拑id",
-  "Infeed barcodid":"鎵嬪姩涓婄墖",
-  "Enter the order number":"杈撳叆璁㈠崟鍙�",
-  "Exit the glass by order number":"鎸夎鍗曞嚭鐗�",
-  "Please confirm the glass information":"璇风‘璁ょ幓鐠冧俊鎭�",
-  "Please confirm the Ordering Information":"璇风‘璁よ鍗曚俊鎭�",
-  "Alarm Information":"鎶ヨ淇℃伅",
-  "Cage Details":"鐞嗙墖绗艰鎯�",
-  "order":"璁㈠崟",
-  "length":"闀�",
-  "width":"瀹�",
-  "Operate":"鎿嶄綔",
-  "end task":"瀹屾垚浠诲姟",
-  "cancel":"鍙栨秷",
-  "confirm":"纭",
-  "number":"鏁伴噺",
-  "Outfeed Barcodid":"鍑虹墖鐜荤拑id",
-  "Infeed Barcodid":"杩涚墖鐜荤拑id",
-  "The Cage number being used":"绗煎瓙",
-  "The Slot number being used":"鏍煎瓙",
-  "Order Nmuber":"璁㈠崟缂栧彿",
-  "List Number":"鍒楄〃缂栧彿",
-  "Box Number":"绠卞瓙缂栧彿",
-  "Length and Width":"灏哄",
-  "id":"id",
-  "content":"鍐呭",
-  "timeon":"鎶ヨ鏃堕棿",
-  "endTime":"缁撴潫鏃堕棿",
-
-  "The Cage number":"绗煎瓙",
-  "The Side":"鍐呭渚�",
-  "The Slot Number":"鏍煎瓙",
-  "Barcodid":"鐜荤拑id",
-  "Order Number":"璁㈠崟",
-  "delete":"鍒犻櫎",
-  "out":"鍑虹墖",
-
-  "Operation successful":"鎿嶄綔鎴愬姛",
-  "Operation canceled":"鎿嶄綔鍙栨秷",
-  "There is no such order":"娌℃湁姝よ鍗曠殑鐜荤拑",
-  "There are currently tasks":"褰撳墠鏈変换鍔�",
-  "There is no such glass":"娌℃湁姝ょ幓鐠�",
-  "There is no such grid":"娌℃湁绌洪棽鏍煎瓙",
-  "No delete allowed":"涓嶈兘鍒犻櫎",
-  "No out allowed":"涓嶈兘鍑虹墖",
-  "Are you sure to perform this operation ?":"纭畾鎵ц姝ゆ搷浣�?",
-  "prompt":"鎻愮ず",
-  "Yes":"鏄�",
-  "No":"鍚�",
+  "invalid": "鏃犳晥",
+  "addSuccessMessage": "娣诲姞鎴愬姛",
+  "deleteConfirmMessage": "纭畾瑕佸垹闄よ鏉冮檺鍚楋紵",
+  "confirmButtonText": "纭畾",
+  "cancelButtonText": "鍙栨秷",
+  "deleteSuccessMessage": "鍒犻櫎鎴愬姛",
+  "deleteCancelledMessage": "宸插彇娑堝垹闄ゆ搷浣�",
+  "Enter the glass lD": "杈撳叆鐜荤拑id",
+  "Infeed barcodid": "鎵嬪姩涓婄墖",
+  "Enter the order number": "杈撳叆璁㈠崟鍙�",
+  "Exit the glass by order number": "鎸夎鍗曞嚭鐗�",
+  "Please confirm the glass information": "璇风‘璁ょ幓鐠冧俊鎭�",
+  "Please confirm the Ordering Information": "璇风‘璁よ鍗曚俊鎭�",
+  "Alarm Information": "鎶ヨ淇℃伅",
+  "Cage Details": "鐞嗙墖绗艰鎯�",
+  "order": "璁㈠崟",
+  "length": "闀�",
+  "width": "瀹�",
+  "Operate": "鎿嶄綔",
+  "end task": "瀹屾垚浠诲姟",
+  "cancel": "鍙栨秷",
+  "confirm": "纭",
+  "number": "鏁伴噺",
+  "Outfeed Barcodid": "鍑虹墖鐜荤拑id",
+  "Infeed Barcodid": "杩涚墖鐜荤拑id",
+  "The Cage number being used": "绗煎瓙",
+  "The Slot number being used": "鏍煎瓙",
+  "Order Nmuber": "璁㈠崟缂栧彿",
+  "List Number": "鍒楄〃缂栧彿",
+  "Box Number": "绠卞瓙缂栧彿",
+  "Length and Width": "灏哄",
+  "id": "id",
+  "content": "鍐呭",
+  "timeon": "鎶ヨ鏃堕棿",
+  "endTime": "缁撴潫鏃堕棿",
+  "The Cage number": "绗煎瓙",
+  "The Side": "鍐呭渚�",
+  "The Slot Number": "鏍煎瓙",
+  "Barcodid": "鐜荤拑id",
+  "Order Number": "璁㈠崟",
+  "delete": "鍒犻櫎",
+  "out": "鍑虹墖",
+  "Operation successful": "鎿嶄綔鎴愬姛",
+  "Operation canceled": "鎿嶄綔鍙栨秷",
+  "There is no such order": "娌℃湁姝よ鍗曠殑鐜荤拑",
+  "There are currently tasks": "褰撳墠鏈変换鍔�",
+  "There is no such glass": "娌℃湁姝ょ幓鐠�",
+  "There is no such grid": "娌℃湁绌洪棽鏍煎瓙",
+  "No delete allowed": "涓嶈兘鍒犻櫎",
+  "No out allowed": "涓嶈兘鍑虹墖",
+  "Are you sure to perform this operation ?": "纭畾鎵ц姝ゆ搷浣�?",
+  "prompt": "鎻愮ず",
+  "Yes": "鏄�",
+  "No": "鍚�",
   "today": "浠婂ぉ",
   "yesterday": "鏄ㄥぉ",
   "week": "涓�鍛ㄥ墠",
@@ -280,31 +271,142 @@
   "alacontent": "鎶ヨ鍐呭",
   "time-on": "寮�濮嬫椂闂�",
   "End-Time": "缁撴潫鏃堕棿",
-
-  "Please enter the password":"璇疯緭鍏ュ瘑鐮�",
-  "Password error":"瀵嗙爜閿欒",
-  "DataBase Connection failed":"鏁版嵁搴撹繛鎺ュけ璐�",
-  "Distribute parameters":"涓嬪彂鍙傛暟",
-  "The glass size is not within the range":"鐜荤拑灏哄涓嶅湪鑼冨洿鍐�",
-  "increase":"娣诲姞",
-  "Enable":"鍚敤",
-  "Disable":"绂佺敤",
-  "Usage":"浣跨敤鐜�",
-  "Space (Pieces)":"绌洪棿(鐗囨暟)",
-  "This glass is already in the cage":"绗煎瓙閲屽凡鏈夋鐜荤拑",
-  "Enter the Order lD":"璇疯緭鍏ヨ鍗昳d",
-  "OrderInfo":"璁㈠崟淇℃伅",
-  "Query":"鏌ヨ",
-  "permission update":"鏉冮檺缂栬緫",
-  "query was successful":"鏌ヨ鎴愬姛",
-  "Scan Code Point":"鎵爜浣�",
-  "Upper film position":"涓婄墖浣�",
-  "Glass Information":"鐜荤拑淇℃伅",
-  "current Information":"褰撳墠淇℃伅",
-  "Modify Information":"淇敼淇℃伅",
-  "Clear Current":"娓呴櫎褰撳墠",
-  "Confirm Modification":"纭淇敼",
-  "The glass ID already exists in the loading queue":"涓婄墖闃熷垪宸插瓨鍦ㄦ鐜荤拑id",
-  "This glass ID already exists in the sorting cage":"鐞嗙墖绗煎唴宸插瓨鍦ㄦ鐜荤拑id"
-
+  "Please enter the password": "璇疯緭鍏ュ瘑鐮�",
+  "Password error": "瀵嗙爜閿欒",
+  "DataBase Connection failed": "鏁版嵁搴撹繛鎺ュけ璐�",
+  "Distribute parameters": "涓嬪彂鍙傛暟",
+  "The glass size is not within the range": "鐜荤拑灏哄涓嶅湪鑼冨洿鍐�",
+  "increase": "娣诲姞",
+  "Enable": "鍚敤",
+  "Disable": "绂佺敤",
+  "Usage": "浣跨敤鐜�",
+  "Space (Pieces)": "绌洪棿(鐗囨暟)",
+  "This glass is already in the cage": "绗煎瓙閲屽凡鏈夋鐜荤拑",
+  "Enter the Order lD": "璇疯緭鍏ヨ鍗昳d",
+  "OrderInfo": "璁㈠崟淇℃伅",
+  "Query": "鏌ヨ",
+  "permission update": "鏉冮檺缂栬緫",
+  "query was successful": "鏌ヨ鎴愬姛",
+  "Scan Code Point": "鎵爜浣�",
+  "Upper film position": "涓婄墖浣�",
+  "Glass Information": "鐜荤拑淇℃伅",
+  "current Information": "褰撳墠淇℃伅",
+  "Modify Information": "淇敼淇℃伅",
+  "Clear Current": "娓呴櫎褰撳墠",
+  "Confirm Modification": "纭淇敼",
+  "The glass ID already exists in the loading queue": "涓婄墖闃熷垪宸插瓨鍦ㄦ鐜荤拑id",
+  "This glass ID already exists in the sorting cage": "鐞嗙墖绗煎唴宸插瓨鍦ㄦ鐜荤拑id",
+  "langparameter": {
+    "conveyor Velocity(Auto FAST)": "鐨甫杈撻�佽嚜鍔ㄥ揩閫�",
+    "conveyor Velocity(Auto SLOW)": "鐨甫杈撻�佽嚜鍔ㄦ參閫�",
+    "conveyor Velocity(Manual)": "鐨甫杈撻�佹墜鍔ㄩ�熷害",
+    "A01 A02 TURN JOG Velocity": "A01 A02 缈昏浆鐐瑰姩閫熷害",
+    "A01 A02 TRAVEL JOG Velocity": "A01 A02 琛岃蛋鐐瑰姩閫熷害",
+    "B01 B02 TRAVEL JOG Velocity": "B01 B02 琛岃蛋鐐瑰姩閫熷害",
+    "A01 A02 TURN POS Velocity AUTO": "A01 A02 缈昏浆鑷姩瀹氫綅閫熷害",
+    "A01 A02 TURN POS Velocity manual": "A01 A02 缈昏浆鎵嬪姩瀹氫綅閫熷害",
+    "A01 A02 TRAVEL POS Velocity AUTO": "A01 A02 琛岃蛋鑷姩瀹氫綅閫熷害",
+    "A01 A02 TRAVEL POS Velocity manual": "A01 A02 琛岃蛋鎵嬪姩瀹氫綅閫熷害",
+    "B01 B02 TRAVEL POS Velocity AUTO": "B01 B02 琛岃蛋鑷姩瀹氫綅閫熷害",
+    "B01 B02 TRAVEL POS Velocity manual": "B01 B02 琛岃蛋鎵嬪姩瀹氫綅閫熷害"
+  },
+  "langActions": {
+    "D01 VFD conveyor": "D01 杈撻�佸彉棰�",
+    "D02 VFD conveyor": "D02 杈撻�佸彉棰�",
+    "D03 VFD conveyor": "D03 杈撻�佸彉棰�",
+    "D04 VFD conveyor": "D04 杈撻�佸彉棰�",
+    "D05 VFD conveyor": "D05 杈撻�佸彉棰�",
+    "D06 VFD conveyor": "D06 杈撻�佸彉棰�",
+    "A01 VFD conveyor": "A01 杈撻�佸彉棰�",
+    "A02 VFD conveyor": "A02 杈撻�佸彉棰�",
+    "B01 VFD conveyor": "B01 杈撻�佸彉棰�",
+    "B02 VFD conveyor": "B02 杈撻�佸彉棰�",
+    "A01 SERVE TURN JOG+": "A01 缈昏浆浼烘湇鐐瑰姩",
+    "A02 SERVE TURN JOG-": "A02 缈昏浆浼烘湇鐐瑰姩",
+    "A01 SERVE TRAVEL JOG+": "A01 琛岃蛋浼烘湇鐐瑰姩",
+    "A02 SERVE TRAVEL JOG-": "A02 琛岃蛋浼烘湇鐐瑰姩",
+    "B01 SERVE TRAVEL JOG+": "B01 琛岃蛋浼烘湇鐐瑰姩",
+    "B02 SERVE TRAVEL JOG-": "B02 琛岃蛋浼烘湇鐐瑰姩",
+    "A01 SERVE TURN POS": "A01 缈昏浆浼烘湇瀹氫綅",
+    "A02 SERVE TURN POS": "A02 缈昏浆浼烘湇瀹氫綅",
+    "A01 SERVE TRAVEL POS": "A01 琛岃蛋浼烘湇瀹氫綅",
+    "A02 SERVE TRAVEL POS": "A02 琛岃蛋浼烘湇瀹氫綅",
+    "B01 SERVE TRAVEL POS": "B01 琛岃蛋浼烘湇瀹氫綅",
+    "B02 SERVE TRAVEL POS": "B02 琛岃蛋浼烘湇瀹氫綅",
+    "B01 YV TURN": "B01 鎶捣鐢电闃�",
+    "B01 YV UP DOWN": "B01 涓婂崌涓嬮檷鐢电闃�",
+    "B02 YV TURN": "B02 鎶捣鐢电闃�",
+    "B02 YV UP DOWN": "B02 涓婂崌涓嬮檷鐢电闃�"
+  },
+  "Signlang": {
+    "D01.SR dec": "D01.鍑忛�熶紶鎰熷櫒",
+    "D01.SR in pos": "D01.鍒颁綅浼犳劅鍣�",
+    "D02.SR dec": "D02.鍑忛�熶紶鎰熷櫒",
+    "D02.SR in pos": "D02.鍒颁綅浼犳劅鍣�",
+    "D03.SR into": "D03.杩涚墖浼犳劅鍣�",
+    "D03.SR dec": "D03.鍑忛�熶紶鎰熷櫒",
+    "D03.SR in pos": "D03.鍒颁綅浼犳劅鍣�",
+    "D04.SR dec": "D04.鍑忛�熶紶鎰熷櫒",
+    "D04.SR in pos": "D04.鍒颁綅浼犳劅鍣�",
+    "D05.SR dec": "D05.鍑忛�熶紶鎰熷櫒",
+    "D05.SR in pos": "D05.鍒颁綅浼犳劅鍣�",
+    "D06.SR dec": "D06.鍑忛�熶紶鎰熷櫒",
+    "D06.SR in pos": "D06.鍒颁綅浼犳劅鍣�",
+    "B01.SR out dec": "B01.鍑虹墖鍑忛�熶紶鎰熷櫒",
+    "B01.SR out in pos": "B01.鍑虹墖鍒颁綅浼犳劅鍣�",
+    "B01.SR in dec": "B01.杩涚墖鍑忛�熶紶鎰熷櫒",
+    "B01.SR in in pos": "B01.杩涚墖鍒颁綅浼犳劅鍣�",
+    "B01.SR turn on": "B01.缈昏浆涓婂埌浣嶄紶鎰熷櫒",
+    "B01.SR turn off": "B01.缈昏浆涓嬪埌浣嶄紶鎰熷櫒",
+    "B01.SR up": "B01.涓婂崌鍒颁綅浼犳劅鍣�",
+    "B01.SR down": "B01.涓嬮檷鍒颁綅浼犳劅鍣�",
+    "B02.SR out dec": "B02.鍑虹墖鍑忛�熶紶鎰熷櫒",
+    "B02.SR out in pos": "B02.鍑虹墖鍒颁綅浼犳劅鍣�",
+    "B02.SR in dec": "B02.杩涚墖鍑忛�熶紶鎰熷櫒",
+    "B02.SR in in pos": "B02.杩涚墖鍒颁綅浼犳劅鍣�",
+    "B02.SR turn on": "B02.缈昏浆涓婂埌浣嶄紶鎰熷櫒",
+    "B02.SR turn off": "B02.缈昏浆涓嬪埌浣嶄紶鎰熷櫒",
+    "B02.SR up": "B02.涓婂崌鍒颁綅浼犳劅鍣�",
+    "B02.SR down": "B02.涓嬮檷鍒颁綅浼犳劅鍣�",
+    "B01.SR out safety": "B01.鍑虹墖瀹夊叏浼犳劅鍣�",
+    "B01.SR in safety": "B01.杩涚墖瀹夊叏浼犳劅鍣�",
+    "B02.SR out safety": "B02.鍑虹墖瀹夊叏浼犳劅鍣�",
+    "SB.start(+)": "SB.鍚姩锛�+锛夋寜閽�",
+    "SB.stop(1)": "SB.鍋滄锛�-锛夋寜閽�",
+    "SB.reset": "SB.澶嶄綅鎸夐挳",
+    "SB.auto/manul": "SB.鎵�/鑷垏鎹㈡寜閽�",
+    "SB.pause": "SB.鏆傚仠鎸夐挳",
+    "SB.emg": "SB.鎬ュ仠鎸夐挳",
+    "D01.SB.start": "D01.鍚姩",
+    "D06.SB.start": "D06.鍚姩",
+    "B02.SR in safety": "B02.杩涚墖瀹夊叏浼犳劅鍣�",
+    "SAFETYDOOR.requset": "瀹夊叏闂ㄨ姹傝繘鍏�",
+    "SAFETYDOOR.confirm": "瀹夊叏闂ㄧ‘璁�",
+    "SAFETYDOOR.reset": "瀹夊叏闂ㄥ浣�",
+    "LED.red": "涓夎壊鐏孩",
+    "LED.green": "涓夎壊鐏豢",
+    "LED.yellow": "涓夎壊鐏粍",
+    "D01.LED.green": "D01.缁跨伅",
+    "D06.LED.green": "D06.缁跨伅",
+    "B01.YV.turn": "B01.鐢电闃�缈昏浆",
+    "B01.YV.up down": "B01.鐢电闃�涓婂崌涓嬮檷",
+    "B01.YV.gassing": "B01.鐢电闃�鍚规皵",
+    "B02.YV.turn": "B02.鐢电闃�缈昏浆",
+    "B02.YV.up down": "B02.鐢电闃�涓婂崌涓嬮檷",
+    "B02.YV.gassing": "B02.鐢电闃�鍚规皵",
+    "SAFETYDOOR.led": "瀹夊叏闂ㄧ姸鎬佺伅",
+    "SAFETYDOOR.open": "瀹夊叏闂ㄦ墦寮�"
+  },
+  "Statelang": {
+    "D01.State": "D01.鐘舵��",
+    "D02.State": "D02.鐘舵��",
+    "B01.State": "B01.鐘舵��",
+    "B02.State": "B02.鐘舵��",
+    "A01.State": "A01.鐘舵��",
+    "A02.State": "A02.鐘舵��",
+    "D03.State": "D03.鐘舵��",
+    "D04.State": "D04.鐘舵��",
+    "D05.State": "D05.鐘舵��",
+    "D06.State": "D06.鐘舵��"
+  }
 }
\ No newline at end of file
diff --git a/CanadaMes-ui/src/router/index.js b/CanadaMes-ui/src/router/index.js
index a789434..c4c5d3a 100644
--- a/CanadaMes-ui/src/router/index.js
+++ b/CanadaMes-ui/src/router/index.js
@@ -83,6 +83,30 @@
         path: '/Electrical/alarm',
         component: () => import('../views/Electrical/alarm')
       },
+      {
+        path: '/Electrical/Servomanual',
+        component: () => import('../views/Electrical/Servomanual')
+      },
+      {
+        path: '/Electrical/ServoManualone',
+        component: () => import('../views/Electrical/ServoManualone')
+      },
+      {
+        path: '/Electrical/Parameter1',
+        component: () => import('../views/Electrical/Parameter1')
+      },
+      {
+        path: '/Electrical/Parameter2',
+        component: () => import('../views/Electrical/Parameter2')
+      },
+      {
+        path: '/Electrical/Positioning1',
+        component: () => import('../views/Electrical/Positioning1')
+      },
+      {
+        path: '/Electrical/Positioning2',
+        component: () => import('../views/Electrical/Positioning2')
+      },
 
 
 
diff --git a/CanadaMes-ui/src/views/Electrical/Action.vue b/CanadaMes-ui/src/views/Electrical/Action.vue
index db3b8da..68a1f2f 100644
--- a/CanadaMes-ui/src/views/Electrical/Action.vue
+++ b/CanadaMes-ui/src/views/Electrical/Action.vue
@@ -2,12 +2,20 @@
   <div class="app">
     <!--闈㈠寘灞戝鑸尯鍩�-->
     <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
-      <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm') }}</router-link>
-      <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link>
-      <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link>
-      <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link>
-    <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link>
+      <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
+      }}</router-link>
+      <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
+      }}</router-link>
+      <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+      }}</router-link>
+      <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
+      }}</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('Servo Manual')
+      }}</router-link>
     </el-breadcrumb>
+    
     <div>Action</div>
     <el-form label-width="100px" style="display: flex;flex-wrap: wrap;" :model="{ messagepack }">
       <!-- <div class="kuai_div" v-for="item in record.xyData" :key="item.value">
@@ -19,20 +27,24 @@
         <el-input v-model="item.name" style="width: 240px;" class="in_mc" readonly></el-input>
         <el-switch v-model="item.value" active-value="1" inactive-value="0" @change="send()"></el-switch>
       </div>
+
+
     </el-form>
 
 
   </div>
 </template>
  
-<script > 
+<script >
 import LanguageMixin from '../../lang/LanguageMixin'
+import data from '../../configuration/Action'
 let socket;
 export default {
   name: "Action",
   mixins: [LanguageMixin],
   data () {
     return {
+      jsonData: data,
       activeButton: '',
       record: {
         params: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
@@ -107,12 +119,13 @@
     }
   },
   created () {
-    this.init(); 
+    this.init();
   },
   methods: {
-    setActiveButton(buttonName) {
-    this.activeButton = buttonName;
-  },
+
+    setActiveButton (buttonName) {
+      this.activeButton = buttonName;
+    },
     init () {
       let viewname = "action";
 
@@ -134,24 +147,28 @@
         };
         //  娴忚鍣ㄧ鏀舵秷鎭紝鑾峰緱浠庢湇鍔＄鍙戦�佽繃鏉ョ殑鏂囨湰娑堟伅
         socket.onmessage = (msg) => {
+          //console.log("鏀跺埌鏁版嵁====" + msg.data);
           if (!msg.data) {
             return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
           }
 
           let obj = JSON.parse(msg.data);
-          if (obj.params ){
-          this.record.params[0] = obj.params[0];
 
-          for (let a = 0; a <= this.record.params[0].length - 1; a++) {
-            if (!this.record.xyData[a]) {
-              this.record.xyData[a] = { name: this.record.canshu[a], value: this.record.params[0][a].toString() };
-            } else {
+          if (obj.params) {
+            this.record.params[0] = obj.params[0];
+            for (let a = 0; a <= this.record.params[0].length - 1; a++) {
+              this.record.xyData[a].name = this.jsonData.action[a].name;
               this.record.xyData[a].value = this.record.params[0][a].toString();
             }
+            const language = this.$i18n.locale;
+            if (language === 'en-US') {
+              this.replaceChineseWithEnglish();
+            } else {
+              this.localizedRoles = [...this.record.xyData];
+            }
           }
-        }
-          // console.log(this.record.xyData);
           this.$forceUpdate();
+          this.replaceChineseWithEnglish();
         };
 
         //鍏抽棴浜嬩欢
@@ -169,7 +186,13 @@
       this.messagepack.data = this.record.xyData.map(item => parseInt(item.value)); // 杞崲涓烘暣鏁版暟缁�
       //console.log(this.messagepack);
       socket?.send(JSON.stringify(this.messagepack));
-    }
+    },
+    //璇█杞崲
+    replaceChineseWithEnglish () {
+      const translation = this.$t('langActions');
+      this.record.xyData = this.record.xyData.map(item => { return { name: translation[item.name] || item.name, value: item.value }; });
+      console.log(translation);
+    },
 
   }
 
@@ -206,6 +229,7 @@
 .el-input__inner {
   border: none;
 }
+
 .blue-button {
   background-color: skyblue;
 }
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter.vue b/CanadaMes-ui/src/views/Electrical/Parameter.vue
index 0910224..46d671f 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter.vue
@@ -2,66 +2,73 @@
   <div class="app">
     <!-- 闈㈠寘灞戝鑸尯鍩� -->
     <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
-      <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm') }}</router-link>
-      <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link>
-      <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link>
-      <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link>
-    <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link>
+      <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
+      }}</router-link>
+      <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
+      }}</router-link>
+      <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+      }}</router-link>
+      <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
+      }}</router-link>
+      <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
+      }}</router-link>
     </el-breadcrumb>
 
     <div>Parameter</div>
 
     <el-form label-width="100px" style="display: flex; flex-wrap: wrap;" :model="messagepack.data">
       <div id="btn_div">
-        <el-button type="primary" @click="send()" id="xiafa" :disabled="isButtonDisabled">{{ $t('Distribute parameters') }}</el-button>
+        <el-button type="primary" @click="send()" id="xiafa" :disabled="isButtonDisabled">{{ $t('Distribute parameters')
+        }}</el-button>
 
       </div>
       <div class="kuai_div" v-for="(item, index) in record.xyData" :key="index">
         <el-input style="width: 280px; border:none;" class="in_mc" v-model="item.name" readonly></el-input>
-      
-  <span style="margin-right: 5px; width: 50px;">{{ item.value }}</span>
-  <span style="margin-right: 5px; font-size: 14px;color: red;">|</span>
-  <input v-model="item.value2" type="number" style="width: 43px; margin-right: 5px; margin-top: 5px; font-size: 16px;">
+
+        <span style="margin-right: 5px; width: 50px;">{{ item.value }}</span>
+        <span style="margin-right: 5px; font-size: 14px;color: red;">|</span>
+        <input v-model="item.value2" type="number"
+          style="width: 43px; margin-right: 5px; margin-top: 5px; font-size: 16px;">
+        <span style="margin-right: 5px; width: 50px;">{{ item.unit }}</span>
 
       </div>
     </el-form>
 
     <div>
-   
-  </div>
-  </div>
 
-
-  
+    </div>
+  </div>
 </template>
 
-<script> 
+<script>
 
 let socket;
 import LanguageMixin from '../../lang/LanguageMixin'
+import data from '../../configuration/Parameter'
 export default {
   name: "Parameter",
   mixins: [LanguageMixin],
   data () {
     return {
+      jsonData: data,
       dialogVisible: true,
       password: '',
       activeButton: '',
       record: {
         params: [100, 200, 10, 10, 10, 10],
         xyData: [
-          { name: "conveyor Velocity(Auto FAST)", value: 0, value2: 0 },
-          { name: "conveyor Velocity(Auto SLOW)", value: 0, value2: 0 },
-          { name: "conveyor Velocity(Manual)", value: 0, value2: 0 },
-          { name: "A01 A02 TURN JOG Velocity", value: 0, value2: 0 },
-          { name: "A01 A02 TRAVEL JOG Velocity", value: 0, value2: 0 },
-          { name: "B01 B02 TRAVEL JOG Velocity", value: 0, value2: 0 },
-          { name: "A01 A02 TURN POS Velocity AUTO", value: 0, value2: 0 },
-          { name: "A01 A02 TURN POS Velocity manual", value: 0, value2: 0 },
-          { name: "A01 A02 TRAVEL POS Velocity AUTO", value: 0, value2: 0 },
-          { name: "A01 A02 TRAVEL POS Velocity manual", value: 0, value2: 0 },
-          { name: "B01 B02 TRAVEL POS Velocity AUTO", value: 0, value2: 0 },
-          { name: "B01 B02 TRAVEL POS Velocity manual", value: 0, value2: 0 }
+          { 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: []
       },
@@ -78,13 +85,19 @@
 
   created () {
     this.initWebSocket();
-    this.isButtonDisabled = true; 
+    this.isButtonDisabled = true;
+
   },
   methods: {
-   
-    
-   
-    setActiveButton(buttonName) {
+    showdata () {
+      console.log(1111);
+      console.log(this.jsonData.para[0].name);
+      // console.log(this.record.xyData);
+
+    },
+
+
+    setActiveButton (buttonName) {
       this.activeButton = buttonName;
     },
     initWebSocket () {
@@ -117,33 +130,53 @@
           let obj = JSON.parse(msg.data);
 
 
-          if (obj.params && obj.state){
+          if (obj.params && obj.state) {
 
 
-       
 
-          this.record.params[0] = obj.params[0];
-          this.record.state = obj.state[0];
-          if (obj.state && obj.state.length > 0) {
-  let isButtonDisabled = this.record.state.includes(1);
-  this.isButtonDisabled = isButtonDisabled;
 
-        
-          // 鍒ゆ柇state涓槸鍚﹀瓨鍦�1
-          //console.log(isButtonDisabled)
-         // 灏嗗垽鏂粨鏋滀繚瀛樺埌鍙橀噺isButtonDisabled涓�
+            this.record.params[0] = obj.params[0];
+            this.record.state = obj.state[0];
+            if (obj.state && obj.state.length > 0) {
+              let isButtonDisabled = this.record.state.includes(1);
+              this.isButtonDisabled = isButtonDisabled;
 
-          for (let a = 0; a <= this.record.params[0].length - 1; a++) {
-            if (!this.record.xyData[a]) {
-              this.record.xyData[a] = { name: this.record.canshu[a], value: this.record.params[0][a] };
-            } else {
-              this.record.xyData[a].value = this.record.params[0][a];
+
+              // 鍒ゆ柇state涓槸鍚﹀瓨鍦�1
+              //console.log(isButtonDisabled)
+              // 灏嗗垽鏂粨鏋滀繚瀛樺埌鍙橀噺isButtonDisabled涓�
+
+              for (let a = 0; a <= this.record.params[0].length - 1; a++) {
+                // this.record.xyData[a] =
+                // {
+                //   name: this.jsonData.para[a].name,
+                //   value: this.jsonData.para[a].read,
+                //   value2: this.jsonData.para[a].sending,
+                //   unit: this.jsonData.para[a].unit
+                // };
+
+                // if (!this.xyData[a]) {
+                this.record.xyData[a] =
+                {
+                  name: this.jsonData.para[a].name,
+                  value: this.record.params[0][a],
+                  unit: this.jsonData.para[a].unit
+                };
+              }
+              // else {
+              //     this.xyData[a].value = this.record.params[0][a];
+              //   }
+              // }
+              const language = this.$i18n.locale;
+              if (language === 'en-US') {
+                this.replaceChineseWithEnglish();
+              } else {
+                this.localizedRoles = [...this.record.xyData];
+              }
             }
           }
-        }
-      }
-          //console.log(this.record.xyData);
           this.$forceUpdate();
+          this.replaceChineseWithEnglish();
         };
 
         // 鍏抽棴浜嬩欢
@@ -164,7 +197,13 @@
     },
     handleChange (index, value) {
       this.record.xyData[index].value = value;
-    }
+    },
+    //璇█杞崲
+    replaceChineseWithEnglish () {
+      const translation = this.$t('langparameter');
+      this.record.xyData = this.record.xyData.map(item => { return { name: translation[item.name] || item.name, value: item.value, unit: item.unit }; });
+      //console.log(translation);
+    },
   }
 };
 </script>
@@ -187,8 +226,9 @@
 
 .blue-button {
   background-color: skyblue;
- 
+
 }
+
 #btn_div {
   width: 100%;
 }
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter1.vue b/CanadaMes-ui/src/views/Electrical/Parameter1.vue
new file mode 100644
index 0000000..0ed696f
--- /dev/null
+++ b/CanadaMes-ui/src/views/Electrical/Parameter1.vue
@@ -0,0 +1,220 @@
+<template>
+  <div class="app">
+  <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
+      <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
+      }}</router-link>
+      <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
+      }}</router-link>
+      <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+      }}</router-link>
+      <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
+      }}</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('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>
+        <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>
+           <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning2')
+          }}</router-link>
+  </el-breadcrumb>
+
+  <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">
+            <span v-if="item.title" :name="item.title.name" class="action-button" >{{ item.title.name }}</span>
+          </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"  @keyup.enter.native="submitDataToBackend"></el-input>
+          </div>
+        </div>
+      
+      </el-card>
+    </el-col>
+  </el-row>
+  <!-- <el-button @click="submitDataToBackend">鎻愪氦鏁版嵁鍒板悗绔�</el-button> -->
+</div>
+</template>
+
+<script>
+import LanguageMixin from '../../lang/LanguageMixin'
+import data from '../../configuration/parameter1'
+import { throttle } from 'lodash';
+let socket;
+export default {
+name: "Parameter1",
+mixins: [LanguageMixin],
+data() {
+  return {
+    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
+    },
+    submitDataToBackend() {
+  const inputData = this.jsonData.map(dataGroup => {
+    return dataGroup.map(item => {
+      if (item.type === '0') {
+        return { value: parseInt(item.value) };
+      } else if (item.button) {
+        return { value: parseInt(item.button.value) };
+      }
+      return null;
+    });
+  });
+
+  // 灏唅nputData杞崲涓烘暣鏁版暟缁�
+  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;
+        }
+
+        // 寮�鍚竴涓獁ebsocket鏈嶅姟
+        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>
+
+<style scoped>
+.item-row {
+display: flex;
+align-items: center;
+margin-bottom: 5px; /* 璋冩暣姣忎釜椤圭洰涔嬮棿鐨勯棿璺� */
+}
+
+.action-button {
+margin-right: 30px;
+background: #66b1ff;
+color: #FFF;
+}
+.blue-button {
+  background-color: skyblue;
+}
+</style>
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter2.vue b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
new file mode 100644
index 0000000..c18a80a
--- /dev/null
+++ b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
@@ -0,0 +1,239 @@
+<template>
+    <div class="app">
+    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
+        <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
+        }}</router-link>
+        <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
+        }}</router-link>
+        <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+        }}</router-link>
+        <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
+        }}</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('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>
+          <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>
+            <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="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: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>
+        
+        </el-card>
+      </el-col>
+    </el-row>
+    <!-- <el-button @click="submitDataToBackend">鎻愪氦鏁版嵁鍒板悗绔�</el-button> -->
+  </div>
+  </template>
+  
+  <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
+    }
+  },
+  created () {
+    this.initWebSocket();
+    // console.log('jsonData:', this.jsonData); 
+
+  },
+  methods: {
+    updateButtonValue(dataGroup, itemIndex) {
+  // 灏嗗綋鍓嶆寜閽殑鍊艰涓�1
+
+    this.$set(dataGroup[itemIndex].button, 'value', 1);
+  
+
+  // 灏嗗叾浠栨寜閽殑鍊煎叏閮ㄨ涓�0
+
+},
+    submitDataToBackend(currentButtonName) {
+  if (currentButtonName === '娓呴櫎ID') {
+    const inputData = this.jsonData.map(dataGroup => {
+      return dataGroup.map(item => {
+        if (item.type === '3') {
+          return { value: item.button.value };
+        } 
+        return null;
+      });
+    });
+
+    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鐨剉alue:', 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;
+        }
+
+        // 寮�鍚竴涓獁ebsocket鏈嶅姟
+        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>
+  
+  <style scoped>
+  .item-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 5px; /* 璋冩暣姣忎釜椤圭洰涔嬮棿鐨勯棿璺� */
+  }
+  
+  .action-button {
+  margin-right: 30px;
+  background: #66b1ff;
+  color: #FFF;
+  }
+  .blue-button {
+  background-color: skyblue;
+}
+
+.green-button {
+  background-color: green;
+}
+
+.red-button{
+  background-color: red;
+}
+
+  </style>
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/Electrical/Positioning1.vue b/CanadaMes-ui/src/views/Electrical/Positioning1.vue
new file mode 100644
index 0000000..cc2211f
--- /dev/null
+++ b/CanadaMes-ui/src/views/Electrical/Positioning1.vue
@@ -0,0 +1,210 @@
+<template>
+    <div class="app">
+    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
+        <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
+        }}</router-link>
+        <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
+        }}</router-link>
+        <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+        }}</router-link>
+        <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
+        }}</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('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>
+          <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>
+            <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning2')
+          }}</router-link>
+    </el-breadcrumb>
+  
+    <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">
+              <span v-if="item.title" :name="item.title.name" class="action-button" >{{ item.title.name }}</span>
+            </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>
+              
+
+              
+              <el-button v-if="item.type === '0' && item.name !== '鏍煎瓙闂磋窛'  && item.name !== '鍑虹墖鎺ョ墖鍦板潃'   && item.name !== '瀛樼墖鎺ョ墖鍦板潃'"  class="input-box"  @click="submitDataToBackend();">鍙栧湴鍧�</el-button>
+            </div>
+          </div>
+        
+        </el-card>
+      </el-col>
+    </el-row>
+    <!-- <el-button @click="submitDataToBackend">鎻愪氦鏁版嵁鍒板悗绔�</el-button> -->
+  </div>
+  </template>
+  
+  <script>
+  let socket;
+  import LanguageMixin from '../../lang/LanguageMixin'
+  import data from '../../configuration/Positioning1'
+  
+  export default {
+  name: "Positioning1",
+  mixins: [LanguageMixin],
+  data() {
+    return {
+      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
+    },
+    submitDataToBackend() {
+  const inputData = this.jsonData.map(dataGroup => {
+    return dataGroup.map(item => {
+      if (item.type === '0') {
+        return { value: parseInt(item.value) };
+      } else if (item.button) {
+        return { value: parseInt(item.title.value) };
+      }
+      return null;
+    });
+  });
+
+  // 灏唅nputData杞崲涓烘暣鏁版暟缁�
+  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 = "Positioning1";
+
+      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;
+        }
+
+        // 寮�鍚竴涓獁ebsocket鏈嶅姟
+        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>
+  
+  <style scoped>
+  .item-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 5px; /* 璋冩暣姣忎釜椤圭洰涔嬮棿鐨勯棿璺� */
+  }
+  
+  .action-button {
+  margin-right: 30px;
+  background: #66b1ff;
+  color: #FFF;
+  }
+  .blue-button {
+  background-color: skyblue;
+}
+  </style>
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/Electrical/Positioning2.vue b/CanadaMes-ui/src/views/Electrical/Positioning2.vue
new file mode 100644
index 0000000..be4b425
--- /dev/null
+++ b/CanadaMes-ui/src/views/Electrical/Positioning2.vue
@@ -0,0 +1,201 @@
+<template>
+  <div class="app">
+  <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
+      <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
+      }}</router-link>
+      <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
+      }}</router-link>
+      <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+      }}</router-link>
+      <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
+      }}</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('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>
+        <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>
+          <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning2')
+        }}</router-link>
+  </el-breadcrumb>
+
+  <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">
+            <span v-if="item.title" :name="item.title.name" class="action-button" >{{ item.title.name }}</span>
+          </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>
+            <el-button v-if="item.type === '0'"  class="input-box"  @click="submitDataToBackend();">鍙栧湴鍧�</el-button>
+          </div>
+        </div>
+      
+      </el-card>
+    </el-col>
+  </el-row>
+  <!-- <el-button @click="submitDataToBackend">鎻愪氦鏁版嵁鍒板悗绔�</el-button> -->
+</div>
+</template>
+
+<script>
+let socket;
+import LanguageMixin from '../../lang/LanguageMixin'
+import data from '../../configuration/Positioning2'
+
+export default {
+name: "Positioning2",
+mixins: [LanguageMixin],
+data() {
+  return {
+    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
+  },
+  submitDataToBackend() {
+const inputData = this.jsonData.map(dataGroup => {
+  return dataGroup.map(item => {
+    if (item.type === '0') {
+      return { value: parseInt(item.value) };
+    } else if (item.button) {
+      return { value: parseInt(item.title.value) };
+    }
+    return null;
+  });
+});
+
+// 灏唅nputData杞崲涓烘暣鏁版暟缁�
+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;
+      }
+
+      // 寮�鍚竴涓獁ebsocket鏈嶅姟
+      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>
+
+<style scoped>
+.item-row {
+display: flex;
+align-items: center;
+margin-bottom: 5px; /* 璋冩暣姣忎釜椤圭洰涔嬮棿鐨勯棿璺� */
+}
+
+.action-button {
+margin-right: 30px;
+background: #66b1ff;
+color: #FFF;
+}
+.blue-button {
+background-color: skyblue;
+}
+</style>
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
new file mode 100644
index 0000000..10079ca
--- /dev/null
+++ b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
@@ -0,0 +1,282 @@
+<template>
+    <div class="app">
+    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
+        <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
+        }}</router-link>
+        <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
+        }}</router-link>
+        <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+        }}</router-link>
+        <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
+        }}</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('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>
+        <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>
+            <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning2')
+          }}</router-link>
+    </el-breadcrumb>
+
+    <el-row :gutter="26">
+  <el-col :span="12" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
+    <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: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" 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>
+
+<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
+    }
+  },
+  created () {
+    this.initWebSocket();
+    // console.log('jsonData:', this.jsonData); 
+
+  },
+  methods: {
+    updateButtonValue(dataGroup, itemIndex) {
+  // 灏嗗綋鍓嶆寜閽殑鍊艰涓�1
+
+    this.$set(dataGroup[itemIndex].button, 'value', 1);
+    
+  
+
+},
+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 };
+  });
+
+  const values = inputData.map(item => item.value);
+
+  data.push(values);
+}
+
+
+
+const jsonObject = { data };
+
+// 鎻愪氦鏁版嵁鍒板悗绔�
+const jsonString = JSON.stringify(jsonObject);
+console.log('鎵�鏈塗ype涓�0鐨剉alue:', 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('鎵�鏈塗ype涓�0鐨剉alue:', 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;
+        }
+
+        // 寮�鍚竴涓獁ebsocket鏈嶅姟
+        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; /* 璋冩暣姣忎釜椤圭洰涔嬮棿鐨勯棿璺� */
+}
+
+.action-button {
+  margin-right: 10px;
+  background: #66b1ff;
+  color: #FFF;
+}
+.blue-button {
+  background-color: skyblue;
+}
+.error-button {
+  background-color: red;
+}
+
+
+</style>
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/Electrical/Servomanual.vue b/CanadaMes-ui/src/views/Electrical/Servomanual.vue
new file mode 100644
index 0000000..a5726ab
--- /dev/null
+++ b/CanadaMes-ui/src/views/Electrical/Servomanual.vue
@@ -0,0 +1,71 @@
+<template>
+    <div class="app">
+  <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
+        <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
+        }}</router-link>
+        <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
+        }}</router-link>
+        <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+        }}</router-link>
+        <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
+        }}</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('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>
+        <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>
+            <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'
+import data from '../../configuration/ServoManualone'
+
+export default {
+  name: "Servomanual",
+  mixins: [LanguageMixin],
+  data () {
+    return {
+      jsonData: data  // 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
+    }
+  },
+  created() {
+    // 閫氳繃璺敱璺宠浆鍒�/Electrical/Servomanualone椤甸潰
+    this.$router.push('/Electrical/Servomanualone');
+  }
+}
+</script>
+
+<style scoped>
+.item-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px; /* 璋冩暣姣忎釜椤圭洰涔嬮棿鐨勯棿璺� */
+}
+
+
+.action-button {
+  margin-right: 60px; /* 璋冩暣鎸夐挳涔嬮棿鐨勯棿璺� */
+}
+.blue-button {
+  background-color: skyblue;
+}
+</style>
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/Electrical/Sign.vue b/CanadaMes-ui/src/views/Electrical/Sign.vue
index 11e52a9..a3151cf 100644
--- a/CanadaMes-ui/src/views/Electrical/Sign.vue
+++ b/CanadaMes-ui/src/views/Electrical/Sign.vue
@@ -3,19 +3,23 @@
     <!--闈㈠寘灞戝鑸尯鍩�-->
     <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
 
-      <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm') }}</router-link>
-      <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link>
-      <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link>
-      <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link>
-    <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link>
+      <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
+      }}</router-link>
+      <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
+      }}</router-link>
+      <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+      }}</router-link>
+      <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
+      }}</router-link>
+      <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
+      }}</router-link>
 
- 
+
     </el-breadcrumb>
     <div>{{ $t('Sign') }}</div>
     <div style="padding-right: 30px;display: flex;flex-wrap: wrap;" class="neir">
       <div class="kuai_sb" v-for="item in record.xyData" :key="item.name">
-        <el-col class="deng" :class="getStatusClass(item.value)">
-        </el-col>
+        <el-col class="deng" :class="getStatusClass(item.value)"></el-col>
         <el-input v-model="item.name" style="width: 280px;" class="in_mc"></el-input>
 
       </div>
@@ -27,112 +31,19 @@
 
 <script >
 import LanguageMixin from '../../lang/LanguageMixin'
+import data from '../../configuration/Sign'
 let socket;
 export default {
   name: "Sign",
   mixins: [LanguageMixin],
   data () {
     return {
+      jsonData: data,
       activeButton: '',
       record: {
-        //瀹氫箟鏁扮粍锛屽苟娣诲姞榛樿鍊�
-        params: [1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0,
-          1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1,],
-        xyData: [
-          { name: 'D01.SR dec', value: 1 },
-          { name: "D01.SR in pos", value: 1 },
-          { name: "D02.SR dec", value: 1 },
-          { name: "D02.SR in pos", value: 1 },
-          { name: "D03.SR into", value: 1 },
-          { name: "D03.SR dec", value: 1 },
-          { name: 'D03.SR in pos', value: 1 },
-          { name: "D04.SR dec", value: 1 },
-          { name: "D04.SR in pos", value: 1 },
-          { name: "D05.SR dec", value: 1 },
-          { name: "D05.SR in pos", value: 1 },
-          { name: "D06.SR dec", value: 1 },
-          { name: 'D06.SR in pos', value: 1 },
-          { name: "B01.SR out dec", value: 1 },
-          { name: "B01.SR out in pos", value: 1 },
-          { name: "B01.SR in dec", value: 1 },
-          { name: "B01.SR in in pos", value: 1 },
-          { name: "B01.SR turn on", value: 1 },
-          { name: 'B01.SR turn off', value: 1 },
-          { name: "B01.SR up", value: 1 },
-          { name: "B01.SR down", value: 1 },
-          { name: "B02.SR out dec", value: 1 },
-          { name: "B02.SR out in pos", value: 1 },
-          { name: "B02.SR in dec", value: 1 },
-          { name: 'B02.SR in in pos', value: 1 },
-          { name: "B02.SR turn on", value: 1 },
-          { name: "B02.SR turn off", value: 1 },
-          { name: "B02.SR up", value: 1 },
-          { name: "B02.SR down", value: 1 },
-          { name: "B01.SR out safety", value: 1 },
-          { name: "B01.SR in safety", value: 1 },
-          { name: "B02.SR out safety", value: 1 },
-          { name: "SB.start(+)", value: 1 },
-          { name: "SB.stop(1)", value: 1 },
-          { name: "SB.reset", value: 1 },
-          { name: "SB.auto/manul", value: 1 },
-          { name: "SB.pause", value: 1 },
-          { name: "SB.emg", value: 1 },
-          { name: "D01.SB.start", value: 1 },
-          { name: "D06.SB.start", value: 1 },
-          { name: "B02.SR in safety", value: 1 },
-          { name: "SAFETYDOOR.requset", value: 1 },
-          { name: "SAFETYDOOR.confirm", value: 1 },
-          { name: "SAFETYDOOR.reset", value: 1 },
-          { name: "LED.red", value: 1 },
-          { name: "LED.green", value: 1 },
-          { name: "LED.yellow", value: 1 },
-          { name: "D01.LED.green", value: 1 },
-          { name: "D06.LED.green", value: 1 },
-          { name: "B01.YV.turn", value: 1 },
-          { name: "B01.YV.up down", value: 1 },
-          { name: "B01.YV.gassing", value: 1 },
-          { name: "B02.YV.turn", value: 1 },
-          { name: "B02.YV.up down", value: 1 },
-          { name: "B02.YV.gassing", value: 1 },
-          { name: "SAFETYDOOR.led", value: 1 },
-          { name: "SAFETYDOOR.open", value: 1 },
-
-        ],
-        canshu: [
-          'D01.SR dec',
-          'D01.SR in pos',
-          'D02.SR dec',
-          'D02.SR in pos',
-          'D03.SR into',
-          'D03.SR dec',
-          'D03.SR in pos',
-          'D04.SR dec',
-          'D04.SR in pos',
-          'D05.SR dec',
-          'D05.SR in pos',
-          'D06.SR dec',
-          'D06.SR in pos',
-          'B01.SR out dec',
-          'B01.SR out in pos',
-          'B01.SR in dec',
-          'B01.SR in in pos',
-          'B01.SR turn on',
-          'B01.SR turn off',
-          'B01.SR up',
-          'B01.SR down',
-          'B02.SR out dec',
-          'B02.SR out in pos',
-          'B02.SR in dec',
-          'B02.SR in in pos',
-          'B02.SR turn on',
-          'B02.SR turn off',
-          'B02.SR up',
-          'B02.SR down',
-          'LED.red',
-          'LED.green',
-          'LED.yellow',
-        ],
-
+        //瀹氫箟鏁扮粍
+        params: [],
+        xyData: [],
       },
 
 
@@ -148,8 +59,16 @@
   },
   created () {
     this.init();
+    //this.showdata();
   },
   methods: {
+    showdata () {
+      console.log(1111);
+      console.log(this.jsonData.sign[0].name);
+      // console.log(this.record.xyData);
+
+    },
+
     onButtonClick () {
       this.isButtonClicked = true; // 灏嗘寜閽鑹茶缃负钃濊壊
       setTimeout(() => {
@@ -158,6 +77,7 @@
     },
     //鏍规嵁璇诲彇PLC鐨勫�硷紝鏍规嵁鍚嶇О鏀瑰彉棰滆壊
     getStatusClass (zhuangtai) {
+      // console.log(this.record.xyData);
       if (zhuangtai === 0) {
         return "op";
       }
@@ -191,18 +111,29 @@
           //console.log("鏀跺埌鏁版嵁====" + msg.data);
           let obj = JSON.parse(msg.data);
           this.record.params[0] = obj.sig[0];
-          for (let a = 0; a < this.record.params[0].length; a++) {
-            if (!this.record.xyData[a]) {
-              this.record.xyData[a] = { name: this.record.canshu[a], value: this.record.params[0][a] };
 
-            } else {
-              this.record.xyData[a].value = this.record.params[0][a];
+          this.record.xyData = this.jsonData.sign;
 
-            }
-
+          for (let a = 0; a < this.record.xyData.length; a++) {
+            this.record.xyData[a].value = this.record.params[0][a];
 
           }
+
+          this.record.xyData = this.jsonData.sign.filter(item => {
+            return item.state != 0;
+          }
+
+          );
+
+
+          const language = this.$i18n.locale;
+          if (language === 'en-US') {
+            this.replaceChineseWithEnglish();
+          } else {
+            this.localizedRoles = [...this.record.xyData];
+          }
           this.$forceUpdate();
+          this.replaceChineseWithEnglish();
 
         }.bind(this);
         //鍏抽棴浜嬩欢
@@ -215,6 +146,13 @@
         }
       }
     },
+    //璇█杞崲
+    replaceChineseWithEnglish () {
+      const translation = this.$t('Signlang');
+
+      this.record.xyData = this.record.xyData.map(item => { return { name: translation[item.name] || item.name, value: item.value }; });
+      //console.log(translation);
+    }
   }
 
 }
@@ -301,4 +239,8 @@
 .blue-button {
   background-color: skyblue;
 }
+
+.dark-theme {
+  display: none;
+}
 </style>
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/Electrical/State.vue b/CanadaMes-ui/src/views/Electrical/State.vue
index bb0a133..e3a4a2d 100644
--- a/CanadaMes-ui/src/views/Electrical/State.vue
+++ b/CanadaMes-ui/src/views/Electrical/State.vue
@@ -16,16 +16,12 @@
 
     </el-breadcrumb>
     <div>{{ $t('State') }}</div>
-
-
     <el-form label-width="100px" style="display: flex;flex-wrap: wrap;" :model="messagepack.data">
 
       <div class="kuai_div" v-for="item in this.record.xyData" :key="item.name">
         <el-input style="width: 60%;" class="in_mc" v-model="item.name" readonly></el-input>
         <el-input v-model="item.value" readonly="readonly" style="width: 90px;"></el-input>
       </div>
-
-
 
     </el-form>
 
@@ -37,12 +33,14 @@
 
 <script >
 import LanguageMixin from '../../lang/LanguageMixin'
+import data from '../../configuration/State'
 let socket;
 export default {
   name: "State",
   mixins: [LanguageMixin],
   data () {
     return {
+      jsonData: data,
       activeButton: '',
       record: {
         params: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1,],
@@ -111,11 +109,9 @@
           this.record.params[0] = obj.sta[0];
           //灏嗚鍙栧埌鐨凱LC鐨勬暟鎹紝涓庡畾涔夌殑xyData锛岀粍鍚堟垚鏂扮殑鏁扮粍
           for (let a = 0; a < this.record.params[0].length; a++) {
-            if (!this.record.xyData[a]) {
-              this.record.xyData[a] = { name: this.record.canshu[a], value: this.record.params[0][a] };
-            } else {
-              this.record.xyData[a].value = this.record.params[0][a];
-            }
+
+            this.record.xyData[a].name = this.jsonData.state[a].name;
+            this.record.xyData[a].value = this.record.params[0][a];
 
           }
           const language = this.$i18n.locale;
@@ -124,8 +120,8 @@
           } else {
             this.localizedRoles = [...this.record.xyData];
           }
-          //console.log(this.localizedRoles);
           this.$forceUpdate();
+          this.replaceChineseWithEnglish();
 
         }.bind(this);
         //鍏抽棴浜嬩欢
@@ -141,8 +137,9 @@
     //璇█杞崲
     replaceChineseWithEnglish () {
       const translation = this.$t('dvstate');
-      this.record.xyData = this.record.xyData.map(item => { return { name: item.name, value: translation[item.value] || item.value }; });
-      console.log(translation);
+      const translation1 = this.$t('Statelang');
+      this.record.xyData = this.record.xyData.map(item => { return { name: translation1[item.name] || item.name, value: translation[item.value] || item.value }; });
+      //console.log(translation);
     },
 
 
diff --git a/CanadaMes-ui/src/views/device/talkvue.vue b/CanadaMes-ui/src/views/device/talkvue.vue
new file mode 100644
index 0000000..d8cd75d
--- /dev/null
+++ b/CanadaMes-ui/src/views/device/talkvue.vue
@@ -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>
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 8b8aa91..166dc7d 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/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;"
diff --git a/springboot-vue3/pom.xml b/springboot-vue3/pom.xml
index fc7fdbc..32b4261 100644
--- a/springboot-vue3/pom.xml
+++ b/springboot-vue3/pom.xml
@@ -28,6 +28,18 @@
     </properties>
 
     <dependencies>
+     <dependencies>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.7</version>
+        </dependency>
+        <dependency>
+          <groupId>commons-io</groupId>
+          <artifactId>commons-io</artifactId>
+          <version>2.10.0</version>
+          </dependency>
+        </dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
index d1109ac..31e5f05 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
@@ -1,65 +1,135 @@
 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 PlcParameter extends Thread {
-    @Override
-    public void run() {
-        while (this != null) {
-            try {
-                Thread.sleep(500);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
+  String name = "";
+  Integer count = 0;
 
-            List<Short> arraylist = S7control.getinstance().ReadWord("DB100.0", 12);
-            List<Short> state = S7control.getinstance().ReadWord("DB103.0", 10);
-            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("state",   state);
-            WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter");
-            if (sendwServer != null) {
-                sendwServer.sendMessage(jsonObject.toString());
-            }
+  public static String readFileToString(String filePath) throws IOException {
+    File file = new File(filePath);
+    return FileUtils.readFileToString(file, "UTF-8");
+  }
 
-            WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Parameter");
-            if (webSocketServer != null) {
-                List<String> messages = webSocketServer.getMessages();
+  public void readValue() {
+    String str = "";
+    BufferedReader bufferedReader = null;
+    FileInputStream fileInputStream;
+    try {
+      // 浠庢枃浠朵腑璇诲彇瀛楄妭鏁版嵁瀛樺叆 fileInputStream
+      fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/Parameter.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;
+      }
 
-                String addressList = "DB100.0";
+      // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
+      JSONObject jsonObject = new JSONObject(str);
 
-                if (!messages.isEmpty()) {
-                    // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
-                    String lastMessage = messages.get(messages.size() - 1);
-                    System.out.println("messages锛�" + messages);
-                    String[] parts = lastMessage.split(",");
-                    List<Short> messageValues = new ArrayList<>();
-                    for (String part : parts) {
-                        try {
-                            // 浣跨敤姝ｅ垯琛ㄨ揪寮忔竻闄ら潪鏁板瓧瀛楃
-                            String cleanedPart = part.replaceAll("[^0-9-]", "");
-                            short value = Short.parseShort(cleanedPart.trim());
-                            messageValues.add(value);
-                        } catch (NumberFormatException e) {
-                            // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+      // 鑾峰彇json涓殑鍊�
+      JSONArray address = jsonObject.getJSONArray("address");
+      for (int i = 0; i < address.size(); i++) {
+        JSONObject ress = (JSONObject) address.get(i);
 
-                            e.printStackTrace();
-                        }
-                    }
+        this.name = ress.getStr("name");
+        this.count = ress.getInt("count");
 
-                    // 灏嗘秷鎭�煎啓鍏� PLC
-                    S7control.getinstance().WriteWord(addressList, messageValues);
-                    System.out.println("messageValues锛�" + messageValues);
-                    System.out.println("addressList锛�" + addressList);
-                    // 娓呯┖娑堟伅鍒楄〃
-                    webSocketServer.clearMessages();
-                }
-            }
-        }
+      }
+
+    } 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);
+      Short[] values1 = { 1, 1, 1, 1, 1, 1, 2, 33, 2, 3, 4, 5 };
+      List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+
+      Short[] values2 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+      List<Short> state = new ArrayList<>(Arrays.asList(values2));
+
+      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("state", state);
+      WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter");
+      if (sendwServer != null) {
+        sendwServer.sendMessage(jsonObject.toString());
+      }
+
+      WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Parameter");
+      if (webSocketServer != null) {
+        List<String> messages = webSocketServer.getMessages();
+
+        String addressList = "DB100.0";
+
+        if (!messages.isEmpty()) {
+          // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
+          String lastMessage = messages.get(messages.size() - 1);
+          System.out.println("messages锛�" + messages);
+          String[] parts = lastMessage.split(",");
+          List<Short> messageValues = new ArrayList<>();
+          for (String part : parts) {
+            try {
+              // 浣跨敤姝ｅ垯琛ㄨ揪寮忔竻闄ら潪鏁板瓧瀛楃
+              String cleanedPart = part.replaceAll("[^0-9-]", "");
+              short value = Short.parseShort(cleanedPart.trim());
+              messageValues.add(value);
+            } catch (NumberFormatException e) {
+              // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+
+              e.printStackTrace();
+            }
+          }
+
+          // 灏嗘秷鎭�煎啓鍏� PLC
+//          S7control.getinstance().WriteWord(addressList, messageValues);
+          System.out.println("messageValues锛�" + messageValues);
+          System.out.println("addressList锛�" + addressList);
+          // 娓呯┖娑堟伅鍒楄〃
+          webSocketServer.clearMessages();
+        }
+      }
+    }
+  }
 }
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1.java
new file mode 100644
index 0000000..607e51e
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1.java
@@ -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;
+      }
+
+      // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
+      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();
+        }
+      
+
+    }
+
+    }
+  }
+}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
new file mode 100644
index 0000000..466e88b
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
@@ -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;
+      }
+
+      // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
+      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();
+        }
+      }
+    }
+  }
+}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
new file mode 100644
index 0000000..a53ded8
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
@@ -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;
+            }
+
+            // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
+            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);
+                                }
+                            }
+                        }
+                    }
+
+
+                    // 鍐欏叆绗瑈i涓湴鍧�
+                    if (!mergedList.isEmpty()) {
+//            S7control.getinstance().WriteWord(addressList3, mergedList);
+                        System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList3);
+                    }
+
+                    // 娓呯┖娑堟伅鍒楄〃
+                    webSocketServer.clearMessages();
+                }
+
+
+            }
+        }
+    }
+}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning2.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning2.java
new file mode 100644
index 0000000..31c5ad8
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning2.java
@@ -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;
+            }
+
+            // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
+            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);
+                                }
+                            }
+                        }
+                    }
+
+
+                    // 鍐欏叆绗瑈i涓湴鍧�
+                    if (!mergedList.isEmpty()) {
+//            S7control.getinstance().WriteWord(addressList3, mergedList);
+                        System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList3);
+                    }
+
+                    // 娓呯┖娑堟伅鍒楄〃
+                    webSocketServer.clearMessages();
+                }
+
+
+            }
+        }
+    }
+}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
index 17b9d6d..f601cbb 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
@@ -1,12 +1,61 @@
 package com.example.springboot.component;
 
+import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 public class Plcaction extends Thread {
+  String name = "";
+  Integer count = 0;
+
+  public void readValue() {
+    String str = "";
+    BufferedReader bufferedReader = null;
+    FileInputStream fileInputStream;
+    try {
+      // 浠庢枃浠朵腑璇诲彇瀛楄妭鏁版嵁瀛樺叆 fileInputStream
+      fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/Action.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;
+      }
+
+      // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
+      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) {
@@ -16,23 +65,27 @@
         e.printStackTrace();
       }
 
-//      List<Boolean> paramlist = S7control.getinstance().ReadBits("DB100.DBW", 12);
-////
-//      JSONObject jsonObject = new JSONObject();
-//      jsonObject.append("params", new short[]{1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0});
+      // 璋冪敤鏂规硶锛岃繘琛岃祴鍊�
+      this.readValue();
+      String PlcAddress = this.name;
+      Integer Plccount = this.count;
+      // System.out.println(PlcAddress);
 
- List<Boolean> paramlist = S7control.getinstance().ReadBits("DB2.0.0", 26);
-//      Boolean[] values = {true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,false, true};
-//      List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
-      if (paramlist == null) {
+      // List<Boolean> paramlist = S7control.getinstance().ReadBits("DB2.0.0", 26);
+      Boolean[] values = { false, true, true, true, true, true, true, true, true,
+          true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+          true, false, true };
+      List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
 
-      } else {
+      if (paramlist != null) {
+
         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;
         }
+
         JSONObject jsonObject = new JSONObject();
         jsonObject.append("params", params);
         WebSocketServer sendwServer = WebSocketServer.sessionMap.get("action");
@@ -41,42 +94,41 @@
         }
       }
 
-
       WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("action");
       if (webSocketServer != null) {
 
-          List<String> messages = webSocketServer.getMessages();
+        List<String> messages = webSocketServer.getMessages();
 
-          String addressList = "DB2.0.0";
+        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();
-              }
+        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);
-            }
+          // 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
+          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);
+          // 灏嗗竷灏斿垪琛ㄥ啓鍏� PLC
+          S7control.getinstance().WriteBit(addressList, messageBooleans);
+          System.out.println("messageValues锛�" + messageBooleans);
+          System.out.println("addressList锛�" + addressList);
           // 娓呯┖娑堟伅鍒楄〃
           webSocketServer.clearMessages();
         }
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
index f91920e..0e503c4 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
@@ -1,12 +1,61 @@
 package com.example.springboot.component;
 
+import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Arrays;
 
 public class Plcsign extends Thread {
+  String name = "";
+  Integer count = 0;
+
+  public void readValue() {
+    String str = "";
+    BufferedReader bufferedReader = null;
+    FileInputStream fileInputStream;
+    try {
+      // 浠庢枃浠朵腑璇诲彇瀛楄妭鏁版嵁瀛樺叆 fileInputStream
+      fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/Sign.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;
+      }
+
+      // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
+      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) {
@@ -16,30 +65,32 @@
         e.printStackTrace();
       }
 
-      List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 44);
-      List<Boolean> plclist2 = S7control.getinstance().ReadBits("DB102.5.5", 13);
+      this.readValue();
+      String PlcAddress = this.name;
+      Integer Plccount = this.count;
+      // System.out.println(PlcAddress);
 
-      // Boolean[] values = { true, false, true, false, true, false, true, false,
-      // true, false, true, false, true, false,
-      // true, false, true, false, true, false, true, false, true, false, true, false,
-      // true, false, true, false, true,
-      // false, true, false, true, false,
-      // true, false, true, false, true, false, true, false, };
-      // List<Boolean> plclist = new ArrayList<>(Arrays.asList(values));
+      // List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 44);
+      // List<Boolean> plclist2 = S7control.getinstance().ReadBits("DB102.5.5", 13);
 
-      // Boolean[] values2 = { true, false,
-      // true, false, true, false, true, false,
-      // true, false, true, false, true, };
-      // List<Boolean> plclist2 = new ArrayList<>(Arrays.asList(values2));
+      Boolean[] values = { true, true, true, true, true, false, true, false,
+          true, false, true, false, true, false,
+          true, false, true, false, true, false, true, false, true, false, true, false,
+          true, false, true, false, true,
+          false, true, false, true, false,
+          true, false, true, false, true, false, true, false, null,
+          true, false,
+          true, false, true, false, true, false,
+          true, false, true, false, true, };
+      List<Boolean> plclist = new ArrayList<>(Arrays.asList(values));
 
-      // 灏唒lclist2鐨勫厓绱犳坊鍔犲埌plclist涓�
-      plclist.addAll(plclist2);
-      // System.out.println(plclist);
       if (plclist != null) {
         // 灏嗚幏鍙栫殑甯冨皵绫诲瀷杞崲涓烘暣鏁扮被鍨�
         List<Integer> Intlist = new ArrayList<>();
         for (Boolean value : plclist) {
-          Intlist.add(value == true ? 0 : 1);
+          if (value != null) {
+            Intlist.add(value == true ? 0 : 1);
+          }
 
         }
         JSONObject jsonObject = new JSONObject();
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
index a539781..61c28f0 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
@@ -1,12 +1,61 @@
 package com.example.springboot.component;
 
+import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Arrays;
 
 public class Plcstate extends Thread {
+  String name = "";
+  Integer count = 0;
+
+  public void readValue() {
+    String str = "";
+    BufferedReader bufferedReader = null;
+    FileInputStream fileInputStream;
+    try {
+      // 浠庢枃浠朵腑璇诲彇瀛楄妭鏁版嵁瀛樺叆 fileInputStream
+      fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/State.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;
+      }
+
+      // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
+      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) {
@@ -16,10 +65,15 @@
         e.printStackTrace();
       }
 
-      List<Short> plclist = S7control.getinstance().ReadWord("DB103.0", 10);
-      // Short[] values = { 0, 1, 1, 0, 1, 0, 1, 0,
-      // 1, 0, };
-      // List<Short> plclist = new ArrayList<>(Arrays.asList(values));
+      this.readValue();
+      String PlcAddress = this.name;
+      Integer Plccount = this.count;
+      // System.out.println(PlcAddress);
+
+      // List<Short> plclist = S7control.getinstance().ReadWord("DB103.0", 10);
+      Short[] values = { 0, 1, 1, 0, 1, 0, 1, 0,
+          1, 0, };
+      List<Short> plclist = new ArrayList<>(Arrays.asList(values));
       if (plclist != null) {
 
         List<String> Intlist = new ArrayList<>();
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java b/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
index 593a8b9..5caea97 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
@@ -90,6 +90,8 @@
         s7PLC.writeMultiData(addressWrite);
     }
 
+
+
     /**
      * 鎸夋寚瀹氱殑鍦板潃 鍐欏叆涓�涓狟it
      * 
@@ -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缁撴灉闆�
      * 
diff --git a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
index 988df23..43f6502 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -13,6 +13,11 @@
 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)
@@ -27,16 +32,21 @@
 
     new PlcHold().start();
 
-    new Plcaction().start();
-
-    new Plchome().start();
-
-    new PlcParameter().start();
-
-    new Plcalarm().start();
-
-    new Plcsign().start();
-
-    new Plcstate().start();
+//  new Plcaction().start();
+//
+//    new Plchome().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();
   }
 }
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
index 0024641..04444d3 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
@@ -22,232 +22,245 @@
 @RestController
 @RequestMapping("/home")
 public class HomeController {
-    @Autowired
-    HomeMapper homeMapper;
+  @Autowired
+  HomeMapper homeMapper;
 
-    @Autowired
-    HomeService storageRackService;
+  @Autowired
+  HomeService storageRackService;
 
-    @Autowired
-    SpianService spianService;
+  @Autowired
+  SpianService spianService;
 
-    @Autowired
-    SpianMapper spianMapper;
-    
-    //鏌ヨ鐞嗙墖绗间娇鐢ㄦ儏鍐�
-    @GetMapping("/load")
-    public Result selectAll() {
-        List<StorageCage> storageCagelist = homeMapper.selectAll();
-        Map<String, Object> map = new HashMap<>();
-        map.put("list", storageCagelist);
-        return Result.success(map);
-    }
-    //鏌ヨ鐞嗙墖绗肩幓鐠冩儏鍐�
-    @GetMapping("/loads")
-    public Result selectRack() {
-        List<StorageCage> storageCagelist1 = homeMapper.selectRack1();
-        List<StorageCage> storageCagelist2 = homeMapper.selectRack2();
-        List<StorageCage> storageCagelist3 = homeMapper.selectRack3();
-        List<StorageCage> storageCagelist4 = homeMapper.selectRack4();
-        Map<String, Object> map = new HashMap<>();
-        map.put("list1", storageCagelist1);
-        map.put("list2", storageCagelist2);
-        map.put("list3", storageCagelist3);
-        map.put("list4", storageCagelist4);
-        return Result.success(map);
-    }
-    //鏌ヨ杩�/鍑虹墖浠诲姟
-    @GetMapping("/loadinout")
-    public Result selectinout(Integer types) {
-        List<StorageCage> storageCageinout = homeMapper.selectinout(types);
-        Map<String, Object> map = new HashMap<>();
-        map.put("list", storageCageinout);
-        return Result.success(map);
-    }
-    //鎸夎鍗曞嚭鐗�
-    @GetMapping("/InsertOrder")
-    public Result InsertOrder(String orderid) {
-        short result = homeMapper.SelectOrder(orderid);
-        Map<String, Object> map = new HashMap<>();
-        if (result > 0) {
-            homeMapper.updateOrder();
-            homeMapper.InsertOrder(orderid);
-            map.put("message", "200");
-        } else {
-            map.put("message", "500");
-        }
-        return Result.success(map);
-    }
-    //鏍规嵁鐜荤拑id鎵嬪姩涓婄墖
-    @GetMapping("/Addglassid")
-    public Result Addglassid(String glassid) {
-        Map<String, Object> map = new HashMap<>();
-        short taskno = homeMapper.SelectInTask();
-        if (taskno > 0) {
-            map.put("message2", "500");
-        } else {
-            // 璋冪敤浼嶄笂鐗囧嚱鏁�
-            short results = spianService.selectAll(glassid);
-            if (results == 200) {
-                map.put("message2", "200");
-            } else if (results == 300) {
-                map.put("message2", "300");
-            } else if (results == 400) {
-                map.put("message2", "400");
-            }
-        }
-        return Result.success(map);
-    }
-    //鎵嬪姩瀹屾垚杩�/鍑虹墖浠诲姟
-    @GetMapping("/UpdateTask")
-    public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
-        Map<String, Object> map = new HashMap<>();
-        homeMapper.UpdateTask(types);
-        StorageCage glass = homeMapper.SelectGlassInfo(glassid);
-        if (types == 0) {
-            // spianMapper.UpdataAddCage1(glass.getGlassWidth(),glass.getCage(),glass.getCell());
-            homeMapper.UpdateCageTask1(glassid);
-            S7control.getinstance().WriteWord("DB105.14", (short) 0);
-        } else {
+  @Autowired
+  SpianMapper spianMapper;
 
-            spianMapper.UpdataOutCage1(glass.getGlassWidth(), glass.getCage(), glass.getCell());
-            homeMapper.UpdateCageTask2(glassid);
-            S7control.getinstance().WriteWord("DB105.12", (short) 0);
-        }
-        map.put("message3", "200");
-        return Result.success(map);
-    }
-    //鏌ヨ鎶ヨ淇℃伅
-    @GetMapping("/SelectAlarmmgInfo")
-    public Result SelectAlarmmgInfo() {
-        List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
-        Map<String, Object> map = new HashMap<>();
-        map.put("alarmmg", alarmmg);
-        return Result.success(map);
-    }
-    //鏌ヨ鐞嗙墖绗艰鎯�
-    @GetMapping("/SelectCageInfo")
-    public Result SelectCageInfo(short cage) {
-        List<StorageCage> cageinfo = homeMapper.SelectCageInfo(cage);
-        Map<String, Object> map = new HashMap<>();
-        map.put("cageinfo", cageinfo);
-        return Result.success(map);
-    }
-    //鎵嬪姩鍒犻櫎鐞嗙墖绗肩幓鐠�
-    @GetMapping("/DeleteByGlassID")
-    public Result DeleteByGlassID(String glassid) {
-        StorageCage glassinfor = homeMapper.SelectGlassInfo(glassid);
-        spianMapper.UpdataOutCage1(glassinfor.getGlassWidth(), glassinfor.getCage(), glassinfor.getCell());
-        homeMapper.DeleteByGlassID(glassid);
-        Map<String, Object> map = new HashMap<>();
-        map.put("message3", "200");
-        return Result.success(map);
-    }
-    //鏍规嵁鐜荤拑id鎵嬪姩鍑虹墖
-    @GetMapping("/OutByGlassID")
-    public Result OutByGlassID(String glassid) {
-        Map<String, Object> map = new HashMap<>();
-        // 璋冪敤浼嶄笂鐗囧嚱鏁�
-        short result = homeMapper.SelectStorageByGlassId(glassid);
-        if (result > 0) {
-            Short results = spianService.selectout2(glassid);
-            if (results == 200) {
-                map.put("message2", "200");
-            } else if (results == 300) {
-                map.put("message2", "300");
-            } 
-        }else{
-            map.put("message2", "500");
-        }
+  // 鏌ヨ鐞嗙墖绗间娇鐢ㄦ儏鍐�
+  @GetMapping("/load")
+  public Result selectAll() {
+    List<StorageCage> storageCagelist = homeMapper.selectAll();
+    Map<String, Object> map = new HashMap<>();
+    map.put("list", storageCagelist);
+    return Result.success(map);
+  }
 
-        return Result.success(map);
+  // 鏌ヨ鐞嗙墖绗肩幓鐠冩儏鍐�
+  @GetMapping("/loads")
+  public Result selectRack() {
+    List<StorageCage> storageCagelist1 = homeMapper.selectRack1();
+    List<StorageCage> storageCagelist2 = homeMapper.selectRack2();
+    List<StorageCage> storageCagelist3 = homeMapper.selectRack3();
+    List<StorageCage> storageCagelist4 = homeMapper.selectRack4();
+    Map<String, Object> map = new HashMap<>();
+    map.put("list1", storageCagelist1);
+    map.put("list2", storageCagelist2);
+    map.put("list3", storageCagelist3);
+    map.put("list4", storageCagelist4);
+    return Result.success(map);
+  }
+
+  // 鏌ヨ杩�/鍑虹墖浠诲姟
+  @GetMapping("/loadinout")
+  public Result selectinout(Integer types) {
+    List<StorageCage> storageCageinout = homeMapper.selectinout(types);
+    Map<String, Object> map = new HashMap<>();
+    map.put("list", storageCageinout);
+    return Result.success(map);
+  }
+
+  // 鎸夎鍗曞嚭鐗�
+  @GetMapping("/InsertOrder")
+  public Result InsertOrder(String orderid) {
+    short result = homeMapper.SelectOrder(orderid);
+    Map<String, Object> map = new HashMap<>();
+    if (result > 0) {
+      homeMapper.updateOrder();
+      homeMapper.InsertOrder(orderid);
+      map.put("message", "200");
+    } else {
+      map.put("message", "500");
     }
-    //鍔犺浇灏忚溅浣嶇疆
-    @GetMapping("/Loadcarlist")
-    public Result Loadcarlist() {
-        List<CarPosition> carlist = homeMapper.Loadcarlist();
-        Map<String, Object> map = new HashMap<>();
-        map.put("carlist", carlist);
-        return Result.success(map);
+    return Result.success(map);
+  }
+
+  // 鏍规嵁鐜荤拑id鎵嬪姩涓婄墖
+  @GetMapping("/Addglassid")
+  public Result Addglassid(String glassid) {
+    Map<String, Object> map = new HashMap<>();
+    short taskno = homeMapper.SelectInTask();
+    if (taskno > 0) {
+      map.put("message2", "500");
+    } else {
+      // 璋冪敤浼嶄笂鐗囧嚱鏁�
+      short results = spianService.selectAll(glassid);
+      if (results == 200) {
+        map.put("message2", "200");
+      } else if (results == 300) {
+        map.put("message2", "300");
+      } else if (results == 400) {
+        map.put("message2", "400");
+      }
     }
-    //鏌ヨ纭瀵嗙爜
-    @GetMapping("/SelectPassword")
-    public Result SelectPassword() {
-        String pwdct = homeMapper.SelectPassword();
-        Map<String, Object> map = new HashMap<>();
-        map.put("password", pwdct);
-        return Result.success(map);
+    return Result.success(map);
+  }
+
+  // 鎵嬪姩瀹屾垚杩�/鍑虹墖浠诲姟
+  @GetMapping("/UpdateTask")
+  public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
+    Map<String, Object> map = new HashMap<>();
+    homeMapper.UpdateTask(types);
+    StorageCage glass = homeMapper.SelectGlassInfo(glassid);
+    if (types == 0) {
+      // spianMapper.UpdataAddCage1(glass.getGlassWidth(),glass.getCage(),glass.getCell());
+      homeMapper.UpdateCageTask1(glassid);
+      S7control.getinstance().WriteWord("DB105.14", (short) 0);
+    } else {
+
+      spianMapper.UpdataOutCage1(glass.getGlassWidth(), glass.getCage(), glass.getCell());
+      homeMapper.UpdateCageTask2(glassid);
+      S7control.getinstance().WriteWord("DB105.12", (short) 0);
     }
-    //鏍规嵁鐜荤拑id鏌ヨ鐜荤拑淇℃伅
-    @GetMapping("/SelectGlassByGlassID")
-    public Result SelectGlassByGlassID(String glassid) {
-        Glass Glass = homeMapper.SelectGlassByGlassID(glassid);
-        Map<String, Object> map = new HashMap<>();
-        map.put("form", Glass);
-        return Result.success(map);
-    }
-    //鍚敤/绂佺敤鐞嗙墖绗兼牸瀛�
-    @GetMapping("/Disabled")
-    public Result Disabled(short cage, short cell, short disabled) {
-        homeMapper.Disabled(cage, cell, disabled);
-        Map<String, Object> map = new HashMap<>();
-        map.put("message", "200");
-        return Result.success(map);
-    }
-    //鎵嬪姩寰�鐞嗙墖绗兼坊鍔犵幓鐠�
-    @PostMapping("/Inglassid")
-    public Result Inglassid(short cage, short cell, short tier, @RequestBody Glass glass) {
-        Map<String, Object> map = new HashMap<>();
-        short result = homeMapper.SelectStorageByGlassId(glass.getGlassId());
-        if (result > 0) {
-            map.put("message", "300");
-        } else {
-            homeMapper.Inglassid(glass, cage, cell, tier);
-            spianMapper.UpdataAddCage1(glass.getGlassWidth(), cage, cell);
-        }
-        return Result.success(map);
+    map.put("message3", "200");
+    return Result.success(map);
+  }
+
+  // 鏌ヨ鎶ヨ淇℃伅
+  @GetMapping("/SelectAlarmmgInfo")
+  public Result SelectAlarmmgInfo() {
+    List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
+    Map<String, Object> map = new HashMap<>();
+    map.put("alarmmg", alarmmg);
+    return Result.success(map);
+  }
+
+  // 鏌ヨ鐞嗙墖绗艰鎯�
+  @GetMapping("/SelectCageInfo")
+  public Result SelectCageInfo(short cage) {
+    List<StorageCage> cageinfo = homeMapper.SelectCageInfo(cage);
+    Map<String, Object> map = new HashMap<>();
+    map.put("cageinfo", cageinfo);
+    return Result.success(map);
+  }
+
+  // 鎵嬪姩鍒犻櫎鐞嗙墖绗肩幓鐠�
+  @GetMapping("/DeleteByGlassID")
+  public Result DeleteByGlassID(String glassid) {
+    StorageCage glassinfor = homeMapper.SelectGlassInfo(glassid);
+    spianMapper.UpdataOutCage1(glassinfor.getGlassWidth(), glassinfor.getCage(), glassinfor.getCell());
+    homeMapper.DeleteByGlassID(glassid);
+    Map<String, Object> map = new HashMap<>();
+    map.put("message3", "200");
+    return Result.success(map);
+  }
+
+  // 鏍规嵁鐜荤拑id鎵嬪姩鍑虹墖
+  @GetMapping("/OutByGlassID")
+  public Result OutByGlassID(String glassid) {
+    Map<String, Object> map = new HashMap<>();
+    // 璋冪敤浼嶄笂鐗囧嚱鏁�
+    short result = homeMapper.SelectStorageByGlassId(glassid);
+    if (result > 0) {
+      Short results = spianService.selectout2(glassid);
+      if (results == 200) {
+        map.put("message2", "200");
+      } else if (results == 300) {
+        map.put("message2", "300");
+      }
+    } else {
+      map.put("message2", "500");
     }
 
-    //鏌ヨ鐜荤拑淇℃伅
-    @PostMapping("/SelectGlass")
-    public Result SelectGlass(String orderid) {
-        Map<String, Object> map = new HashMap<>();
-        List<Glass> glass=homeMapper.SelectGlass(orderid);
-        map.put("glass", glass);
-        return Result.success(map);
-    }
+    return Result.success(map);
+  }
 
-    //鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
-    @PostMapping("/InsertQueueGlassId")
-    public Result InsertQueueGlassId(String glassid,Short id) {
-        Map<String, Object> map = new HashMap<>();
-        short result = homeMapper.SelectStorageByGlassId(glassid);
-        if (result > 0) {
-            map.put("message", "300");
-        }else{
-            homeMapper.InsertQueueGlassId(glassid,id);
-            map.put("message", "200");
-        }
-        return Result.success(map);
-    }
-    
-    //纭鎵爜浣嶇幓鐠冧俊鎭�
-    @PostMapping("/UpdateQueueState")
-    public Result UpdateQueueState() {
-        homeMapper.UpdateQueueState();
-        Map<String, Object> map = new HashMap<>();
-        map.put("message", "200");
-        return Result.success(map);
-    }
+  // 鍔犺浇灏忚溅浣嶇疆
+  @GetMapping("/Loadcarlist")
+  public Result Loadcarlist() {
+    List<CarPosition> carlist = homeMapper.Loadcarlist();
+    Map<String, Object> map = new HashMap<>();
+    map.put("carlist", carlist);
+    return Result.success(map);
+  }
 
-    //娓呴櫎涓婄墖闃熷垪鐜荤拑
-    @PostMapping("/DeleteQueueGlass")
-    public Result DeleteQueueGlass(String id) {
-        homeMapper.DeleteQueueGlass(id);
-        Map<String, Object> map = new HashMap<>();
-        map.put("message", "200");
-        return Result.success(map);
+  // 鏌ヨ纭瀵嗙爜
+  @GetMapping("/SelectPassword")
+  public Result SelectPassword() {
+    String pwdct = homeMapper.SelectPassword();
+    Map<String, Object> map = new HashMap<>();
+    map.put("password", pwdct);
+    return Result.success(map);
+  }
+
+  // 鏍规嵁鐜荤拑id鏌ヨ鐜荤拑淇℃伅
+  @GetMapping("/SelectGlassByGlassID")
+  public Result SelectGlassByGlassID(String glassid) {
+    Glass Glass = homeMapper.SelectGlassByGlassID(glassid);
+    Map<String, Object> map = new HashMap<>();
+    map.put("form", Glass);
+    return Result.success(map);
+  }
+
+  // 鍚敤/绂佺敤鐞嗙墖绗兼牸瀛�
+  @GetMapping("/Disabled")
+  public Result Disabled(short cage, short cell, short disabled) {
+    homeMapper.Disabled(cage, cell, disabled);
+    Map<String, Object> map = new HashMap<>();
+    map.put("message", "200");
+    return Result.success(map);
+  }
+
+  // 鎵嬪姩寰�鐞嗙墖绗兼坊鍔犵幓鐠�
+  @PostMapping("/Inglassid")
+  public Result Inglassid(short cage, short cell, short tier, @RequestBody Glass glass) {
+    Map<String, Object> map = new HashMap<>();
+    short result = homeMapper.SelectStorageByGlassId(glass.getGlassId());
+    if (result > 0) {
+      map.put("message", "300");
+    } else {
+      homeMapper.Inglassid(glass, cage, cell, tier);
+      spianMapper.UpdataAddCage1(glass.getwidth(), cage, cell);
     }
-    
-    
+    return Result.success(map);
+  }
+
+  // 鏌ヨ鐜荤拑淇℃伅
+  @PostMapping("/SelectGlass")
+  public Result SelectGlass(String orderid) {
+    Map<String, Object> map = new HashMap<>();
+    List<Glass> glass = homeMapper.SelectGlass(orderid);
+    map.put("glass", glass);
+    return Result.success(map);
+  }
+
+  // 鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
+  @PostMapping("/InsertQueueGlassId")
+  public Result InsertQueueGlassId(String glassid, Short id) {
+    Map<String, Object> map = new HashMap<>();
+    short result = homeMapper.SelectStorageByGlassId(glassid);
+    if (result > 0) {
+      map.put("message", "300");
+    } else {
+      homeMapper.InsertQueueGlassId(glassid, id);
+      map.put("message", "200");
+    }
+    return Result.success(map);
+  }
+
+  // 纭鎵爜浣嶇幓鐠冧俊鎭�
+  @PostMapping("/UpdateQueueState")
+  public Result UpdateQueueState() {
+    homeMapper.UpdateQueueState();
+    Map<String, Object> map = new HashMap<>();
+    map.put("message", "200");
+    return Result.success(map);
+  }
+
+  // 娓呴櫎涓婄墖闃熷垪鐜荤拑
+  @PostMapping("/DeleteQueueGlass")
+  public Result DeleteQueueGlass(String id) {
+    homeMapper.DeleteQueueGlass(id);
+    Map<String, Object> map = new HashMap<>();
+    map.put("message", "200");
+    return Result.success(map);
+  }
+
 }
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java b/springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java
index f66d895..1e448ec 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java
@@ -1,57 +1,58 @@
 package com.example.springboot.entity;
 
-public class Glass{
-    private Integer id;
-    private String orderId;
-    private double width;
-    private double height;
-    private String glassId;
-    
-    
+public class Glass {
+  private Integer id;
+  private String orderId;
+  private double width;
+  private double height;
+  private String glassId;
 
-    public Integer id() {
-        return id;
-    }
-    public void setId(Integer id) {
-        this.id = id;
-    }
-    public Integer getId() {
-        return id;
-    }
+  public Integer id() {
+    return id;
+  }
 
-    public String getOrderId() {
-        return orderId;
-    }
+  public void setId(Integer id) {
+    this.id = id;
+  }
 
-    public void setOrderId(String orderId) {
-        this.orderId = orderId;
-    }
-    
-    public double getwidth() {
-        return width;
-    }
+  public Integer getId() {
+    return id;
+  }
 
-    public void setHeight(double height) {
-        this.height = height;
-    }
+  public String getOrderId() {
+    return orderId;
+  }
 
-    public double getHeight() {
-        return height;
-    }
+  public void setOrderId(String orderId) {
+    this.orderId = orderId;
+  }
 
-    public void setWidth(double width) {
-        this.width = width;
-    }
+  public double getwidth() {
+    return width;
+  }
 
-     public String getGlassId() {
-        return glassId;
-    }
+  public void setHeight(double height) {
+    this.height = height;
+  }
 
-    public void setGlassId(String glassId) {
-        this.glassId = glassId;
-    }
+  public double getHeight() {
+    return height;
+  }
 
-  
-    
+  public void setWidth(double width) {
+    this.width = width;
+  }
+
+  public void getWidth(double width) {
+    this.width = width;
+  }
+
+  public String getGlassId() {
+    return glassId;
+  }
+
+  public void setGlassId(String glassId) {
+    this.glassId = glassId;
+  }
 
 }
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/alarmmg.java b/springboot-vue3/src/main/java/com/example/springboot/entity/alarmmg.java
index e1380ba..a9128ea 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/alarmmg.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/alarmmg.java
@@ -2,7 +2,6 @@
 
 import java.util.Date;
 
-
 public class alarmmg {
   private Integer id;
   private String content;
@@ -11,6 +10,7 @@
 
   private String timeons;
 
+  // 鑷id
   public void setid(Integer id) {
     this.id = id;
   }
@@ -19,6 +19,7 @@
     return id;
   }
 
+  // 鎶ヨ鍐呭
   public void setontent(String content) {
     this.content = content;
   }
@@ -27,6 +28,7 @@
     return content;
   }
 
+  // 鎶ヨ寮�濮嬫椂闂�
   public void settimeon(Date timeon) {
     this.timeon = timeon;
   }
@@ -35,6 +37,7 @@
     return timeon;
   }
 
+  // 鎶ヨ缁撴潫鏃堕棿
   public void setendTime(Date endTime) {
     this.endTime = endTime;
   }
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/out_slice.java b/springboot-vue3/src/main/java/com/example/springboot/entity/out_slice.java
new file mode 100644
index 0000000..c9bb6c4
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/out_slice.java
@@ -0,0 +1,90 @@
+package com.example.springboot.entity;
+
+public class out_slice {
+    private int id;
+    private String glassId;
+    private String barcode;
+    private double glasswidth;
+    private double glassheight;
+    private int state;
+    private String time;
+
+    private north_glass_buffer1 north_glass_buffer1s;
+
+    public void setnorth_glass_buffer1s(north_glass_buffer1 north_glass_buffer1s) {
+        this.north_glass_buffer1s = north_glass_buffer1s;
+    }
+    
+    public north_glass_buffer1 getnorth_glass_buffer1s() {
+        return north_glass_buffer1s;
+    }
+
+    public out_slice() {
+    }
+
+    public out_slice(int ID, String glassId, String barCode, double glasswidth, double glassheight, int state, String time) {
+        this.id = ID;
+        this.glassId = glassId;
+        this.barcode = barCode;
+        this.glasswidth = glasswidth;
+        this.glassheight = glassheight;
+        this.state = state;
+        this.time = time;
+    }
+
+    public int getID() {
+        return id;
+    }
+
+    public String getGlassId() {
+        return glassId;
+    }
+
+    public String getBarCode() {
+        return barcode;
+    }
+
+    public double getGlasswidth() {
+        return glasswidth;
+    }
+
+    public double getGlassheight() {
+        return glassheight;
+    }
+
+    public int getState() {
+        return state;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setID(int ID) {
+        this.id = ID;
+    }
+
+    public void setGlassId(String glassId) {
+        this.glassId = glassId;
+    }
+
+public void setBarCode(String barCode) {
+        barcode = barCode;
+    }
+
+    public void setGlasswidth(double glasswidth) {
+        this.glasswidth = glasswidth;
+    }
+
+    public void setGlassheight(double glassheight) {
+        this.glassheight = glassheight;
+    }
+
+    public void setState(int state) {
+        this.state = state;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
index 730ca3b..a9598f5 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
+++ b/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);
 
   //鍚敤/绂佺敤鐞嗙墖绗兼牸瀛�

--
Gitblit v1.8.0