From aaaee895fe0de47a5c4ddae90fff7c598985db3e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 29 十一月 2023 08:25:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/Electrical/Positioning2.vue | 418 +-
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java | 82
CanadaMes-ui/src/router/index.js | 22
springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java | 8
springboot-vue3/src/main/java/com/example/springboot/component/S7control.java | 66
CanadaMes-ui/src/views/Electrical/Parameter2.vue | 507 +-
CanadaMes-ui/src/views/Electrical/State.vue | 3
CanadaMes-ui/src/views/Electrical/Parameter.vue | 30
springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java | 238 +
CanadaMes-ui/src/configuration/AutomaticParameterSetting.json | 103
CanadaMes-ui/src/configuration/Positioning2.json | 204
CanadaMes-ui/src/views/Electrical/Positioning1.vue | 440 +-
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java | 15
CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue | 244 +
CanadaMes-ui/src/views/Electrical/alarm.vue | 3
springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java | 199 +
CanadaMes-ui/src/configuration/State.json | 300 +
CanadaMes-ui/src/configuration/parameter2.json | 630 +-
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1.java | 24
CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue | 124
CanadaMes-ui/src/configuration/ManualJog.json | 220 +
CanadaMes-ui/src/configuration/Positioning1.json | 401 +-
CanadaMes-ui/src/views/Electrical/Servomanual.vue | 159
CanadaMes-ui/src/views/Electrical/Sign.vue | 19
CanadaMes-ui/src/configuration/Parameter.json | 648 +++
CanadaMes-ui/src/img/xmjclzh.png | 0
CanadaMes-ui/src/views/Electrical/ManualonePosition.vue | 129
springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning2.java | 10
springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java | 141
CanadaMes-ui/src/configuration/ServoManualone.json | 682 ++--
CanadaMes-ui/src/configuration/Alarm.json | 514 +++
CanadaMes-ui/src/configuration/address.json | 114
CanadaMes-ui/src/lang/locales/zh-CN.json | 6
CanadaMes-ui/src/configuration/Manualoneposition2.json | 130
CanadaMes-ui/src/configuration/parameter1.json | 304
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 37
CanadaMes-ui/src/configuration/Action.json | 564 +++
CanadaMes-ui/src/views/Electrical/ManualJog.vue | 139
CanadaMes-ui/src/views/Electrical/Parameter1.vue | 458 +-
CanadaMes-ui/src/views/Electrical/ServoManualone.vue | 559 +-
CanadaMes-ui/src/configuration/Sign.json | 270 +
springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java | 172 +
CanadaMes-ui/src/configuration/Manualoneposition.json | 314 +
43 files changed, 6,986 insertions(+), 2,664 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/Action.json b/CanadaMes-ui/src/configuration/Action.json
index 91e8990..64ed585 100644
--- a/CanadaMes-ui/src/configuration/Action.json
+++ b/CanadaMes-ui/src/configuration/Action.json
@@ -1,88 +1,598 @@
{
"action": [
{
- "name": "D01 VFD conveyor"
+ "name": "D01 VFD conveyor",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "D02 VFD conveyor"
+ "name": "D02 VFD conveyor",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "D03 VFD conveyor"
+ "name": "D03 VFD conveyor",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "D04 VFD conveyor"
+ "name": "D04 VFD conveyor",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "D05 VFD conveyor"
+ "name": "D05 VFD conveyor",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "D06 VFD conveyor"
+ "name": "D06 VFD conveyor",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "A01 VFD conveyor"
+ "name": "A01 VFD conveyor",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "A02 VFD conveyor"
+ "name": "A02 VFD conveyor",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "B01 VFD conveyor"
+ "name": "B01 VFD conveyor",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "B02 VFD conveyor"
+ "name": "B02 VFD conveyor",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "A01 SERVE TURN JOG+"
+ "name": "A01 SERVE TURN JOG+",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "A02 SERVE TURN JOG-"
+ "name": "A02 SERVE TURN JOG-",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "A01 SERVE TRAVEL JOG+"
+ "name": "A01 SERVE TRAVEL JOG+",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "A02 SERVE TRAVEL JOG-"
+ "name": "A02 SERVE TRAVEL JOG-",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "B01 SERVE TRAVEL JOG+"
+ "name": "B01 SERVE TRAVEL JOG+",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "B02 SERVE TRAVEL JOG-"
+ "name": "B02 SERVE TRAVEL JOG-",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "A01 SERVE TURN POS"
+ "name": "A01 SERVE TURN POS",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "A02 SERVE TURN POS"
+ "name": "A02 SERVE TURN POS",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "A01 SERVE TRAVEL POS"
+ "name": "A01 SERVE TRAVEL POS",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "A02 SERVE TRAVEL POS"
+ "name": "A02 SERVE TRAVEL POS",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "B01 SERVE TRAVEL POS"
+ "name": "B01 SERVE TRAVEL POS",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "B02 SERVE TRAVEL POS"
+ "name": "B02 SERVE TRAVEL POS",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "B01 YV TURN"
+ "name": "B01 YV TURN",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "B01 YV UP DOWN"
+ "name": "B01 YV UP DOWN",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "B02 YV TURN"
+ "name": "B02 YV TURN",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "B02 YV UP DOWN"
+ "name": "B02 YV UP DOWN",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01 YV Gassing",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B02 YV Gassing",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 VFD conveyor reverse",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 VFD conveyor reverse",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 SERVE TURN reset",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 SERVE TURN home",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 SERVE TRAVEL reset",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 SERVE TURN reset",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 SERVE TURN home",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 SERVE TRAVEL reset",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01 SERVE TRAVEL reset",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01 SERVE TRAVEL home",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B02 SERVE TRAVEL reset",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B02 SERVE TRAVEL home",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "Manual storage startup",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "Manual output startup",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 oil pump",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 oil pump",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 get 1# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 get 22# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 get 43# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 get 64# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 get 85# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 get 106# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 get 127# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 get 148# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 get 169# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 get 190# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 get 1# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 get 22# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 get 43# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 get 64# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 get 85# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 get 106# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 get 127# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 get 148# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 get 169# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 get 190# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01 get 1# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01 get 22# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01 get 43# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01 get 64# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01 get 85# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B02 get 106# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B02 get 127# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B02 get 148# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B02 get 169# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B02 get 190# grid address",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "D01 ID Clean",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "D02 ID Clean",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "D03 ID Clean",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "D04 ID Clean",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "D05 ID Clean",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "D06 ID Clean",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 ID Clean",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 ID Clean",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01 ID Clean",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B02 ID Clean",
+ "value": 1,
+ "state": "1",
+ "type": "1",
+ "page": "1"
}
],
"address": [
{
"name": "DB2.0.0",
- "count": 26
+ "count": 84
}
]
}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/Alarm.json b/CanadaMes-ui/src/configuration/Alarm.json
new file mode 100644
index 0000000..b31d1ec
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/Alarm.json
@@ -0,0 +1,514 @@
+{
+ "content": [
+ {
+ "name": "D01 VFD error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "D02 VFD error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "D03 VFD error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "D04 VFD error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "D05 VFD error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "D06 VFD error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "B01 VFD error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "B02 VFD error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "A01 VFD error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "A02 VFD error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "A01 servo turn error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "A02 servo turn error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "A01 servo travel error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "A02 servo travel error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "B01 servo travel error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "B02 servo travel error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "D01 DEC error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "D01 pos error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "D02 DEC error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "D02 pos error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "D03 DEC error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "D03 pos error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "D04 DEC error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "D04 pos error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "D05 DEC error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "D05 pos error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "D06 DEC error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "D06 pos error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "A01 DEC error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "A01 pos error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "A02 DEC error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "A02 pos error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "B01 IN DEC error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "B01 IN pos error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "B01 OUT DEC error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "B01 OUT pos error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "B02 IN DEC error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "B02 IN pos error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "B02 OUT DEC error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "B02 OUT pos error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "D01 Scan glass exceeding limit",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "emergency stop alarm",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "More glass than known",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "less glass than known",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "D01 conveyor timeout alarm",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "D02 conveyor timeout alarm",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "D03 conveyor timeout alarm",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "D04 conveyor timeout alarm",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "D05 conveyor timeout alarm",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "D06 conveyor timeout alarm",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "A01 conveyor timeout alarm",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "A02 conveyor timeout alarm",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "B01 conveyor timeout alarm",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "B02 conveyor timeout alarm",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "A01 conveyor Left safety alarm",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "A01 conveyor right safety alarm",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "A02 conveyor Left safety alarm",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "A02 conveyor right safety alarm",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "1# buffer safety alarm",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "2# buffer safety alarm",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "3# buffer safety alarm",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "4# buffer safety alarm",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR right in pos error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "A02.SR left in pos error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "B01.SR left in pos error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "B01.SR left dec error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "B01.SR right dec error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "B01.SR right in pos error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "B02.SR left in pos error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "B02.SR left dec error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "B02.SR right dec error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ },
+ {
+ "name": "B02.SR right in pos error",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
+ }
+ ],
+ "address": [
+ {
+ "name": "DB104.DBx0.0",
+ "count": 72
+ }
+ ]
+}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/AutomaticParameterSetting.json b/CanadaMes-ui/src/configuration/AutomaticParameterSetting.json
new file mode 100644
index 0000000..c9b9d14
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/AutomaticParameterSetting.json
@@ -0,0 +1,103 @@
+[
+ [
+ {
+ "name": "A01琛岃蛋楂橀�熻搴�",
+ "read": 33,
+ "sending": "",
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3,
+ "value": ""
+ },
+ {
+ "name": "A01琛岃蛋浣庨�熻搴�",
+ "read": 11,
+ "sending": "",
+ "address": "DB100.0",
+ "type": "0",
+ "value": ""
+ },
+ {
+ "name": "A01杈撻�佹帴鐗囪搴�",
+ "read": 22,
+ "sending": "",
+ "address": "DB100.0",
+ "type": "0",
+ "value": ""
+ },
+ {
+ "name": "A01绗煎瓙瑙掑害",
+ "read": 22,
+ "sending": "",
+ "address": "DB100.0",
+ "type": "0",
+ "value": ""
+ }
+ ],
+ [
+ {
+ "name": "A02琛岃蛋楂橀�熻搴�",
+ "read": 33,
+ "sending": "",
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3,
+ "value": ""
+ },
+ {
+ "name": "A02琛岃蛋浣庨�熻搴�",
+ "read": 11,
+ "sending": "",
+ "address": "DB100.0",
+ "type": "0",
+ "value": ""
+ },
+ {
+ "name": "A02杈撻�佹帴鐗囪搴�",
+ "read": 22,
+ "sending": "",
+ "address": "DB100.0",
+ "type": "0",
+ "value": ""
+ },
+ {
+ "name": "A02绗煎瓙瑙掑害",
+ "read": 22,
+ "sending": "",
+ "address": "DB100.0",
+ "type": "0",
+ "value": ""
+ }
+ ],
+ [
+ {
+ "name": "澶ц溅鑷姩閫熷害",
+ "read": 100,
+ "sending": "",
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3,
+ "value": ""
+ }
+ ],
+ [
+ {
+ "name": "灏忚溅鑷姩閫熷害",
+ "read": 11,
+ "sending": "",
+ "address": "DB100.0",
+ "type": "0",
+ "value": ""
+ }
+ ],
+ [
+ {
+ "name": "鑷姩缈昏浆閫熷害",
+ "read": 33,
+ "sending": "",
+ "address": "DB100.0",
+ "type": "0",
+ "value": ""
+ }
+ ]
+]
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/ManualJog.json b/CanadaMes-ui/src/configuration/ManualJog.json
new file mode 100644
index 0000000..8ac07e3
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/ManualJog.json
@@ -0,0 +1,220 @@
+[
+ [
+ {
+ "button": {
+ "name": "D01杈撻��",
+ "value": 1,
+ "address": "DB10.0",
+ "state": 0
+ }
+ },
+ {
+ "button": {
+ "name": "D02杈撻��",
+ "value": 1,
+ "address": "DB10.0",
+ "state": 0
+ }
+ },
+ {
+ "button": {
+ "name": "D03杈撻��",
+ "value": 1,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "D04杈撻��",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "D05杈撻��",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "D06杈撻��",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ }
+ ],
+ [
+ {
+ "button": {
+ "name": "A01娉ㄦ补娉�",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 0
+ }
+ },
+ {
+ "button": {
+ "name": "A01缈昏浆",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 0
+ }
+ },
+ {
+ "button": {
+ "name": "A01琛岃蛋鐐瑰姩",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "A01杈撻�佹鍚�",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "A01杈撻�佸弽鍚�",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ }
+ ],
+ [
+ {
+ "button": {
+ "name": "A02娉ㄦ补娉�",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 0
+ }
+ },
+ {
+ "button": {
+ "name": "A02缈昏浆",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 0
+ }
+ },
+ {
+ "button": {
+ "name": "A02琛岃蛋鐐瑰姩",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "A02杈撻�佹鍚�",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "A02杈撻�佸弽鍚�",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ }
+ ],
+ [
+ {
+ "button": {
+ "name": "B01杈撻��",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 0
+ }
+ },
+ {
+ "button": {
+ "name": "B01琛岃蛋鐐瑰姩",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 0
+ }
+ },
+ {
+ "button": {
+ "name": "B02杈撻��",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "B02琛岃蛋鐐瑰姩",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ }
+ ],
+ [
+ {
+ "button": {
+ "name": "B01缈昏浆姘旂几",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 0
+ }
+ },
+ {
+ "button": {
+ "name": "B01鍗囬檷姘旂几",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 0
+ }
+ },
+ {
+ "button": {
+ "name": "B01鐢电闃�",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "B02缈昏浆姘旂几",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 0
+ }
+ },
+ {
+ "button": {
+ "name": "B02鍗囬檷姘旂几",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 0
+ }
+ },
+ {
+ "button": {
+ "name": "B02鐢电闃�",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ }
+ ]
+]
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/Manualoneposition.json b/CanadaMes-ui/src/configuration/Manualoneposition.json
new file mode 100644
index 0000000..c5a52bf
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/Manualoneposition.json
@@ -0,0 +1,314 @@
+[
+ [
+ {
+ "name": "A01鎵嬪姩鏍煎瓙",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3,
+ "state": 1
+ },
+ {
+ "name": "A01瀹氫綅閫熷害",
+ "read": 11,
+ "sending": 0,
+ "address": "DB100.0",
+ "type": "0",
+ "state": 1
+ },
+ {
+ "name": "A01褰撳墠鏍煎瓙",
+ "read": 22,
+ "sending": 0,
+ "address": "DB100.0",
+ "type": "0",
+ "state": 1
+ },
+ {
+ "button": {
+ "name": "A01鍚姩",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "鏁呴殰",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "澶嶄綅",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "鏈洖闆�",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 0
+ }
+ },
+ {
+ "button": {
+ "name": "鍥為浂",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 0
+ }
+ }
+ ],
+ [
+ {
+ "name": "A02鎵嬪姩鏍煎瓙",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3,
+ "state": 1
+ },
+ {
+ "name": "A02瀹氫綅閫熷害",
+ "read": 11,
+ "sending": 0,
+ "address": "DB100.0",
+ "type": "0",
+ "state": 1
+ },
+ {
+ "name": "A02褰撳墠鏍煎瓙",
+ "read": 22,
+ "sending": 0,
+ "address": "DB100.0",
+ "type": "0",
+ "state": 1
+ },
+ {
+ "button": {
+ "name": "A02鍚姩",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "鏁呴殰",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "澶嶄綅",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "鏈洖闆�",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 0
+ }
+ },
+ {
+ "button": {
+ "name": "鍥為浂",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 0
+ }
+ }
+ ],
+ [
+ {
+ "name": "B01鎵嬪姩鏍煎瓙",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3,
+ "state": 1
+ },
+ {
+ "name": "B01瀹氫綅閫熷害",
+ "read": 11,
+ "sending": 0,
+ "address": "DB100.0",
+ "type": "0",
+ "state": 1
+ },
+ {
+ "name": "B01褰撳墠鏍煎瓙",
+ "read": 22,
+ "sending": 0,
+ "address": "DB100.0",
+ "type": "0",
+ "state": 1
+ },
+ {
+ "button": {
+ "name": "B01鍚姩",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "鏁呴殰",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "澶嶄綅",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "鏈洖闆�",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "鍥為浂",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ }
+ ],
+ [
+ {
+ "name": "B02鎵嬪姩鏍煎瓙",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3,
+ "state": 1
+ },
+ {
+ "name": "B02瀹氫綅閫熷害",
+ "read": 11,
+ "sending": 0,
+ "address": "DB100.0",
+ "type": "0",
+ "state": 1
+ },
+ {
+ "name": "B02褰撳墠鏍煎瓙",
+ "read": 22,
+ "sending": 0,
+ "address": "DB100.0",
+ "type": "0",
+ "state": 1
+ },
+ {
+ "button": {
+ "name": "B02鍚姩",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "鏁呴殰",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 0
+ }
+ },
+ {
+ "button": {
+ "name": "澶嶄綅",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "鏈洖闆�",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "鍥為浂",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ }
+ ],
+ [
+ {
+ "name": "A01瀹炴椂浣嶇疆",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3,
+ "state": 1
+ }
+ ],
+ [
+ {
+ "name": "A02瀹炴椂浣嶇疆",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3,
+ "state": 1
+ }
+ ],
+ [
+ {
+ "name": "B01瀹炴椂浣嶇疆",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3,
+ "state": 1
+ }
+ ],
+ [
+ {
+ "name": "B02瀹炴椂浣嶇疆",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3,
+ "state": 1
+ }
+ ]
+]
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/Manualoneposition2.json b/CanadaMes-ui/src/configuration/Manualoneposition2.json
new file mode 100644
index 0000000..e078a5b
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/Manualoneposition2.json
@@ -0,0 +1,130 @@
+[
+ [
+ {
+ "name": "鎵嬪姩浣嶇疆",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3
+ },
+ {
+ "name": "瀹氫綅閫熷害",
+ "read": 11,
+ "sending": 0,
+ "address": "DB100.0",
+ "type": "0"
+ },
+ {
+ "name": "A01缈昏浆瀹炴椂浣嶇疆",
+ "read": 22,
+ "sending": 0,
+ "address": "DB100.0",
+ "type": "0"
+ },
+ {
+ "button": {
+ "name": "A01缈昏浆鍚姩",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 0
+ }
+ },
+ {
+ "button": {
+ "name": "鏁呴殰",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 0
+ }
+ },
+ {
+ "button": {
+ "name": "澶嶄綅",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 0
+ }
+ },
+ {
+ "button": {
+ "name": "鏈洖闆�",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "鍥為浂",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ }
+ ],
+ [
+ {
+ "name": "鎵嬪姩浣嶇疆",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3
+ },
+ {
+ "name": "瀹氫綅閫熷害",
+ "read": 11,
+ "sending": 0,
+ "address": "DB100.0",
+ "type": "0"
+ },
+ {
+ "name": "A02缈昏浆瀹炴椂浣嶇疆",
+ "read": 22,
+ "sending": 0,
+ "address": "DB100.0",
+ "type": "0"
+ },
+ {
+ "button": {
+ "name": "A02缈昏浆鍚姩",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 0
+ }
+ },
+ {
+ "button": {
+ "name": "鏁呴殰",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 0
+ }
+ },
+ {
+ "button": {
+ "name": "澶嶄綅",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 0
+ }
+ },
+ {
+ "button": {
+ "name": "鏈洖闆�",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ },
+ {
+ "button": {
+ "name": "鍥為浂",
+ "value": 0,
+ "address": "DB10.0",
+ "state": 1
+ }
+ }
+ ]
+]
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/Parameter.json b/CanadaMes-ui/src/configuration/Parameter.json
index 5104731..862c4fa 100644
--- a/CanadaMes-ui/src/configuration/Parameter.json
+++ b/CanadaMes-ui/src/configuration/Parameter.json
@@ -1,94 +1,666 @@
{
"para": [
{
- "name": "conveyor Velocity(Auto FAST)",
- "read": 33,
+ "name": "D01-D06 conveyor Velocity(Auto FAST)",
+ "value": 123,
"sending": 0,
- "unit": "m/min",
- "value":0,
- "value2":0
-
-
+ "unit": "m/min",
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "conveyor Velocity(Auto SLOW)",
- "read": 11,
+ "name": "D01-D06 conveyor Velocity(Auto SLOW)",
+ "value": 11,
"sending": 0,
- "unit": "m/min",
- "value":0,
- "value2":0
+ "unit": "m/min",
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "conveyor Velocity(Manual)",
- "read": 22,
+ "name": "D01-D06 conveyor Velocity(Manual)",
+ "value": 22,
"sending": 0,
- "unit": "m/min",
- "value":0,
- "value2":0
+ "unit": "m/min",
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "A01 A02 TURN JOG Velocity",
- "read": 0,
+ "value": 0,
"sending": 0,
- "unit": "mm/S"
+ "unit": "mm/S",
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "A01 A02 TRAVEL JOG Velocity",
- "read": 0,
+ "value": 0,
"sending": 0,
- "unit": "mm/S"
+ "unit": "mm/S",
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B01 B02 TRAVEL JOG Velocity",
- "read": 0,
+ "value": 0,
"sending": 0,
- "unit": "mm/S"
+ "unit": "mm/S",
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "A01 A02 TURN POS Velocity AUTO",
- "read": 0,
+ "value": 0,
"sending": 0,
- "unit": "mm/S"
+ "unit": "mm/S",
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "A01 A02 TURN POS Velocity manual",
- "read": 0,
+ "value": 0,
"sending": 0,
- "unit": "mm/S"
+ "unit": "mm/S",
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "A01 A02 TRAVEL POS Velocity AUTO",
- "read": 0,
+ "value": 0,
"sending": 0,
- "unit": "mm/S"
+ "unit": "mm/S",
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "A01 A02 TRAVEL POS Velocity manual",
- "read": 0,
+ "value": 0,
"sending": 0,
- "unit": "mm/S"
+ "unit": "mm/S",
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B01 B02 TRAVEL POS Velocity AUTO",
- "read": 0,
+ "value": 0,
"sending": 0,
- "unit": "mm/S"
+ "unit": "mm/S",
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B01 B02 TRAVEL POS Velocity manual",
- "read": 0,
+ "value": 0,
"sending": 0,
- "unit": "mm/S"
+ "unit": "mm/S",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "D01-D06 conveyor Velocity(Max)",
+ "value": 0,
+ "sending": 0,
+ "unit": "m/min",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 A02 conveyor Velocity(Max)",
+ "value": 0,
+ "sending": 0,
+ "unit": "m/min",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 A02 conveyor Velocity(Auto FAST)",
+ "value": 0,
+ "sending": 0,
+ "unit": "m/min",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 A02 conveyor Velocity(Auto SLOW)",
+ "value": 0,
+ "sending": 0,
+ "unit": "m/min",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01 B02 conveyor Velocity(Manual)",
+ "value": 0,
+ "sending": 0,
+ "unit": "m/min",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01 B02 conveyor Velocity(Max)",
+ "value": 0,
+ "sending": 0,
+ "unit": "m/min",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01 B02 conveyor Velocity(Auto FAST)",
+ "value": 0,
+ "sending": 0,
+ "unit": "m/min",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01 B02 conveyor Velocity(Auto SLOW)",
+ "value": 0,
+ "sending": 0,
+ "unit": "m/min",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01 B02 conveyor Velocity(Manual)",
+ "value": 0,
+ "sending": 0,
+ "unit": "m/min",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "grid spacing",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 Splice address setting",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 Splice address setting",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 1# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 22# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 43# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 64# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 85# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 106# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 127# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 148# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 169# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 190# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 1# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 22# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 43# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 64# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 85# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 106# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 127# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 148# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 169# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 190# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01 1# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01 22# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01 43# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01 64# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01 85# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B02 106# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B02 127# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B02 148# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B02 169# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B02 190# grid address",
+ "value": 0,
+ "sending": 0,
+ "unit": "mm",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 Target grid(Manual)",
+ "value": 0,
+ "sending": 0,
+ "unit": "",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 Target grid(Manual)",
+ "value": 0,
+ "sending": 0,
+ "unit": "",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01 Target grid(Manual)",
+ "value": 0,
+ "sending": 0,
+ "unit": "",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B02 Target grid(Manual)",
+ "value": 0,
+ "sending": 0,
+ "unit": "",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 turn Target Angle(Manual)",
+ "value": 0,
+ "sending": 0,
+ "unit": "°",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 turn Target Angle(Manual)",
+ "value": 0,
+ "sending": 0,
+ "unit": "°",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 turn Angle1",
+ "value": 0,
+ "sending": 0,
+ "unit": "°",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 turn Angle2",
+ "value": 0,
+ "sending": 0,
+ "unit": "°",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 turn Angle3",
+ "value": 0,
+ "sending": 0,
+ "unit": "°",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 turn Angle4",
+ "value": 0,
+ "sending": 0,
+ "unit": "°",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 turn Angle1",
+ "value": 0,
+ "sending": 0,
+ "unit": "°",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 turn Angle2",
+ "value": 0,
+ "sending": 0,
+ "unit": "°",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 turn Angle3",
+ "value": 0,
+ "sending": 0,
+ "unit": "°",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 turn Angle4",
+ "value": 0,
+ "sending": 0,
+ "unit": "°",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "Minimum glass length",
+ "value": 0,
+ "sending": 0,
+ "unit": "",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "Minimum glass height",
+ "value": 0,
+ "sending": 0,
+ "unit": "",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "Maximum glass length",
+ "value": 0,
+ "sending": 0,
+ "unit": "",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "Maximum glass height",
+ "value": 0,
+ "sending": 0,
+ "unit": "",
+ "state": "1",
+ "type": "1",
+ "page": "1"
}
],
"address": [
{
"name": "DB100.0",
- "count": 12
+ "count": 72
},
{
- "name": "DB100.0",
- "count": 12
+ "name": "DB101.0",
+ "count": 22
+ },
+ {
+ "name": "DB102.0",
+ "count": 33
}
]
}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/Positioning1.json b/CanadaMes-ui/src/configuration/Positioning1.json
index b5a6a4c..740a03a 100644
--- a/CanadaMes-ui/src/configuration/Positioning1.json
+++ b/CanadaMes-ui/src/configuration/Positioning1.json
@@ -1,201 +1,202 @@
-[
- [{
- "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"
- }
-
-
-
- ]
-
-
-
- ]
-
+[
+ [{
+ "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
index a01e428..3b03f7a 100644
--- a/CanadaMes-ui/src/configuration/Positioning2.json
+++ b/CanadaMes-ui/src/configuration/Positioning2.json
@@ -1,103 +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"
- }
-
-
-
-
- ]
-
-
- ]
+[
+
+ [
+ {
+ "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
index 3b7d999..2060629 100644
--- a/CanadaMes-ui/src/configuration/ServoManualone.json
+++ b/CanadaMes-ui/src/configuration/ServoManualone.json
@@ -1,342 +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"
- }
- }
-
- ]
-
-
- ]
+[
+
+ [
+ {
+ "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
index c634375..b5cb818 100644
--- a/CanadaMes-ui/src/configuration/Sign.json
+++ b/CanadaMes-ui/src/configuration/Sign.json
@@ -3,287 +3,443 @@
{
"name": "D01.SR dec",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D01.SR in pos",
"value": "0",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D02.SR dec",
"value": "0",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D02.SR in pos",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D03.SR into",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D03.SR dec",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D03.SR in pos",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D04.SR dec",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D04.SR in pos",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D05.SR dec",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D05.SR in pos",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D06.SR dec",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D06.SR in pos",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B01.SR out dec",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B01.SR out in pos",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B01.SR in dec",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B01.SR in in pos",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B01.SR turn on",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B01.SR turn off",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B01.SR up",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B01.SR down",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B02.SR out dec",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B02.SR out in pos",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B02.SR in dec",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B02.SR in in pos",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B02.SR turn on",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B02.SR turn off",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B02.SR up",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B02.SR down",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B01.SR out safety",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B01.SR in safety",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B02.SR out safety",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "SB.start(+)",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "SB.stop(1)",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "SB.reset",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "SB.auto/manul",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "SB.pause",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "SB.emg",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D01.SB.start",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D06.SB.start",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B02.SR in safety",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "SAFETYDOOR.requset",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "SAFETYDOOR.confirm",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "SAFETYDOOR.reset",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "LED.red",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "LED.green",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "LED.yellow",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D01.LED.green",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "D06.LED.green",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B01.YV.turn",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B01.YV.up down",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B01.YV.gassing",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B02.YV.turn",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B02.YV.up down",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "B02.YV.gassing",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "SAFETYDOOR.led",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
"name": "SAFETYDOOR.open",
"value": "1",
- "state": "1"
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01.SR origin",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01.SR left limit",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01.SR right limit",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B02.SR origin",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B02.SR left limit",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B02.SR right limit",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
}
],
"address": [
diff --git a/CanadaMes-ui/src/configuration/State.json b/CanadaMes-ui/src/configuration/State.json
index f823304..c16480c 100644
--- a/CanadaMes-ui/src/configuration/State.json
+++ b/CanadaMes-ui/src/configuration/State.json
@@ -1,40 +1,318 @@
{
"state": [
{
- "name": "D01.State"
+ "name": "D01.State",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
},
{
- "name": "D02.State"
+ "name": "D02.State",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
},
{
- "name": "B01.State"
+ "name": "B01.State",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
},
{
- "name": "B02.State"
+ "name": "B02.State",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
},
{
- "name": "A01.State"
+ "name": "A01.State",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
},
{
- "name": "A02.State"
+ "name": "A02.State",
+ "value": "1",
+ "state": "1",
+ "type": "3",
+ "page": "1"
},
{
- "name": "D03.State"
+ "name": "D03.State",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "D04.State"
+ "name": "D04.State",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "D05.State"
+ "name": "D05.State",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
},
{
- "name": "D06.State"
+ "name": "D06.State",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 tavel Actual Position",
+ "value": "1",
+ "state": "1",
+ "type": "2",
+ "page": "1"
+ },
+ {
+ "name": "A01 turn Actual angle",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 tavel Actual Position",
+ "value": "1",
+ "state": "1",
+ "type": "2",
+ "page": "1"
+ },
+ {
+ "name": "A02 turn Actual angle",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01 tavel Actual Position",
+ "value": "1",
+ "state": "1",
+ "type": "2",
+ "page": "1"
+ },
+ {
+ "name": "B02 tavel Actual Position",
+ "value": "1",
+ "state": "1",
+ "type": "2",
+ "page": "1"
+ },
+ {
+ "name": "A01 Current Grid",
+ "value": "1",
+ "state": "1",
+ "type": "2",
+ "page": "1"
+ },
+ {
+ "name": "A02 Current Grid",
+ "value": "1",
+ "state": "1",
+ "type": "2",
+ "page": "1"
+ },
+ {
+ "name": "B01 Current Grid",
+ "value": "1",
+ "state": "1",
+ "type": "2",
+ "page": "1"
+ },
+ {
+ "name": "B01 Target Grid",
+ "value": "1",
+ "state": "1",
+ "type": "2",
+ "page": "1"
+ },
+ {
+ "name": "B02 Current Grid",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B02 Target Grid",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "D01 ID",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "D02 ID",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "D03 ID",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "D04 ID",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "D05 ID",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "D06 ID",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 ID1",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 ID2",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 ID1",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 ID2",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01 ID1",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01 ID2",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B02 ID1",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B02 ID2",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 conveyor Fault codes",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 turn servo Fault codes",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01 travel servo Fault codes",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 conveyor Fault codes",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 turn servo Fault codes",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A02 travel servo Fault codes",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01 travel servo Fault codes",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B02 travel servo Fault codes",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
}
],
"address": [
{
"name": "DB103.0",
- "count": 10
+ "count": 44
}
]
}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/address.json b/CanadaMes-ui/src/configuration/address.json
index c26211e..01c0577 100644
--- a/CanadaMes-ui/src/configuration/address.json
+++ b/CanadaMes-ui/src/configuration/address.json
@@ -1,57 +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
+{
+
+ "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
+ }
+ ]
+ }
diff --git a/CanadaMes-ui/src/configuration/parameter1.json b/CanadaMes-ui/src/configuration/parameter1.json
index b81638e..be66496 100644
--- a/CanadaMes-ui/src/configuration/parameter1.json
+++ b/CanadaMes-ui/src/configuration/parameter1.json
@@ -1,153 +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
- }
-
-
- ]
-
-
- ]
+[
+
+ [
+ {
+ "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
index 2c4dce2..e7956d1 100644
--- a/CanadaMes-ui/src/configuration/parameter2.json
+++ b/CanadaMes-ui/src/configuration/parameter2.json
@@ -1,316 +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
-
- }
-
-
- ]
-
-
- ]
+[
+
+ [
+ {
+ "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": "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": "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
+
+ }
+
+
+ ]
+
+ ,[
+ {
+ "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
+
+ }
+
+
+
+ ]
+
+ ,[
+ {
+ "name": "鎵弿鏋壂鐮佺殑ID",
+ "read": 66,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+ }
+
+
+ ]
+ ,[
+ {
+ "name": "A01褰撳墠鏍煎瓙",
+ "read": 333,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+ },
+ {
+ "name": "A02鎵�鍦ㄦ牸瀛�",
+ "read": 333,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+ },
+ {
+ "name": "B01鎵�鍦ㄦ牸瀛�",
+ "read": 333,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+ },
+ {
+ "name": "B02鎵�鍦ㄦ牸瀛�",
+ "read": 333,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+ }
+
+
+ ]
+
+
+ ]
\ No newline at end of file
diff --git a/CanadaMes-ui/src/img/xmjclzh.png b/CanadaMes-ui/src/img/xmjclzh.png
new file mode 100644
index 0000000..5935f14
--- /dev/null
+++ b/CanadaMes-ui/src/img/xmjclzh.png
Binary files differ
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index 49d0c11..314cee4 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -302,9 +302,9 @@
"Enter the Frame No":"璇疯緭鍏ラ摑妗唅d",
"Manually Infeed Glass":"鎵嬪姩杩涚墖",
"langparameter": {
- "conveyor Velocity(Auto FAST)": "鐨甫杈撻�佽嚜鍔ㄥ揩閫�",
- "conveyor Velocity(Auto SLOW)": "鐨甫杈撻�佽嚜鍔ㄦ參閫�",
- "conveyor Velocity(Manual)": "鐨甫杈撻�佹墜鍔ㄩ�熷害",
+ "conveyor Velocity(Auto FAST)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄥ揩閫�",
+ "conveyor Velocity(Auto SLOW)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄦ參閫�",
+ "conveyor Velocity(Manual)": "D01-D06 鐨甫杈撻�佹墜鍔ㄩ�熷害",
"A01 A02 TURN JOG Velocity": "A01 A02 缈昏浆鐐瑰姩閫熷害",
"A01 A02 TRAVEL JOG Velocity": "A01 A02 琛岃蛋鐐瑰姩閫熷害",
"B01 B02 TRAVEL JOG Velocity": "B01 B02 琛岃蛋鐐瑰姩閫熷害",
diff --git a/CanadaMes-ui/src/router/index.js b/CanadaMes-ui/src/router/index.js
index c4c5d3a..5171c05 100644
--- a/CanadaMes-ui/src/router/index.js
+++ b/CanadaMes-ui/src/router/index.js
@@ -33,7 +33,7 @@
path: '/home',
component: () => import('../views/home')
},
-
+
{
@@ -49,7 +49,7 @@
component: () => import('../views/device/parameter'),
},
-
+
{
path: '/device/alarm',
component: () => import('../views/device/alarm')
@@ -58,7 +58,7 @@
path: '/device/iostate',
component: () => import('../views/device/iostate')
},
-
+
{
path: '/device/control',
component: () => import('../views/device/control')
@@ -107,6 +107,22 @@
path: '/Electrical/Positioning2',
component: () => import('../views/Electrical/Positioning2')
},
+ {
+ path: '/Electrical/ManualonePosition',
+ component: () => import('../views/Electrical/ManualonePosition')
+ },
+ {
+ path: '/Electrical/ManualonePosition2',
+ component: () => import('../views/Electrical/ManualonePosition2')
+ },
+ {
+ path: '/Electrical/AutomaticParameterSetting',
+ component: () => import('../views/Electrical/AutomaticParameterSetting')
+ },
+ {
+ path: '/Electrical/ManualJog',
+ component: () => import('../views/Electrical/ManualJog')
+ }
diff --git a/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue b/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
new file mode 100644
index 0000000..8ea34da
--- /dev/null
+++ b/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
@@ -0,0 +1,244 @@
+<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('ServoManual')
+ }}</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>
+ <router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualonePosition')
+ }}</router-link>
+ <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualonePosition2')
+ }}</router-link>
+ <router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
+ $t('AutomaticParameterSetting')
+ }}</router-link>
+ <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualJog')
+ }}</router-link>
+ </el-breadcrumb>
+
+ <el-row :gutter="20">
+ <el-col :span="12" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
+ <el-card class="json-block" style="width:485px;">
+ <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
+ <div class="item-row" v-if="item.type === '0'">
+ <span class="name" v-if="item.type === '0'" style="width:150px;">{{ item.name }}</span>
+ <el-input style="width:250px;" 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/AutomaticParameterSetting'
+import { throttle } from 'lodash';
+let socket;
+
+export default {
+ name: "AutomaticParameterSetting",
+ 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 { name: item.name, value: item.value, address: item.address };
+ } else if (item.button) {
+ return { name: item.button.name, value: item.button.value, address: item.button.address };
+ }
+ return null;
+ });
+ });
+
+ // 灏唅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 = "AutomaticParameterSetting";
+
+ 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;
+ const dache = obj.dache1;
+
+ // console.log('parms:', parms);
+ // console.log('fanzhuan:', fanzhuan);
+ // console.log('xiaoche:', xiaoche);
+ // console.log('dache:', dache);
+
+ let index = 0;
+ for (let i = 0; i < jsonData2.length - 1; 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[4][0]['value'] = fanzhuan[0][0];
+ }
+ if (Array.isArray(xiaoche) && Array.isArray(xiaoche[0]) && xiaoche[0][0] !== undefined) {
+ jsonData2[3][0]['value'] = xiaoche[0][0];
+ }
+ if (Array.isArray(dache) && Array.isArray(dache[0]) && dache[0][0] !== undefined) {
+ jsonData2[2][0]['value'] = dache[0][0];
+ }
+ }
+ }, 50);
+
+ document.addEventListener('mouseover', handleMouseMove);
+ };
+
+
+
+
+
+
+ // 鍏抽棴浜嬩欢
+ socket.onclose = function () {
+ console.log("websocket宸插叧闂�");
+ };
+
+ // 鍙戠敓閿欒浜嬩欢
+ socket.onerror = function () {
+ console.log("websocket鍙戠敓浜嗛敊璇�");
+ };
+
+
+ }
+
+ },
+ replaceChineseWithEnglish () {
+ const translation = this.$t('AutomaticParameterSetting');
+ 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: 2px;
+ /* 璋冩暣姣忎釜椤圭洰涔嬮棿鐨勯棿璺� */
+}
+
+.action-button {
+ margin-right: 10px;
+ background: #66b1ff;
+ color: #FFF;
+}
+
+.blue-button {
+ background-color: skyblue;
+}
+</style>
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/Electrical/ManualJog.vue b/CanadaMes-ui/src/views/Electrical/ManualJog.vue
new file mode 100644
index 0000000..1e5f134
--- /dev/null
+++ b/CanadaMes-ui/src/views/Electrical/ManualJog.vue
@@ -0,0 +1,139 @@
+<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('ServoManual')
+ }}</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>
+ <router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualonePosition')
+ }}</router-link>
+ <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualonePosition2')
+ }}</router-link>
+ <router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
+ $t('AutomaticParameterSetting')
+ }}</router-link>
+ <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualJog')
+ }}</router-link>
+ </el-breadcrumb>
+
+ <el-row :gutter="20">
+ <el-col :span="18" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
+ <el-card class="json-block" style="width:100%;">
+
+ <div class="button-row" style="display: flex; justify-content: space-between;">
+ <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
+ <el-button v-if="item.button" :name="item.button.name" :class="getStatusClass(item.button.value)"
+ class="action-button" @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend();">{{
+ 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/ManualJog'
+
+export default {
+ name: "ManualJog",
+ mixins: [LanguageMixin],
+ data () {
+ return {
+ jsonData: data // 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负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 { name: item.name, value: item.value, address: item.address };
+ } else if (item.button) {
+ return { name: item.button.name, value: item.button.value, address: item.button.address };
+ }
+ return null;
+ });
+ });
+
+ // 妯℃嫙鎻愪氦鏁版嵁鍒板悗绔殑鎿嶄綔锛屽疄闄呮儏鍐典笅闇�瑕佹牴鎹綘鐨勫悗绔疉PI杩涜淇敼
+ console.log('鎻愪氦浠ヤ笅鏁版嵁鍒板悗绔�:', inputData);
+
+ },
+ //鏍规嵁璇诲彇PLC鐨勫�硷紝鏍规嵁鍚嶇О鏀瑰彉棰滆壊1鎵撳紑锛�0鍏抽棴
+ getStatusClass (zhuangtai) {
+
+ if (zhuangtai === 1) {
+ return "op";
+ }
+ else {
+ return "dow";
+ }
+
+ }
+ }
+}
+</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;
+}
+
+.op {
+ background-color: #66b1ff;
+}
+
+.dow {
+ background-color: #A0A0A0;
+}
+</style>
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
new file mode 100644
index 0000000..5cc3459
--- /dev/null
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
@@ -0,0 +1,129 @@
+<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('ServoManual')
+ }}</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>
+ <router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualonePosition')
+ }}</router-link>
+ <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualonePosition2')
+ }}</router-link>
+ <router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
+ $t('AutomaticParameterSetting')
+ }}</router-link>
+ <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualJog')
+ }}</router-link>
+ </el-breadcrumb>
+
+ <el-row :gutter="10">
+ <el-col :span="12" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
+ <el-card class="json-block" style="width:485px;">
+ <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
+ <div class="item-row">
+ <span class="name" style="width:100px;">{{ item.name }}</span>
+ <el-input style="width:250px;" v-if="item.state != 0 && item.type === '0'" v-model="item.value"
+ class="input-box"></el-input>
+ </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 && item.button.state != 0" :name="item.button.name" class="action-button"
+ @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend();">{{ 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/Manualoneposition'
+export default {
+ name: "ManualonePosition",
+ mixins: [LanguageMixin],
+ data () {
+ return {
+ jsonData: data, // 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
+ RenderingCollections: []
+ }
+ },
+ 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 { name: item.name, value: item.value, address: item.address };
+ } else if (item.button) {
+ return { name: item.button.name, value: item.button.value, address: item.button.address };
+ }
+ return null;
+ });
+ });
+
+ // 妯℃嫙鎻愪氦鏁版嵁鍒板悗绔殑鎿嶄綔锛屽疄闄呮儏鍐典笅闇�瑕佹牴鎹綘鐨勫悗绔疉PI杩涜淇敼
+ console.log('鎻愪氦浠ヤ笅鏁版嵁鍒板悗绔�:', inputData);
+
+ }
+ }
+}
+</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;
+}
+
+.el-card ::v-deep .el-card__body {
+ padding: 13px;
+}
+</style>
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
new file mode 100644
index 0000000..aa58bc7
--- /dev/null
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
@@ -0,0 +1,124 @@
+<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('ServoManual')
+ }}</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>
+ <router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualonePosition')
+ }}</router-link>
+ <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualonePosition2')
+ }}</router-link>
+ <router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
+ $t('AutomaticParameterSetting')
+ }}</router-link>
+ <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualJog')
+ }}</router-link>
+ </el-breadcrumb>
+
+ <el-row :gutter="20">
+ <el-col :span="12" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
+ <el-card class="json-block" style="width:485px;">
+ <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
+ <div class="item-row">
+ <span class="name" style="width:100px;">{{ item.name }}</span>
+ <el-input style="width:250px;" v-if="item.type === '0'" v-model="item.value" class="input-box"></el-input>
+ </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" class="action-button"
+ @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend();">{{ 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/Manualoneposition2'
+
+export default {
+ name: "ManualonePosition2",
+ mixins: [LanguageMixin],
+ data () {
+ return {
+ jsonData: data // 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负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 { name: item.name, value: item.value, address: item.address };
+ } else if (item.button) {
+ return { name: item.button.name, value: item.button.value, address: item.button.address };
+ }
+ return null;
+ });
+ });
+
+ // 妯℃嫙鎻愪氦鏁版嵁鍒板悗绔殑鎿嶄綔锛屽疄闄呮儏鍐典笅闇�瑕佹牴鎹綘鐨勫悗绔疉PI杩涜淇敼
+ console.log('鎻愪氦浠ヤ笅鏁版嵁鍒板悗绔�:', inputData);
+
+ }
+ }
+}
+</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;
+}
+</style>
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter.vue b/CanadaMes-ui/src/views/Electrical/Parameter.vue
index 46d671f..5fcdbab 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter.vue
@@ -12,6 +12,8 @@
}}</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>Parameter</div>
@@ -57,18 +59,18 @@
record: {
params: [100, 200, 10, 10, 10, 10],
xyData: [
- { 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" }
+ { name: "conveyor Velocity(Auto FAST)", value: 0, value2: 0, unit: "m/min" },
+ { name: "conveyor Velocity(Auto SLOW)", value: 0, value2: 0, unit: "m/min" },
+ { name: "conveyor Velocity(Manual)", value: 0, value2: 0, unit: "m/min" },
+ { name: "A01 A02 TURN JOG Velocity", value: 0, value2: 0, unit: "mm/S" },
+ { name: "A01 A02 TRAVEL JOG Velocity", value: 0, value2: 0, unit: "mm/S" },
+ { name: "B01 B02 TRAVEL JOG Velocity", value: 0, value2: 0, unit: "mm/S" },
+ { name: "A01 A02 TURN POS Velocity AUTO", value: 0, value2: 0, unit: "mm/S" },
+ { name: "A01 A02 TURN POS Velocity manual", value: 0, value2: 0, unit: "mm/S" },
+ { name: "A01 A02 TRAVEL POS Velocity AUTO", value: 0, value2: 0, unit: "mm/S" },
+ { name: "A01 A02 TRAVEL POS Velocity manual", value: 0, value2: 0, unit: "mm/S" },
+ { name: "B01 B02 TRAVEL POS Velocity AUTO", value: 0, value2: 0, unit: "mm/S" },
+ { name: "B01 B02 TRAVEL POS Velocity manual", value: 0, value2: 0, unit: "mm/S" }
],
canshu: []
},
@@ -218,6 +220,10 @@
border: 1px solid black;
border: none;
}
+.special-class{
+
+
+}
.in_mc {
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter1.vue b/CanadaMes-ui/src/views/Electrical/Parameter1.vue
index 0ed696f..e3e5032 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter1.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter1.vue
@@ -1,220 +1,240 @@
-<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;
-}
+<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('ServoManual')
+ }}</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>
+ <router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualonePosition')
+ }}</router-link>
+ <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualonePosition2')
+ }}</router-link>
+ <router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
+ $t('AutomaticParameterSetting')
+ }}</router-link>
+ <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualJog')
+ }}</router-link>
+ </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
index c18a80a..9497c30 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter2.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
@@ -1,239 +1,270 @@
-<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;
-}
-
+<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="40">
+ <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;
+ // const xiaoche = obj.params[3];
+
+ 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 === '3') {
+ obj.button.value = parms[0][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 === '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];
+ }
+ }
+
+
+}
+
+jsonData2.forEach((item) => {
+ item.forEach((subItem) => {
+ if (subItem.read === 66) {
+ subItem.value = parms[3][0];
+ }
+ });
+});
+
+
+let lastParmsArray = parms[parms.length - 1];
+
+let lastParmsIndex = 0;
+
+for (let i = 0; i < jsonData2.length; i++) {
+ for (let j = 0; j < jsonData2[i].length; j++) {
+ if (jsonData2[i][j].read === 333) {
+ jsonData2[i][j].value = lastParmsArray[lastParmsIndex];
+ lastParmsIndex++;
+ if (lastParmsIndex === lastParmsArray.length) {
+ lastParmsIndex = 0;
+ }
+ }
+ }
+}
+
+
+
+
+
+// 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
index cc2211f..24132fc 100644
--- a/CanadaMes-ui/src/views/Electrical/Positioning1.vue
+++ b/CanadaMes-ui/src/views/Electrical/Positioning1.vue
@@ -1,210 +1,230 @@
-<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
+<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('ServoManual')
+ }}</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>
+ <router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualonePosition')
+ }}</router-link>
+ <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualonePosition2')
+ }}</router-link>
+ <router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
+ $t('AutomaticParameterSetting')
+ }}</router-link>
+ <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualJog')
+ }}</router-link>
+ </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>
diff --git a/CanadaMes-ui/src/views/Electrical/Positioning2.vue b/CanadaMes-ui/src/views/Electrical/Positioning2.vue
index be4b425..4ecd2ac 100644
--- a/CanadaMes-ui/src/views/Electrical/Positioning2.vue
+++ b/CanadaMes-ui/src/views/Electrical/Positioning2.vue
@@ -1,201 +1,219 @@
-<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;
-}
+<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('ServoManual')
+ }}</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>
+ <router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualonePosition')
+ }}</router-link>
+ <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualonePosition2')
+ }}</router-link>
+ <router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
+ $t('AutomaticParameterSetting')
+ }}</router-link>
+ <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualJog')
+ }}</router-link>
+ </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
index 10079ca..bfd5eb3 100644
--- a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
+++ b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
@@ -1,282 +1,279 @@
-<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;
-}
-
-
+<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
index a5726ab..804876a 100644
--- a/CanadaMes-ui/src/views/Electrical/Servomanual.vue
+++ b/CanadaMes-ui/src/views/Electrical/Servomanual.vue
@@ -1,71 +1,88 @@
-<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
+<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('ServoManual')
+ }}</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>
+ <router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualonePosition')
+ }}</router-link>
+ <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualonePosition2')
+ }}</router-link>
+ <router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
+ $t('AutomaticParameterSetting')
+ }}</router-link>
+ <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualJog')
+ }}</router-link>
+ </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>
diff --git a/CanadaMes-ui/src/views/Electrical/Sign.vue b/CanadaMes-ui/src/views/Electrical/Sign.vue
index a3151cf..1d23008 100644
--- a/CanadaMes-ui/src/views/Electrical/Sign.vue
+++ b/CanadaMes-ui/src/views/Electrical/Sign.vue
@@ -13,14 +13,15 @@
}}</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>{{ $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-input v-model="item.name" style="width: 280px;" class="in_mc"></el-input>
+ <el-input v-model="item.name" style="width: 100%;" class="in_mc"></el-input>
</div>
@@ -148,10 +149,14 @@
},
//璇█杞崲
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);
+ if (translation != null) {
+ this.record.xyData = this.record.xyData.map(item => { return { name: translation[item.name] || item.name, value: item.value }; });
+ //console.log(translation);
+ }
+
}
}
@@ -186,7 +191,7 @@
.kuai_sb {
text-align: center;
- width: 25%;
+ width: 15%;
margin-bottom: 15px;
}
@@ -211,8 +216,8 @@
background: #A0A0A0;
border: 0.1875em solid white;
border-radius: 50%;
- height: 5em;
- width: 5em;
+ height: 4em;
+ width: 4em;
box-shadow: 0.375em 0.375em 0 0 rgba(214, 214, 214, 0.125);
}
diff --git a/CanadaMes-ui/src/views/Electrical/State.vue b/CanadaMes-ui/src/views/Electrical/State.vue
index e3a4a2d..50d5bf9 100644
--- a/CanadaMes-ui/src/views/Electrical/State.vue
+++ b/CanadaMes-ui/src/views/Electrical/State.vue
@@ -13,7 +13,8 @@
}}</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>{{ $t('State') }}</div>
<el-form label-width="100px" style="display: flex;flex-wrap: wrap;" :model="messagepack.data">
diff --git a/CanadaMes-ui/src/views/Electrical/alarm.vue b/CanadaMes-ui/src/views/Electrical/alarm.vue
index 910046b..14f8fd3 100644
--- a/CanadaMes-ui/src/views/Electrical/alarm.vue
+++ b/CanadaMes-ui/src/views/Electrical/alarm.vue
@@ -8,7 +8,8 @@
<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>{{ $t('Alarm') }}</div>
<div class="block">
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
new file mode 100644
index 0000000..f5d262f
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
@@ -0,0 +1,199 @@
+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 PLCAutomaticParameterSetting 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.120", 8);
+ // List<Short> dache1 = S7control.getinstance().ReadWord("DB100.18", 1);
+ // List<Short> xiaoche1 = S7control.getinstance().ReadWord("DB100.22", 1);
+ // List<Short> fanzhuan1 = S7control.getinstance().ReadWord("DB100.14", 1);
+ Short[] values1 = { 1, 2, 3, 4, 5, 6, 7, 8 };
+ List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+ Short[] fanzhuan = { 4 };
+ List<Short> fanzhuan1 = new ArrayList<>(Arrays.asList(fanzhuan));
+ Short[] dache = { 5 };
+ List<Short> dache1 = new ArrayList<>(Arrays.asList(dache));
+ Short[] xiaoche = { 6 };
+ 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("dache1", dache1);
+ jsonObject.append("xiaoche", xiaoche1);
+ jsonObject.append("fanzhuan", fanzhuan1);
+
+ WebSocketServer sendwServer = WebSocketServer.sessionMap.get("AutomaticParameterSetting");
+ if (sendwServer != null) {
+ sendwServer.sendMessage(jsonObject.toString());
+ }
+
+ WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("AutomaticParameterSetting");
+ if (webSocketServer != null) {
+ List<String> messages = webSocketServer.getMessages();
+ String addressList1 = "DB100.120";
+ String addressList2 = "DB100.18";
+ String addressList3 = "DB100.22";
+ String addressList4 = "DB100.14";
+
+ if (!messages.isEmpty()) {
+ // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
+ String lastMessage = messages.get(messages.size() - 1);
+ // System.out.println("lastMessage锛�" + lastMessage);
+ JSONArray messageArray = new JSONArray(lastMessage);
+
+ // 鏁村悎绗� 1 鍒� 2 涓暟缁勫苟鍘绘帀 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);
+ }
+ }
+ }
+ }
+ System.out.println(messageArray);
+ // 鍐欏叆绗竴涓湴鍧�
+ if (messageArray.getJSONArray(2).size() > 0) {
+ Object value = messageArray.getJSONArray(2).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 " + addressList2);
+ } 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(addressList2, Arrays.asList(sValue));
+ System.out
+ .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList3);
+ } 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 " + addressList4);
+ } 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 " + addressList1);
+ }
+
+ // 娓呯┖娑堟伅鍒楄〃
+ webSocketServer.clearMessages();
+ }
+
+ }
+
+ }
+ }
+}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
new file mode 100644
index 0000000..eb3adf2
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
@@ -0,0 +1,172 @@
+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 PlcManualonePosition 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");
+ }
+
+ // 璇诲彇json鏂囦欢涓湴鍧�锛屽苟杩斿洖璇ュ湴鍧�闆嗗悎
+ public List<String> 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);
+ // bufferedReader.close();
+ String line = null;
+ // 灏� bufferedReader 鍐呭涓�琛屼竴琛岃祴鍊肩粰str
+ while ((line = bufferedReader.readLine()) != null) {
+ str += line;
+ }
+
+ // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
+ JSONObject jsonObject = new JSONObject(str);
+
+ // 鑾峰彇json涓殑鍊�
+ JSONArray address = jsonObject.getJSONArray("Manualoneposition");
+
+ String[] result = new String[address.size()];
+
+ List<String> arraylistss = new ArrayList<>();
+
+ for (int i = 0; i < address.size(); i++) {
+ JSONObject ress = (JSONObject) address.get(i);
+
+ this.name = ress.getStr("name");
+ this.count = ress.getInt("count");
+ ;
+ result[i] = name + ',' + count.toString();
+ arraylistss.add(result[i]);
+
+ }
+ return arraylistss;
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return null;
+
+ }
+
+ @Override
+ public void run() {
+ while (this != null) {
+ try {
+ Thread.sleep(500);
+
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ // this.readValue();
+ List<String> myCollection;
+ myCollection = readValue();
+ // System.out.println(myCollection);
+ List<Short> arraylist = new ArrayList<>();
+ for (String element : myCollection) {
+ String[] parts = element.split(",");
+ String PlcAddress = parts[0];
+ String count = parts[1];
+ Integer Plccount = new Integer(count);
+ // arraylist = S7control.getinstance().ReadWord(PlcAddress, Plccount);
+ System.out.println(PlcAddress);
+ }
+
+ // List<Short> arraylist = S7control.getinstance().ReadWord("DB100.0", 12);
+ // List<Short> state = S7control.getinstance().ReadWord("DB103.0", 10);
+ // parameter
+ // Short[] values1 = { 1231, 1, 1, 1, 1, 1, 2, 33, 2, 3, 4, 5 };
+ // List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+
+ // state
+ Short[] values2 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+ List<Short> state = new ArrayList<>(Arrays.asList(values2));
+
+ // action
+ 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));
+
+ short[] sholist = new short[paramlist.size()];
+
+ for (int i = 0; i < paramlist.size(); i++) {
+ boolean value = paramlist.get(i);
+ sholist[i] = value ? (short) 1 : (short) 0;
+ }
+
+ 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);
+ jsonObject.append("action", sholist);
+ 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/PlcParameter.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
index 31e5f05..fc93c23 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
@@ -80,11 +80,23 @@
// 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 };
+ Short[] values1 = { 1231, 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));
+
+ 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));
+
+ short[] sholist = new short[paramlist.size()];
+
+ for (int i = 0; i < paramlist.size(); i++) {
+ boolean value = paramlist.get(i);
+ sholist[i] = value ? (short) 1 : (short) 0;
+ }
JSONObject jsonObject = new JSONObject();
// new short[]{1,1, 1, 1, 1, 1, 2, 33, 2,3, 4, 5}
@@ -92,6 +104,7 @@
jsonObject.append("params", arraylist);
jsonObject.append("state", state);
+ jsonObject.append("action", sholist);
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter");
if (sendwServer != null) {
sendwServer.sendMessage(jsonObject.toString());
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
index 607e51e..5e7007a 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1.java
@@ -71,15 +71,15 @@
// 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));
+ 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));
@@ -135,7 +135,7 @@
try {
String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
short sValue = Short.parseShort(cleanedValue.trim());
-// S7control.getinstance().WriteWord(addressList1, Arrays.asList(sValue));
+ S7control.getinstance().WriteWord(addressList1, Arrays.asList(sValue));
System.out.println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList1);
} catch (NumberFormatException e) {
// 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
@@ -151,7 +151,7 @@
try {
String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
short sValue = Short.parseShort(cleanedValue.trim());
-// S7control.getinstance().WriteWord(addressList2, Arrays.asList(sValue));
+ S7control.getinstance().WriteWord(addressList2, Arrays.asList(sValue));
System.out.println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList2);
} catch (NumberFormatException e) {
// 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
@@ -162,7 +162,7 @@
// 鍐欏叆绗笁涓湴鍧�
if (!mergedList.isEmpty()) {
-// S7control.getinstance().WriteWord(addressList3, mergedList);
+ S7control.getinstance().WriteWord(addressList3, mergedList);
System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList3);
}
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
index 466e88b..5c4348d 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
@@ -66,22 +66,64 @@
} 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));
+ List<String> addressList1 = new ArrayList<>();
+ addressList1.add("DB103.32~45");
+ addressList1.add("DB103.46~59");
+ addressList1.add("DB103.60~73");
+ addressList1.add("DB103.74~101");
+ addressList1.add("DB103.102~115");
+ addressList1.add("DB103.116~143");
+ addressList1.add("DB103.144~157");
+ addressList1.add("DB103.158~171");
+ addressList1.add("DB103.172~185");
+ addressList1.add("DB103.200~213");
+ addressList1.add("DB103.228~241");
+ List<Boolean> paramlist = S7control.getinstance().readBits(addressList1);
- Short[] values2 = { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 };
- List<Short> state = new ArrayList<>(Arrays.asList(values2));
+
+ List<String> addresses = new ArrayList<>();
+ addresses.add("DB103.0");
+ addresses.add("DB103.2");
+ addresses.add("DB103.12");
+ addresses.add("DB103.14");
+ addresses.add("DB103.16");
+ addresses.add("DB103.18");
+ addresses.add("DB103.8");
+ addresses.add("DB103.10");
+ addresses.add("DB103.4");
+ addresses.add("DB103.6");
+ List<Short> data = S7control.getinstance().readWords(addresses);
+
+
+
+ List<Boolean> data2 = S7control.getinstance().ReadBits("DB101.9.2", 10);
+ List<String> addressList3 = new ArrayList<>();
+ addressList3.add("DB106.64-DB106.77");
+ List<Boolean> data3 = S7control.getinstance().readBits(addressList3);
+
+ List<String> addresses4 = new ArrayList<>();
+ addresses.add("DB106.0");
+ addresses.add("DB106.12");
+ addresses.add("DB106.40");
+ addresses.add("DB106.50");
+
+ List<Short> data4 = S7control.getinstance().readWords(addresses4);
+
+
+// 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};
+// List<Short> data = new ArrayList<>(Arrays.asList(values1));
+// Short[] values2 = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
+// List<Short> data2 = new ArrayList<>(Arrays.asList(values2));
+// Short[] values3 = { 11};
+// List<Short> data3 = new ArrayList<>(Arrays.asList(values3));
+// Short[] values4 = { 2,2,3,4};
+// List<Short> data4 = new ArrayList<>(Arrays.asList(values4));
+
JSONObject jsonObject = new JSONObject();
short[] params = new short[paramlist.size()];
@@ -89,11 +131,13 @@
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);
+ jsonObject.append("params", data2);
+ jsonObject.append("params", data);
+ jsonObject.append("params", data3);
+ jsonObject.append("params", data4);
+
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter2");
if (sendwServer != null) {
@@ -105,7 +149,7 @@
List<String> messages = webSocketServer.getMessages();
- String addressList = "DB2.0.0";
+ String addressList = "DB101.9.2";
if (!messages.isEmpty()) {
// 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
@@ -132,7 +176,7 @@
}
// 灏嗗竷灏斿垪琛ㄥ啓鍏� PLC
-// S7control.getinstance().WriteBit(addressList, messageBooleans);
+ S7control.getinstance().WriteBit(addressList, messageBooleans);
System.out.println("messageValues锛�" + messageBooleans);
System.out.println("addressList锛�" + addressList);
// 娓呯┖娑堟伅鍒楄〃
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
index a53ded8..17e0010 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
@@ -79,16 +79,16 @@
// 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);
+ List<Short> arraylist = S7control.getinstance().ReadWord("DB100.42", 20);
+
// 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));
+// 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();
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
index 31c5ad8..608bb76 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning2.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning2.java
@@ -72,10 +72,10 @@
// 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));
+ List<Short> arraylist = S7control.getinstance().ReadWord("DB100.88", 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();
@@ -94,7 +94,7 @@
if (webSocketServer != null) {
List<String> messages = webSocketServer.getMessages();
- String addressList3 = "DB100.12";
+ String addressList3 = "DB100.88";
if (!messages.isEmpty()) {
// 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
new file mode 100644
index 0000000..70b6ea5
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
@@ -0,0 +1,238 @@
+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 PlcServoManualone 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("ServoManualone");
+ 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;
+
+
+ List<String> addresses = new ArrayList<>();
+ addresses.add("DB103.25");
+ addresses.add("DB100.144");
+ addresses.add("DB100.148-161");
+ addresses.add("DB100.184");
+ addresses.add("DB100.186");
+ addresses.add("DB100.180");
+ addresses.add("DB100.182");
+
+ List<Short> arraylist = S7control.getinstance().readWords(addresses);
+
+ List<String> addresses2 = new ArrayList<>();
+ addresses2.add("DB103.26");
+ addresses2.add("DB100.188");
+ addresses2.add("DB100.190");
+ addresses2.add("DB100.146");
+ addresses2.add("DB100.162-175");
+ List<Short> arraylist2 = S7control.getinstance().readWords(addresses2);
+
+ List<String> addresses3 = new ArrayList<>();
+ addresses3.add("DB103.42");
+ List<Short> arraylist3 = S7control.getinstance().readWords(addresses3);
+
+ List<String> addresses4 = new ArrayList<>();
+ addresses4.add("DB103.46");
+ List<Short> arraylist4 = S7control.getinstance().readWords(addresses4);
+
+ List<Short> arraylist5 = S7control.getinstance().ReadWord("DB103.27", 2);
+ List<Short> arraylist6 = S7control.getinstance().ReadWord("DB103.29", 2);
+ List<String> addresses7 = new ArrayList<>();
+ addresses7.add("DB104.24");
+ addresses7.add("DB104.26");
+ addresses7.add("DB104.20");
+ addresses7.add("DB104.22");
+ addresses7.add("DB104.28");
+ addresses7.add("DB104.30");
+ List<Short> arraylist7 = S7control.getinstance().readWords(addresses7);
+// List<String> addresses8 = new ArrayList<>();
+// addresses8.add("DB103.26");
+// addresses8.add("DB103.26");
+// addresses8.add("DB103.26");
+// addresses8.add("DB103.26");
+// List<Short> arraylist8 = S7control.getinstance().readWords(addresses8);
+
+// Short[] values1 = { 1, 2, 3, 4, 5, 6, 7};
+// List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+// Short[] values2 = { 1, 2, 3, 4, 5};
+// List<Short> arraylist2 = new ArrayList<>(Arrays.asList(values2));
+
+// Short[] values3 = {1};
+// List<Short> arraylist3 = new ArrayList<>(Arrays.asList(values3));
+// Short[] values4 = {2};
+// List<Short> arraylist4 = new ArrayList<>(Arrays.asList(values4));
+// Short[] values5 = {3,3};
+// List<Short> arraylist5 = new ArrayList<>(Arrays.asList(values5));
+// Short[] values6 = { 4,4};
+// List<Short> arraylist6 = new ArrayList<>(Arrays.asList(values6));
+// Short[] values7 = { 1,1,1,1,1,1};
+// List<Short> arraylist7 = new ArrayList<>(Arrays.asList(values7));
+// Short[] values8 = { 1,1,1,1,1,1};
+// List<Short> arraylist8 = new ArrayList<>(Arrays.asList(values8));
+
+
+ JSONObject jsonObject = new JSONObject();
+
+ jsonObject.append("zuhe1", arraylist);
+ jsonObject.append("zuhe2", arraylist2);
+ jsonObject.append("zuhe3", arraylist3);
+ jsonObject.append("zuhe4", arraylist4);
+ jsonObject.append("zuhe5", arraylist5);
+ jsonObject.append("zuhe6", arraylist6);
+ jsonObject.append("guzhang", arraylist7);
+// jsonObject.append("weihuiling", arraylist8);
+
+
+
+ WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ServoManualone");
+ if (sendwServer != null) {
+ sendwServer.sendMessage(jsonObject.toString());
+ }
+
+ WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ServoManualone");
+ if (webSocketServer != null) {
+ List<String> messages = webSocketServer.getMessages();
+ List<String> waddresses1 = new ArrayList<>();
+ waddresses1.add("DB103.25");
+ waddresses1.add("DB100.144");
+ waddresses1.add("DB100.148-161");
+ waddresses1.add("DB100.184");
+ waddresses1.add("DB100.186");
+ waddresses1.add("DB100.180");
+ waddresses1.add("DB100.182");
+
+ List<String> waddresses2 = new ArrayList<>();
+ waddresses2.add("DB103.26");
+ waddresses2.add("DB100.188");
+ waddresses2.add("DB100.190");
+ waddresses2.add("DB100.146");
+ waddresses2.add("DB100.162-175");
+
+
+
+ if (!messages.isEmpty()) {
+ // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
+ String lastMessage = messages.get(messages.size() - 1);
+// System.out.println("lastMessage锛�" + lastMessage);
+ JSONArray messageArray = new JSONArray(lastMessage);
+
+
+
+
+ // 鍐欏叆绗竴涓湴鍧�
+ if (messageArray.getJSONArray(0).size() > 0) {
+ JSONArray jsonArray = messageArray.getJSONArray(0);
+ List<Short> sValue = new ArrayList<>();
+ for (int i = 0; i < jsonArray.size(); i++) {
+ Object value = jsonArray.get(i);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ short val = Short.parseShort(cleanedValue.trim());
+ sValue.add(val);
+ System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ if (!sValue.isEmpty()) {
+ S7control.getinstance().WriteWord(waddresses1, sValue);
+ System.out.println("Values " + sValue + " written to PLC at address " + waddresses1);
+ }
+ }
+
+ if (messageArray.getJSONArray(1).size() > 0) {
+ JSONArray jsonArray = messageArray.getJSONArray(1);
+ List<Short> sValue2 = new ArrayList<>();
+ for (int i = 0; i < jsonArray.size(); i++) {
+ Object value = jsonArray.get(i);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ short val = Short.parseShort(cleanedValue.trim());
+ sValue2.add(val);
+ System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ if (!sValue2.isEmpty()) {
+ S7control.getinstance().WriteWord(waddresses2, sValue2);
+ System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses2);
+ }
+ }
+
+ // 娓呯┖娑堟伅鍒楄〃
+ webSocketServer.clearMessages();
+ }
+ }
+ }
+ }
+}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
index ca035a8..393174d 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
@@ -1,7 +1,14 @@
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;
@@ -11,6 +18,61 @@
public class Plcalarm extends Thread {
private AlarmMapper alarmMapper;
+ String content = "";
+ String name = "";
+ Integer count = 0;
+
+ public List<String> readValue() {
+ String str = "";
+ BufferedReader bufferedReader = null;
+ FileInputStream fileInputStream;
+ try {
+ // 浠庢枃浠朵腑璇诲彇瀛楄妭鏁版嵁瀛樺叆 fileInputStream
+ fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/Alarm.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);
+
+ List<String> arraylistss = new ArrayList<>();
+
+ // 鑾峰彇json涓姤璀︿俊鎭殑鍊�
+ JSONArray AlarmContent = jsonObject.getJSONArray("content");
+ for (int i = 0; i < AlarmContent.size(); i++) {
+ JSONObject ress = (JSONObject) AlarmContent.get(i);
+
+ this.content = ress.getStr("name");
+ arraylistss.add(content);
+ }
+ // 鑾峰彇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");
+
+ }
+
+ return arraylistss;
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
@Override
public void run() {
while (this != null) {
@@ -19,15 +81,21 @@
} catch (InterruptedException e) {
e.printStackTrace();
}
+
+ this.readValue();
+ String PlcAddress = this.name;
+ Integer Plccount = this.count;
+
// 鏍规嵁鍦板潃璇诲彇PCL鏁版嵁
- List<Boolean> plclist = S7control.getinstance().ReadBits("DB104.0.0", 40);
- // 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 };
- // List<Boolean> plclist = new ArrayList<>(Arrays.asList(values));
+ // List<Boolean> plclist = S7control.getinstance().ReadBits(PlcAddress,
+ // Plccount);
+ Boolean[] values = { false, 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));
if (plclist != null) {
JSONObject jsonObject = new JSONObject();
@@ -47,60 +115,23 @@
// 灏咺ntlist杞崲涓烘暟缁�
Integer[] shuzu1 = Intlist.toArray(new Integer[0]);
- // 瀹氫箟鐨勬姤璀﹀唴瀹规暟缁�
- String[] shuzu = {
- "D01 VFD error",
- "D02 VFD error",
- "D03 VFD error",
- "D04 VFD error",
- "D05 VFD error",
- "D06 VFD error",
- "B01 VFD error",
- "B02 VFD error",
- "A01 VFD error",
- "A02 VFD error",
- "A01 servo turn error",
- "A02 servo turn error",
- "A01 servo travel error",
- "A02 servo travel error",
- "B01 servo travel error",
- "B02 servo travel error",
- "D01 DEC error",
- "D01 pos error",
- "D02 DEC error",
- "D02 pos error",
- "D03 DEC error",
- "D03 pos error",
- "D04 DEC error",
- "D04 pos error",
- "D05 DEC error",
- "D05 pos error",
- "D06 DEC error",
- "D06 pos error",
- "A01 DEC error",
- "A01 pos error",
- "A02 DEC error",
- "A02 pos error",
- "B01 IN DEC error",
- "B01 IN pos error",
- "B01 OUT DEC error",
- "B01 OUT pos error",
- "B02 IN DEC error",
- "B02 IN pos error",
- "B02 OUT DEC error",
- "B02 OUT pos error",
- };
+ // 瀹氫箟鐨勬姤璀﹀唴瀹规暟缁�,鑾峰彇json杩斿洖鐨勯泦鍚�
+ List<String> myCollection;
+ myCollection = readValue();
+ String[] array1 = myCollection.toArray(new String[myCollection.size()]);
+ // System.out.println(myCollection);
+
alarmMapper = WebSocketServer.applicationContext.getBean(AlarmMapper.class);
- for (short i = 0; i < shuzu.length; i++) {
+ for (short i = 0; i < array1.length; i++) {
// 鏌ヨ瀵瑰簲鎶ヨ淇℃伅缁撴潫鏃堕棿涓簄ull鐨勬潯鏁�
- short result = alarmMapper.selectnullti(shuzu[i]);
+ short result = alarmMapper.selectnullti(array1[i]);
// 璇诲彇鍒癙LC鐨勫�间负1骞朵笖瀵瑰簲鎶ヨ淇℃伅缁撴潫鏃堕棿涓簄ull鐨勬潯鏁扮殑鏉℃暟涓�0
if (shuzu1[i] == 1 && result == 0) {
// 濉姞涓�鏉℃姤璀︿俊鎭�,鏈夊紑濮嬫椂闂�
- alarmMapper.Insertalarm(shuzu[i]);
+ alarmMapper.Insertalarm(array1[i]);
} else if (shuzu1[i] == 0 && result > 0) {
// 淇敼璇ユ潯鎶ヨ淇℃伅鐨勭粨鏉熸椂闂�
- alarmMapper.updatealarm(shuzu[i]);
+ alarmMapper.updatealarm(array1[i]);
}
}
}
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 5caea97..e207db3 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
@@ -79,16 +79,36 @@
* @param datas word鐨勫��
*/
public void WriteWord(List<String> address, List<Short> datas) {
- if (s7PLC==null)
+ if (s7PLC == null)
return;
- // s7PLC.write(address, data);
- MultiAddressWrite addressWrite = new MultiAddressWrite();
for (int i = 0; i < address.size(); i++) {
- addressWrite.addInt16(address.get(i), datas.get(i));
+ String addr = address.get(i);
+ short data = datas.get(i);
+
+ if (addr.contains("-")) {
+ // 澶勭悊鑼冨洿鍦板潃
+ String[] range = addr.split("-");
+ if (range.length == 2) {
+ String startAddr = range[0].trim();
+ String endAddr = range[1].trim();
+
+ int startIndex = Integer.parseInt(startAddr.substring(startAddr.indexOf('.') + 1));
+ int endIndex = Integer.parseInt(endAddr.substring(endAddr.indexOf('.') + 1));
+
+ for (int j = startIndex; j <= endIndex; j++) {
+ String currentAddress = startAddr.substring(0, startAddr.indexOf('.') + 1) + j;
+ s7PLC.writeInt16(currentAddress, data); // 灏嗘暟鎹啓鍏ュ綋鍓嶅湴鍧�
+ }
+ }
+ } else {
+ // 澶勭悊鍗曚釜鍦板潃
+ s7PLC.writeInt16(addr, data); // 灏嗘暟鎹啓鍏ュ崟涓湴鍧�
+ }
}
- s7PLC.writeMultiData(addressWrite);
}
+
+
@@ -255,6 +275,42 @@
return s7PLC.readBoolean(addresslist);
}
+ public List<Boolean> readBits(List<String> addressList) {
+ if (s7PLC == null)
+ return null;
+
+ List<Boolean> result = new ArrayList<>();
+
+ for (String address : addressList) {
+ if (address.contains("~")) {
+ String[] range = address.split("~");
+ String startAddress = range[0];
+ String endAddress = range[1];
+
+ int startIndex = extractAddressNumber(startAddress);
+ int endIndex = extractAddressNumber(endAddress);
+
+ String prefix = startAddress.substring(0, startAddress.indexOf(".") + 1);
+
+ for (int i = startIndex; i <= endIndex; i++) {
+ String newAddress = prefix + i;
+ result.add(s7PLC.readBoolean(newAddress));
+ }
+ } else {
+ result.add(s7PLC.readBoolean(address));
+ }
+ }
+
+ return result;
+ }
+
+
+ private int extractAddressNumber(String address) {
+ String numberStr = address.replaceAll("\\D+", ""); // 浣跨敤姝ｅ垯琛ㄨ揪寮忔彁鍙栨暟瀛楅儴鍒�
+ return Integer.parseInt(numberStr);
+ }
+
+
/**
* 浠庢寚瀹氱殑鍦板潃寮�濮� 杩炵画鎸塨it浣嶈鍙�
*
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 7e3122a..7d52f42 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
@@ -6,6 +6,7 @@
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
+import com.example.springboot.component.PLCAutomaticParameterSetting;
import com.example.springboot.component.PlcHold;
import com.example.springboot.component.PlcParameter;
import com.example.springboot.component.Plcaction;
@@ -17,6 +18,7 @@
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)
@@ -29,23 +31,24 @@
//
System.out.println("鍚姩瀹屾垚");
- // new PlcHold().start();
+ // new PlcHold().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();
+ // 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 PLCAutomaticParameterSetting().start();
+ // new PlcServoManualone().start();
}
}
\ No newline at end of file
--
Gitblit v1.8.0