From d1cc81dd70a146b7ba2684359375490ad4d58419 Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期一, 27 十一月 2023 08:39:29 +0800
Subject: [PATCH] 添加新界面，配置新界面json文件，补充IO状态界面地址，添加报警信息界面json
---
CanadaMes-ui/src/views/Electrical/Positioning2.vue | 124 +
CanadaMes-ui/src/router/index.js | 46
CanadaMes-ui/src/views/Electrical/Parameter2.vue | 122 +
CanadaMes-ui/src/configuration/AutomaticParameterSetting.json | 92 +
CanadaMes-ui/src/configuration/Positioning2.json | 92 +
CanadaMes-ui/src/views/Electrical/Positioning1.vue | 222 ++
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java | 15
CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue | 118 +
CanadaMes-ui/src/views/Electrical/Action.vue | 3
CanadaMes-ui/src/configuration/State.json | 300 +++
CanadaMes-ui/src/configuration/parameter2.json | 128 +
CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue | 124 +
CanadaMes-ui/src/configuration/ManualJog.json | 220 ++
CanadaMes-ui/src/configuration/Positioning1.json | 177 +
CanadaMes-ui/src/views/Electrical/Servomanual.vue | 88
CanadaMes-ui/src/views/Electrical/Sign.vue | 16
CanadaMes-ui/src/configuration/Parameter.json | 640 ++++++
CanadaMes-ui/src/views/Electrical/ManualonePosition.vue | 129 +
springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java | 141
CanadaMes-ui/src/configuration/ServoManualone.json | 218 ++
CanadaMes-ui/src/configuration/Alarm.json | 514 +++++
CanadaMes-ui/src/configuration/address.json | 68
CanadaMes-ui/src/lang/locales/zh-CN.json | 6
CanadaMes-ui/src/configuration/Manualoneposition2.json | 130 +
CanadaMes-ui/src/configuration/parameter1.json | 114 +
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 5
CanadaMes-ui/src/configuration/Action.json | 564 +++++
CanadaMes-ui/src/views/Electrical/ManualJog.vue | 139 +
CanadaMes-ui/src/views/Electrical/Parameter1.vue | 122 +
CanadaMes-ui/src/views/Electrical/ServoManualone.vue | 124 +
CanadaMes-ui/src/configuration/Sign.json | 270 ++
CanadaMes-ui/src/configuration/Manualoneposition.json | 314 +++
32 files changed, 5,191 insertions(+), 194 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..72ce6d5
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/AutomaticParameterSetting.json
@@ -0,0 +1,92 @@
+[
+ [
+ {
+ "name": "澶ц溅鑷姩閫熷害",
+ "read": 33,
+ "sending": "",
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3
+ }
+ ],
+ [
+ {
+ "name": "灏忚溅鑷姩閫熷害",
+ "read": 11,
+ "sending": "",
+ "address": "DB100.0",
+ "type": "0"
+ }
+ ],
+ [
+ {
+ "name": "A01琛岃蛋楂橀�熻搴�",
+ "read": 33,
+ "sending": "",
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3
+ },
+ {
+ "name": "A01琛岃蛋浣庨�熻搴�",
+ "read": 11,
+ "sending": "",
+ "address": "DB100.0",
+ "type": "0"
+ },
+ {
+ "name": "A01杈撻�佹帴鐗囪搴�",
+ "read": 22,
+ "sending": "",
+ "address": "DB100.0",
+ "type": "0"
+ },
+ {
+ "name": "A01绗煎瓙瑙掑害",
+ "read": 22,
+ "sending": "",
+ "address": "DB100.0",
+ "type": "0"
+ }
+ ],
+ [
+ {
+ "name": "A02琛岃蛋楂橀�熻搴�",
+ "read": 33,
+ "sending": "",
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3
+ },
+ {
+ "name": "A02琛岃蛋浣庨�熻搴�",
+ "read": 11,
+ "sending": "",
+ "address": "DB100.0",
+ "type": "0"
+ },
+ {
+ "name": "A02杈撻�佹帴鐗囪搴�",
+ "read": 22,
+ "sending": "",
+ "address": "DB100.0",
+ "type": "0"
+ },
+ {
+ "name": "A02绗煎瓙瑙掑害",
+ "read": 22,
+ "sending": "",
+ "address": "DB100.0",
+ "type": "0"
+ }
+ ],
+ [
+ {
+ "name": "鑷姩缈昏浆閫熷害",
+ "read": 33,
+ "sending": "",
+ "address": "DB100.0",
+ "type": "0"
+ }
+ ]
+]
\ 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 a04f953..193851f 100644
--- a/CanadaMes-ui/src/configuration/Parameter.json
+++ b/CanadaMes-ui/src/configuration/Parameter.json
@@ -1,86 +1,666 @@
{
"para": [
{
- "name": "conveyor Velocity(Auto FAST)",
- "read": 33,
+ "name": "D01-D06 conveyor Velocity(Auto FAST)",
+ "value": 123,
"sending": 0,
- "unit": "m/min"
+ "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"
+ "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"
+ "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
new file mode 100644
index 0000000..bd3cad0
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/Positioning1.json
@@ -0,0 +1,177 @@
+[
+
+ [
+ {
+ "title": {
+ "name": "瀛樼墖鏍间綅缃瀹�"
+
+ }, "type": "1"
+
+ },
+ {
+ "name": "1#鏍煎湴鍧�",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value":"0",
+ "address":"DB100.48",
+ "count":10
+ },
+ {
+ "name": "22#鏍煎湴鍧�",
+ "read": 11,
+ "sending": 0,
+ "type": "0" ,
+ "value":"0"
+ },
+ {
+ "name": "43#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "type": "0" ,
+ "value":"0"
+ },
+ {
+ "name": "64#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "type": "0" ,
+ "value":"0"
+ },
+ {
+ "name": "85#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "type": "0" ,
+ "value":"0"
+ },
+ {
+ "name": "106#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "type": "0" ,
+ "value":"0"
+ },
+ {
+ "name": "127#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "type": "0" ,
+ "value":"0"
+ },
+ {
+ "name": "148#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "type": "0" ,
+ "value":"0"
+ },
+ {
+ "name": "169#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "type": "0" ,
+ "value":"0"
+ },
+ {
+ "name": "190#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "type": "0" ,
+ "value":"0"
+ }
+
+
+
+ ],
+
+ [
+ {
+ "title": {
+ "name": "鍑虹墖鏍间綅缃瀹�"
+
+ },"type": "1",
+ "value":"0"
+ },
+ {
+ "name": "1#鏍煎湴鍧�",
+ "read": 33,
+ "sending": 0,
+ "type": "0" ,
+ "value":"0",
+ "address":"DB100.68",
+ "count":10
+ },
+ {
+ "name": "22#鏍煎湴鍧�",
+ "read": 11,
+ "sending": 0,
+ "type": "0" ,
+ "value":"0"
+ },
+ {
+ "name": "43#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "type": "0" ,
+ "value":"0"
+ },
+ {
+ "name": "64#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "type": "0" ,
+ "value":"0"
+ },
+ {
+ "name": "85#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "type": "0" ,
+ "value":"0"
+ },
+ {
+ "name": "106#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "type": "0" ,
+ "value":"0"
+ },
+ {
+ "name": "127#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "type": "0" ,
+ "value":"0"
+ },
+ {
+ "name": "148#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "type": "0" ,
+ "value":"0"
+ },
+ {
+ "name": "169#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "type": "0" ,
+ "value":"0"
+ },
+ {
+ "name": "190#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "type": "0" ,
+ "value":"0"
+ }
+
+
+
+ ]
+
+
+
+ ]
+
+
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/Positioning2.json b/CanadaMes-ui/src/configuration/Positioning2.json
new file mode 100644
index 0000000..55fbcf6
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/Positioning2.json
@@ -0,0 +1,92 @@
+[
+
+ [
+ {
+ "title": {
+ "name": "B01鏍间綅缃瀹�"
+
+ }
+ },
+ {
+ "name": "1#鏍煎湴鍧�",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address":"DB100.0",
+ "count":3
+ },
+ {
+ "name": "22#鏍煎湴鍧�",
+ "read": 11,
+ "sending": 0,
+ "type": "0"
+ },
+ {
+ "name": "43#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "type": "0"
+ },
+ {
+ "name": "64#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "type": "0"
+ },
+ {
+ "name": "85#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "type": "0"
+ }
+
+
+
+ ],
+
+ [
+ {
+ "title": {
+ "name": "B02浣嶇疆璁惧畾"
+
+ }
+ },
+ {
+ "name": "106#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "type": "0"
+ },
+ {
+ "name": "127#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "type": "0"
+ },
+ {
+ "name": "148#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "type": "0"
+ },
+ {
+ "name": "169#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "type": "0"
+ },
+ {
+ "name": "190#鏍煎湴鍧�",
+ "read": 22,
+ "sending": 0,
+ "type": "0"
+ }
+
+
+
+
+ ]
+
+
+ ]
+
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/ServoManualone.json b/CanadaMes-ui/src/configuration/ServoManualone.json
new file mode 100644
index 0000000..666f7c3
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/ServoManualone.json
@@ -0,0 +1,218 @@
+[
+ [
+ {
+ "name": "澶ц溅鑷姩閫熷害",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3
+ }
+ ],
+ [
+ {
+ "name": "灏忚溅鑷姩閫熷害",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3
+ }
+ ],
+ [
+ {
+ "name": "A01 鎵�鍦ㄦ牸瀛�",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address": "DB100.0",
+ "count": 3
+ },
+ {
+ "name": "鍙栫墖鏍煎瓙",
+ "read": 11,
+ "sending": 0,
+ "type": "0"
+ },
+ {
+ "name": "瀛樼墖鏍煎瓙",
+ "read": 22,
+ "sending": 0,
+ "type": "0"
+ },
+ {
+ "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.1",
+ "count": 3
+ },
+ {
+ "name": "鍙栫墖鏍煎瓙",
+ "read": 11,
+ "sending": 0,
+ "type": "0"
+ },
+ {
+ "name": "瀛樼墖鏍煎瓙",
+ "read": 22,
+ "sending": 0,
+ "type": "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
+ },
+ {
+ "name": "鐩爣鏍煎瓙",
+ "read": 11,
+ "sending": 0,
+ "type": "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
+ },
+ {
+ "name": "鐩爣鏍煎瓙",
+ "read": 11,
+ "sending": 0,
+ "type": "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
+ },
+ {
+ "name": "鐩爣鏍煎瓙",
+ "read": 11,
+ "sending": 0,
+ "type": "0"
+ },
+ {
+ "button": {
+ "name": "鏁呴殰",
+ "value": 0,
+ "address": "DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "澶嶄綅",
+ "value": 0,
+ "address": "DB10.0"
+ }
+ }
+ ],
+ [
+ {
+ "name": "瀛樼墖鎺ョ墖鍦板潃",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address": "DB100.4",
+ "count": 3
+ }
+ ],
+ [
+ {
+ "name": "鍑虹墖鎺ョ墖鍦板潃",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address": "DB100.5",
+ "count": 3
+ }
+ ]
+]
\ 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
new file mode 100644
index 0000000..c9d50d3
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/address.json
@@ -0,0 +1,68 @@
+{
+ "parameter1": [
+ {
+ "name": "DB100.0",
+ "type": "w",
+ "count": 12
+ },
+ {
+ "name": "DB100.0",
+ "type": "x",
+ "count": 12
+ }
+ ],
+ "parameter2": [
+ {
+ "name": "DB100.0",
+ "count": 12
+ },
+ {
+ "name": "DB100.0",
+ "count": 12
+ }
+ ],
+ "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
+ }
+ ],
+ "Manualoneposition": [
+ {
+ "name": "DB100.0",
+ "count": 72
+ },
+ {
+ "name": "DB101.0",
+ "count": 22
+ },
+ {
+ "name": "DB102.0",
+ "count": 33
+ }
+ ]
+}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/parameter1.json b/CanadaMes-ui/src/configuration/parameter1.json
new file mode 100644
index 0000000..0af34c5
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/parameter1.json
@@ -0,0 +1,114 @@
+[
+
+ [
+ {
+ "title": {
+ "name": "D01~D06杈撻��"
+
+ }
+ },
+ {
+ "name": "鏈�楂橀�熷害",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address":"DB100.0",
+ "count":3
+ },
+ {
+ "name": "楂橀�熺嚎閫熷害",
+ "read": 11,
+ "sending": 0,
+ "type": "0"
+ },
+ {
+ "name": "浣庨�熺嚎閫熷害",
+ "read": 11,
+ "sending": 0,
+ "type": "0"
+ },
+ {
+ "name": "鎵嬪姩閫熷害",
+ "read": 22,
+ "sending": 0,
+ "type": "0"
+ }
+
+
+ ],
+
+ [
+ {
+ "title": {
+ "name": "A01~A02杈撻��"
+
+ }
+ },
+ {
+ "name": "鏈�楂橀�熷害",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address":"DB100.0",
+ "count":3
+ },
+ {
+ "name": "楂橀�熺嚎閫熷害",
+ "read": 11,
+ "sending": 0,
+ "type": "0"
+ },
+ {
+ "name": "浣庨�熺嚎閫熷害",
+ "read": 11,
+ "sending": 0,
+ "type": "0"
+ },
+ {
+ "name": "鎵嬪姩閫熷害",
+ "read": 22,
+ "sending": 0,
+ "type": "0"
+ }
+
+
+ ],[
+ {
+ "title": {
+ "name": "B01~B02杈撻��"
+
+ }
+ },
+ {
+ "name": "鏈�楂橀�熷害",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address":"DB100.0",
+ "count":3
+ },
+ {
+ "name": "楂橀�熺嚎閫熷害",
+ "read": 11,
+ "sending": 0,
+ "type": "0"
+ },
+ {
+ "name": "浣庨�熺嚎閫熷害",
+ "read": 11,
+ "sending": 0,
+ "type": "0"
+ },
+ {
+ "name": "鎵嬪姩閫熷害",
+ "read": 22,
+ "sending": 0,
+ "type": "0"
+ }
+
+
+]
+
+
+ ]
+
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/parameter2.json b/CanadaMes-ui/src/configuration/parameter2.json
new file mode 100644
index 0000000..7ffa0da
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/parameter2.json
@@ -0,0 +1,128 @@
+[
+
+ [
+ {
+ "title": {
+ "name": "A01杈撻��"
+
+ }
+ },
+ {
+ "name": "楂橀�熺嚎閫熷害",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address":"DB100.0",
+ "count":3
+ },
+ {
+ "name": "浣庨�熺嚎閫熷害",
+ "read": 11,
+ "sending": 0,
+ "type": "0"
+ },
+ {
+ "name": "鎵嬪姩閫熷害",
+ "read": 22,
+ "sending": 0,
+ "type": "0"
+ }
+
+
+ ],
+
+ [
+ {
+ "title": {
+ "name": "B02杈撻��"
+
+ }
+ },
+ {
+ "name": "楂橀�熺嚎閫熷害",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address":"DB100.0",
+ "count":3
+ },
+ {
+ "name": "浣庨�熺嚎閫熷害",
+ "read": 11,
+ "sending": 0,
+ "type": "0"
+ },
+ {
+ "name": "鎵嬪姩閫熷害",
+ "read": 22,
+ "sending": 0,
+ "type": "0"
+ }
+
+
+ ],
+ [
+ {
+ "title": {
+ "name": "A02杈撻��"
+
+ }
+ },
+ {
+ "name": "楂橀�熺嚎閫熷害",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address":"DB100.0",
+ "count":3
+ },
+ {
+ "name": "浣庨�熺嚎閫熷害",
+ "read": 11,
+ "sending": 0,
+ "type": "0"
+ },
+ {
+ "name": "鎵嬪姩閫熷害",
+ "read": 22,
+ "sending": 0,
+ "type": "0"
+ }
+
+
+ ],
+ [
+ {
+ "title": {
+ "name": "B02杈撻��"
+
+ }
+ },
+ {
+ "name": "楂橀�熺嚎閫熷害",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address":"DB100.0",
+ "count":3
+ },
+ {
+ "name": "浣庨�熺嚎閫熷害",
+ "read": 11,
+ "sending": 0,
+ "type": "0"
+ },
+ {
+ "name": "鎵嬪姩閫熷害",
+ "read": 22,
+ "sending": 0,
+ "type": "0"
+ }
+
+
+ ]
+
+
+
+ ]
+
\ No newline at end of file
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index 0b55a8b..8d4f7e1 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -297,9 +297,9 @@
"The glass ID already exists in the loading queue": "涓婄墖闃熷垪宸插瓨鍦ㄦ鐜荤拑id",
"This glass ID already exists in the sorting cage": "鐞嗙墖绗煎唴宸插瓨鍦ㄦ鐜荤拑id",
"langparameter": {
- "conveyor Velocity(Auto FAST)": "鐨甫杈撻�佽嚜鍔ㄥ揩閫�",
- "conveyor Velocity(Auto SLOW)": "鐨甫杈撻�佽嚜鍔ㄦ參閫�",
- "conveyor Velocity(Manual)": "鐨甫杈撻�佹墜鍔ㄩ�熷害",
+ "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 a789434..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')
@@ -83,6 +83,46 @@
path: '/Electrical/alarm',
component: () => import('../views/Electrical/alarm')
},
+ {
+ path: '/Electrical/Servomanual',
+ component: () => import('../views/Electrical/Servomanual')
+ },
+ {
+ path: '/Electrical/ServoManualone',
+ component: () => import('../views/Electrical/ServoManualone')
+ },
+ {
+ path: '/Electrical/Parameter1',
+ component: () => import('../views/Electrical/Parameter1')
+ },
+ {
+ path: '/Electrical/Parameter2',
+ component: () => import('../views/Electrical/Parameter2')
+ },
+ {
+ path: '/Electrical/Positioning1',
+ component: () => import('../views/Electrical/Positioning1')
+ },
+ {
+ path: '/Electrical/Positioning2',
+ component: () => import('../views/Electrical/Positioning2')
+ },
+ {
+ 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/Action.vue b/CanadaMes-ui/src/views/Electrical/Action.vue
index 1afd13b..68a1f2f 100644
--- a/CanadaMes-ui/src/views/Electrical/Action.vue
+++ b/CanadaMes-ui/src/views/Electrical/Action.vue
@@ -12,7 +12,10 @@
}}</router-link>
<router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
}}</router-link>
+ <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual')
+ }}</router-link>
</el-breadcrumb>
+
<div>Action</div>
<el-form label-width="100px" style="display: flex;flex-wrap: wrap;" :model="{ messagepack }">
<!-- <div class="kuai_div" v-for="item in record.xyData" :key="item.value">
diff --git a/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue b/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
new file mode 100644
index 0000000..7c9475b
--- /dev/null
+++ b/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
@@ -0,0 +1,118 @@
+<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:150px;" v-if="item.type === '0'" v-model="item.read" class="input-box"></el-input>
+ <el-input style="width:150px;" v-if="item.type === '0'" v-model="item.sending" 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/AutomaticParameterSetting'
+
+export default {
+ name: "AutomaticParameterSetting",
+ 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/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/Parameter1.vue b/CanadaMes-ui/src/views/Electrical/Parameter1.vue
new file mode 100644
index 0000000..9b68627
--- /dev/null
+++ b/CanadaMes-ui/src/views/Electrical/Parameter1.vue
@@ -0,0 +1,122 @@
+<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">
+ <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>
+ </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'
+
+export default {
+ name: "Parameter1",
+ 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.title.name, value: item.title.value, address: item.title.address };
+ }
+ return null;
+ });
+ });
+
+ // 妯℃嫙鎻愪氦鏁版嵁鍒板悗绔殑鎿嶄綔锛屽疄闄呮儏鍐典笅闇�瑕佹牴鎹綘鐨勫悗绔疉PI杩涜淇敼
+ console.log('鎻愪氦浠ヤ笅鏁版嵁鍒板悗绔�:', inputData);
+
+ }
+ }
+}
+</script>
+
+<style scoped>
+.item-row {
+ display: flex;
+ align-items: center;
+ margin-bottom: 5px;
+ /* 璋冩暣姣忎釜椤圭洰涔嬮棿鐨勯棿璺� */
+}
+
+.action-button {
+ margin-right: 30px;
+ background: #66b1ff;
+ color: #FFF;
+}
+
+.blue-button {
+ background-color: skyblue;
+}
+</style>
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter2.vue b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
new file mode 100644
index 0000000..f3dced1
--- /dev/null
+++ b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
@@ -0,0 +1,122 @@
+<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">
+ <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>
+ </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'
+
+export default {
+ name: "Parameter2",
+ 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.title.name, value: item.title.value, address: item.title.address };
+ }
+ return null;
+ });
+ });
+
+ // 妯℃嫙鎻愪氦鏁版嵁鍒板悗绔殑鎿嶄綔锛屽疄闄呮儏鍐典笅闇�瑕佹牴鎹綘鐨勫悗绔疉PI杩涜淇敼
+ console.log('鎻愪氦浠ヤ笅鏁版嵁鍒板悗绔�:', inputData);
+
+ }
+ }
+}
+</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/Positioning1.vue b/CanadaMes-ui/src/views/Electrical/Positioning1.vue
new file mode 100644
index 0000000..d44cc90
--- /dev/null
+++ b/CanadaMes-ui/src/views/Electrical/Positioning1.vue
@@ -0,0 +1,222 @@
+<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">
+ <el-col :span="7" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex" class='card'>
+ <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/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.querySelector('.card'); // 鏍规嵁浣犵殑瀹為檯鎯呭喌閫夋嫨姝ｇ‘鐨勯�夋嫨鍣�
+ if (inputBox && !inputBox.contains(event.target)) {
+ // 濡傛灉榧犳爣涓嶅湪杈撳叆妗嗗唴锛屾洿鏂拌緭鍏ユ鐨勫��
+ // this.submitDataToBackend()
+ const params = obj.params;
+
+
+ // this.submitDataToBackend()
+ let currentIndex = 0;
+
+ jsonData2.forEach((group, groupIndex) => {
+ group.forEach((item) => {
+ if (item.type !== '1') {
+ if (params[groupIndex] && params[groupIndex][currentIndex] !== undefined) {
+ item.value = params[groupIndex][currentIndex];
+ }
+ currentIndex++;
+ }
+ });
+ currentIndex = 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;
+}
+</style>
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/Electrical/Positioning2.vue b/CanadaMes-ui/src/views/Electrical/Positioning2.vue
new file mode 100644
index 0000000..0ec0754
--- /dev/null
+++ b/CanadaMes-ui/src/views/Electrical/Positioning2.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="18">
+ <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'" v-model="item.value" class="input-box"
+ @click="submitDataToBackend();">鍙栧湴鍧�</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/Positioning2'
+
+export default {
+ name: "Positioning2",
+ 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.title.name, value: item.title.value, address: item.title.address };
+ }
+ return null;
+ });
+ });
+
+ // 妯℃嫙鎻愪氦鏁版嵁鍒板悗绔殑鎿嶄綔锛屽疄闄呮儏鍐典笅闇�瑕佹牴鎹綘鐨勫悗绔疉PI杩涜淇敼
+ console.log('鎻愪氦浠ヤ笅鏁版嵁鍒板悗绔�:', inputData);
+
+ }
+ }
+}
+</script>
+
+<style scoped>
+.item-row {
+ display: flex;
+ align-items: center;
+ margin-bottom: 5px;
+ /* 璋冩暣姣忎釜椤圭洰涔嬮棿鐨勯棿璺� */
+}
+
+.action-button {
+ margin-right: 30px;
+ background: #66b1ff;
+ color: #FFF;
+}
+
+.blue-button {
+ background-color: skyblue;
+}
+</style>
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
new file mode 100644
index 0000000..636fab4
--- /dev/null
+++ b/CanadaMes-ui/src/views/Electrical/ServoManualone.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:450px;">
+ <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/ServoManualone'
+
+export default {
+ name: "ServoManualone",
+ 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/Servomanual.vue b/CanadaMes-ui/src/views/Electrical/Servomanual.vue
new file mode 100644
index 0000000..7b8316a
--- /dev/null
+++ b/CanadaMes-ui/src/views/Electrical/Servomanual.vue
@@ -0,0 +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('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>
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/Electrical/Sign.vue b/CanadaMes-ui/src/views/Electrical/Sign.vue
index a3151cf..5466384 100644
--- a/CanadaMes-ui/src/views/Electrical/Sign.vue
+++ b/CanadaMes-ui/src/views/Electrical/Sign.vue
@@ -20,7 +20,7 @@
<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 +148,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 +190,7 @@
.kuai_sb {
text-align: center;
- width: 25%;
+ width: 15%;
margin-bottom: 15px;
}
@@ -211,8 +215,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/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
index bfdf656..37e398e 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/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/config/AppRunnerConfig.java b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
index fa0b7d6..9d486e1 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
@@ -7,6 +7,7 @@
import org.springframework.stereotype.Component;
import com.example.springboot.component.PlcHold;
+import com.example.springboot.component.PlcManualonePosition;
import com.example.springboot.component.PlcParameter;
import com.example.springboot.component.Plcaction;
import com.example.springboot.component.Plchome;
@@ -29,7 +30,7 @@
new Plcaction().start();
- new Plchome().start();
+ // new Plchome().start();
new PlcParameter().start();
@@ -38,5 +39,7 @@
new Plcsign().start();
new Plcstate().start();
+
+ // new PlcManualonePosition().start();
}
}
\ No newline at end of file
--
Gitblit v1.8.0