From 777ab73c60a2d27cff496add6710e1503b0b28b6 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 11 一月 2024 08:47:24 +0800
Subject: [PATCH] 增加I/O 标志
---
CanadaMes-ui/src/views/Electrical/Sign.vue | 10
CanadaMes-ui/src/views/Electrical/Parameter2.vue | 9
springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java | 2
CanadaMes-ui/src/configuration/Sign.json | 565 +++++++++++++++++++++++++++++++++++++++++++-------
CanadaMes-ui/src/lang/locales/zh-CN.json | 64 ++++-
5 files changed, 549 insertions(+), 101 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/Sign.json b/CanadaMes-ui/src/configuration/Sign.json
index 3401be1..dc57259 100644
--- a/CanadaMes-ui/src/configuration/Sign.json
+++ b/CanadaMes-ui/src/configuration/Sign.json
@@ -92,20 +92,6 @@
"page": "1"
},
{
- "name": "B01.SR out dec",
- "value": "1",
- "state": "1",
- "type": "1",
- "page": "1"
- },
- {
- "name": "B01.SR out in pos",
- "value": "1",
- "state": "1",
- "type": "1",
- "page": "1"
- },
- {
"name": "B01.SR in dec",
"value": "1",
"state": "1",
@@ -114,6 +100,20 @@
},
{
"name": "B01.SR in in pos",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01.SR out dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B01.SR out in pos",
"value": "1",
"state": "1",
"type": "1",
@@ -204,13 +204,6 @@
"page": "1"
},
{
- "name": "B01.SR out safety",
- "value": "1",
- "state": "1",
- "type": "1",
- "page": "1"
- },
- {
"name": "B01.SR in safety",
"value": "1",
"state": "1",
@@ -218,7 +211,14 @@
"page": "1"
},
{
- "name": "B02.SR out safety",
+ "name": "B01.SR out safety",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "B02.SR in safety",
"value": "1",
"state": "1",
"type": "1",
@@ -253,7 +253,7 @@
"page": "1"
},
{
- "name": "SB.pause",
+ "name": "space",
"value": "1",
"state": "1",
"type": "1",
@@ -281,61 +281,398 @@
"page": "1"
},
{
- "name": "B02.SR in safety",
+ "name": "B02.SR out safety",
"value": "1",
"state": "1",
"type": "1",
"page": "1"
},
{
- "name": "SAFETYDOOR.requset",
+ "name": "SafetyDoor.requset",
"value": "1",
"state": "1",
"type": "1",
"page": "1"
},
{
- "name": "SAFETYDOOR.confirm",
+ "name": "SafetyDoor.confirm",
"value": "1",
"state": "1",
"type": "1",
"page": "1"
},
{
- "name": "SAFETYDOOR.reset",
+ "name": "SafetyDoor.reset",
"value": "1",
"state": "1",
"type": "1",
"page": "1"
},
+ {
+ "name": "Sspace",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "Sspce",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "Sspce",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "Sspce",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR left dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR left in pos",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR left safety",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR right dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR right in pos",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR right safety",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR turn home",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR turn up",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR turn down",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR travel home",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR travel left dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR travel left limit",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR travel right dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "A01.SR travel right limit",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR left dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR left in pos",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR left safety",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR right dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR right in pos",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR right safety",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR turn home",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR turn up",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR turn down",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR travel home",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR travel left dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR travel left limit",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR travel right dec",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02.SR travel right limit",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "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"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
{
"name": "LED.red",
"value": "1",
"state": "1",
"type": "1",
"page": "1"
- },
+ }
+ ,
{
"name": "LED.green",
"value": "1",
"state": "1",
"type": "1",
"page": "1"
- },
+ }
+ ,
{
"name": "LED.yellow",
"value": "1",
"state": "1",
"type": "1",
"page": "1"
- },
+ }
+ ,
{
"name": "D01.LED.green",
"value": "1",
"state": "1",
"type": "1",
"page": "1"
- },
+ }
+ ,
{
"name": "D06.LED.green",
"value": "1",
@@ -349,98 +686,152 @@
"state": "1",
"type": "1",
"page": "1"
- },
+ }
+ ,
{
"name": "B01.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.turn",
"value": "1",
"state": "1",
"type": "1",
"page": "1"
- },
+ }
+ ,
{
"name": "B02.YV.up down",
"value": "1",
"state": "1",
"type": "1",
"page": "1"
- },
+ }
+ ,
{
"name": "B02.YV.gassing",
"value": "1",
"state": "1",
"type": "1",
"page": "1"
- },
+ }
+ ,
{
- "name": "SAFETYDOOR.led",
- "value": "1",
- "state": "1",
- "type": "1",
- "page": "1"
- },
- {
- "name": "SAFETYDOOR.open",
- "value": "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",
+ "name": "SafetyDoor.Led",
"value": "1",
"state": "1",
"type": "1",
"page": "1"
}
+ ,
+ {
+ "name": "SafetyDoor.open",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "D01 SB.confirm",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A01 oilPump",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A01 motorCtr",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02 oilPump",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "A02 motorCtr",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+ ,
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ },
+ {
+ "name": "space",
+ "value": "1",
+ "state": "1",
+ "type": "1",
+ "page": "1"
+ }
+
+
],
"address": [
{
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index 8694b98..705b108 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -386,10 +386,10 @@
"D05.SR in pos": "D05.鍒颁綅浼犳劅鍣�",
"D06.SR dec": "D06.鍑忛�熶紶鎰熷櫒",
"D06.SR in pos": "D06.鍒颁綅浼犳劅鍣�",
- "B01.SR out dec": "B01.鍑虹墖鍑忛�熶紶鎰熷櫒",
- "B01.SR out in pos": "B01.鍑虹墖鍒颁綅浼犳劅鍣�",
"B01.SR in dec": "B01.杩涚墖鍑忛�熶紶鎰熷櫒",
"B01.SR in in pos": "B01.杩涚墖鍒颁綅浼犳劅鍣�",
+ "B01.SR out dec": "B01.鍑虹墖鍑忛�熶紶鎰熷櫒",
+ "B01.SR out in pos": "B01.鍑虹墖鍒颁綅浼犳劅鍣�",
"B01.SR turn on": "B01.缈昏浆涓婂埌浣嶄紶鎰熷櫒",
"B01.SR turn off": "B01.缈昏浆涓嬪埌浣嶄紶鎰熷櫒",
"B01.SR up": "B01.涓婂崌鍒颁綅浼犳劅鍣�",
@@ -402,21 +402,56 @@
"B02.SR turn off": "B02.缈昏浆涓嬪埌浣嶄紶鎰熷櫒",
"B02.SR up": "B02.涓婂崌鍒颁綅浼犳劅鍣�",
"B02.SR down": "B02.涓嬮檷鍒颁綅浼犳劅鍣�",
- "B01.SR out safety": "B01.鍑虹墖瀹夊叏浼犳劅鍣�",
"B01.SR in safety": "B01.杩涚墖瀹夊叏浼犳劅鍣�",
- "B02.SR out safety": "B02.鍑虹墖瀹夊叏浼犳劅鍣�",
+ "B01.SR out safety": "B01.鍑虹墖瀹夊叏浼犳劅鍣�",
+ "B02.SR in safety": "B02.杩涚墖瀹夊叏浼犳劅鍣�",
"SB.start(+)": "SB.鍚姩锛�+锛夋寜閽�",
"SB.stop(1)": "SB.鍋滄锛�-锛夋寜閽�",
"SB.reset": "SB.澶嶄綅鎸夐挳",
"SB.auto/manul": "SB.鎵�/鑷垏鎹㈡寜閽�",
- "SB.pause": "SB.鏆傚仠鎸夐挳",
+ "D01.SB.confirm": "鐜荤拑淇℃伅纭",
"SB.emg": "SB.鎬ュ仠鎸夐挳",
"D01.SB.start": "D01.鍚姩",
"D06.SB.start": "D06.鍚姩",
- "B02.SR in safety": "B02.杩涚墖瀹夊叏浼犳劅鍣�",
- "SAFETYDOOR.requset": "瀹夊叏闂ㄨ姹傝繘鍏�",
- "SAFETYDOOR.confirm": "瀹夊叏闂ㄧ‘璁�",
- "SAFETYDOOR.reset": "瀹夊叏闂ㄥ浣�",
+ "B02.SR out safety ": "B02.鍑虹墖瀹夊叏浼犳劅鍣�",
+ "SafetyDoor.requset": "瀹夊叏闂ㄨ姹傝繘鍏�",
+ "SafetyDoor.confirm": "瀹夊叏闂ㄧ‘璁�",
+ "SafetyDoor.reset": "瀹夊叏闂ㄥ浣�",
+ "Sspce":"澶囩敤",
+ "A01.SR left dec":"A01宸﹂敭閫�",
+ "A01.SR left in pos":"A01宸﹀埌浣�",
+ "A01.SR left safety":"A01宸﹀畨鍏�",
+ "A01.SR right dec":"A01鍙抽敭閫�",
+ "A01.SR right in pos":"A01鍙冲埌浣�",
+ "A01.SR right safety":"A01鍙冲畨鍏�",
+ "A01.SR turn home":"A01缈昏浆鍘熺偣",
+ "A01.SR turn up":"A01缈昏浆涓婃瀬闄�",
+ "A01.SR turn down":"A01缈昏浆涓嬫瀬闄�",
+ "A01.SR travel home":"A01琛岃蛋鍘熺偣",
+ "A01.SR travel left dec":"A01琛岃蛋宸﹀噺閫�",
+ "A01.SR travel left limit":"A01琛岃蛋宸︽瀬闄�",
+ "A01.SR travel right dec":"A01琛岃蛋鍙冲噺閫�",
+ "A01.SR travel right limit":"A01琛岃蛋鍙虫瀬闄�",
+ "A02.SR left dec":"A02宸﹂敭閫�",
+ "A02.SR left in pos":"A02宸﹀埌浣�",
+ "A02.SR left safety":"A02宸﹀畨鍏�",
+ "A02.SR right dec":"A02鍙抽敭閫�",
+ "A02.SR right in pos":"A02鍙冲埌浣�",
+ "A02.SR right safety":"A02鍙冲畨鍏�",
+ "A02.SR turn home":"A02缈昏浆鍘熺偣",
+ "A02.SR turn up":"A02缈昏浆涓婃瀬闄�",
+ "A02.SR turn down":"A02缈昏浆涓嬫瀬闄�",
+ "A02.SR travel home":"A02琛岃蛋鍘熺偣",
+ "A02.SR travel left dec":"A02琛岃蛋宸﹀噺閫�",
+ "A02.SR travel left limit":"A02琛岃蛋宸︽瀬闄�",
+ "A02.SR travel right dec":"A02琛岃蛋鍙冲噺閫�",
+ "A02.SR travel right limit":"A02琛岃蛋鍙虫瀬闄�",
+ "B01.SR origin":"B01.鍘熺偣",
+ "B01.SR left limit":"B01.宸︽瀬闄�",
+ "B01.SR right limit":"B01.鍙虫瀬闄�",
+ "B02.SR origin":"B02.鍘熺偣",
+ "B02.SR left limit":"B02.宸︽瀬闄�",
+ "B02.SR right limit":"B02.鍙虫瀬闄�",
"LED.red": "涓夎壊鐏孩",
"LED.green": "涓夎壊鐏豢",
"LED.yellow": "涓夎壊鐏粍",
@@ -428,8 +463,15 @@
"B02.YV.turn": "B02.鐢电闃�缈昏浆",
"B02.YV.up down": "B02.鐢电闃�涓婂崌涓嬮檷",
"B02.YV.gassing": "B02.鐢电闃�鍚规皵",
- "SAFETYDOOR.led": "瀹夊叏闂ㄧ姸鎬佺伅",
- "SAFETYDOOR.open": "瀹夊叏闂ㄦ墦寮�"
+ "SafetyDoor.Led": "瀹夊叏闂ㄧ姸鎬佺伅",
+ "SafetyDoor.open": "瀹夊叏闂ㄦ墦寮�",
+ "D01 SB.confirm":"鐜荤拑淇℃伅纭鎸囩ず鐏�",
+ "A01 oilPump":"A01娉ㄦ补娉�",
+ "A01 motorCtr":"A01鐢垫満鎺у埗",
+ "A02 oilPump":"A02娉ㄦ补娉�",
+ "A02 motorCtr":"A02鐢垫満鎺у埗",
+ "space":"澶囩敤"
+
},
"Statelang": {
"D01.State": "D01.鐘舵��",
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter2.vue b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
index 5542c24..93e451d 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter2.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
@@ -338,6 +338,15 @@
const jsonString2 = JSON.stringify(jsonObject2);
console.log("鎵�鏈塗ype涓�0鐨剉alue:", jsonString2);
socket?.send(jsonString2);
+
+ // 寤惰繜2绉掑彂閫佹寚瀹氬唴瀹�
+setTimeout(() => {
+ const jsonObject = { data: [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [], []] };
+ const jsonString = JSON.stringify(jsonObject);
+ console.log("鍙戦�佺殑鍐呭:", jsonString);
+ socket?.send(jsonString);
+}, 2000);
+
}
if (
diff --git a/CanadaMes-ui/src/views/Electrical/Sign.vue b/CanadaMes-ui/src/views/Electrical/Sign.vue
index f5e3edd..4c0108f 100644
--- a/CanadaMes-ui/src/views/Electrical/Sign.vue
+++ b/CanadaMes-ui/src/views/Electrical/Sign.vue
@@ -64,7 +64,13 @@
},
activated(){
this.init();
-
+ this.record.xyData = this.jsonData.sign;
+ const language = this.$i18n.locale;
+ if (language === 'zh-CN') {
+ this.replaceChineseWithEnglish();
+ } else {
+ this.localizedRoles = [...this.record.xyData];
+ }
},
methods: {
showdata () {
@@ -132,7 +138,7 @@
const language = this.$i18n.locale;
- if (language === 'en-US') {
+ if (language === 'zh-CN') {
this.replaceChineseWithEnglish();
} else {
this.localizedRoles = [...this.record.xyData];
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
index 2daeaf3..8329678 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
@@ -71,7 +71,7 @@
// System.out.println(PlcAddress);
// List<Boolean> plclist = S7control.getinstance().ReadBits(PlcAddress, Plccount);
- List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 64);
+ List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 112);
// Boolean[] values = { true, true, true, true, true, false, true, false,
// true, false, true, false, true, false,
--
Gitblit v1.8.0