From 0671578faf91fde8093451fb23f6ae94515f3702 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 17 五月 2024 09:42:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/resources/config.properties | 2 +-
CanadaMes-ui/src/configuration/ManualJog.json | 20 ++++++++++++++++++++
CanadaMes-ui/src/views/Electrical/InteractionState.vue | 4 +---
CanadaMes-ui/src/lang/locales/en-US.json | 4 ++--
4 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/ManualJog.json b/CanadaMes-ui/src/configuration/ManualJog.json
index da0da0b..69691ee 100644
--- a/CanadaMes-ui/src/configuration/ManualJog.json
+++ b/CanadaMes-ui/src/configuration/ManualJog.json
@@ -101,6 +101,16 @@
},
{
"button": {
+ "name": "A01杈撻�佸弽鍚�",
+ "value": 0,
+ "value2": 0,
+ "address": "DB10.0",
+ "state": 0
+ },
+ "type": "3"
+ },
+ {
+ "button": {
"name": "A01娉ㄧ數娉�",
"value": 0,
"value2": 0,
@@ -144,6 +154,16 @@
},
{
"button": {
+ "name": "A02杈撻�佸弽鍚�",
+ "value": 0,
+ "value2": 0,
+ "address": "DB10.0",
+ "state": 0
+ },
+ "type": "3"
+ },
+ {
+ "button": {
"name": "A02娉ㄧ數娉�",
"value": 0,
"value2": 0,
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index b094fbf..64b17ba 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -571,8 +571,8 @@
"B01缈昏浆姘旂几": "Tilt Cyl",
"B01鍗囬檷姘旂几": "V Cylinder",
"B01鍚规皵": "Air blow",
- "A01杈撻�佸弽鍚�": "ConvCyor",
- "A02杈撻�佸弽鍚�": "ConvCyor",
+ "A01杈撻�佸弽鍚�": "Reverse",
+ "A02杈撻�佸弽鍚�": "Reverse",
"A01娉ㄧ數娉�": "Oil Pump",
"A02娉ㄧ數娉�": "Oil Pump",
"A01鍘熺偣璁板繂":"A01 Calibration Pos",
diff --git a/CanadaMes-ui/src/views/Electrical/InteractionState.vue b/CanadaMes-ui/src/views/Electrical/InteractionState.vue
index 0430bcb..96d8cd6 100644
--- a/CanadaMes-ui/src/views/Electrical/InteractionState.vue
+++ b/CanadaMes-ui/src/views/Electrical/InteractionState.vue
@@ -151,9 +151,7 @@
let socket;
import LanguageMixin from "../../lang/LanguageMixin";
import data from "../../configuration/InteractionState";
-import {
-SelectPermissionByUserName, currentUsername
-} from "../../api/home";
+
export default {
name: "InteractionState",
diff --git a/springboot-vue3/src/main/resources/config.properties b/springboot-vue3/src/main/resources/config.properties
index 49e3bef..44f00be 100644
--- a/springboot-vue3/src/main/resources/config.properties
+++ b/springboot-vue3/src/main/resources/config.properties
@@ -137,7 +137,7 @@
#addressList21.add("DB101.3.1");
#addressList21.add("DB101.3.3");
#鎸夐挳
-PLCManualJog.button=DB101.0.0,DB101.0.1,DB101.0.2,DB101.0.3,DB101.0.4,DB101.0.5,DB101.1.4,DB101.1.2,DB101.0.6,DB101.5.2,DB101.1.5,DB101.1.3,DB101.0.7,DB101.5.3,DB101.1.6,DB101.2.6,DB101.2.7,DB101.1.0,DB101.3.2,DB101.1.7,DB101.3.0,DB101.3.1,DB101.1.1,DB101.3.3
+PLCManualJog.button=DB101.0.0,DB101.0.1,DB101.0.2,DB101.0.3,DB101.0.4,DB101.0.5,DB101.1.4,DB101.1.2,DB101.0.6,DB101.3.4,DB101.5.2,DB101.1.5,DB101.1.3,DB101.0.7,DB101.3.5,DB101.5.3,DB101.1.6,DB101.2.6,DB101.2.7,DB101.1.0,DB101.3.2,DB101.1.7,DB101.3.0,DB101.3.1,DB101.1.1,DB101.3.3
PLCOriginmarking=DB101.10.5,DB101.10.6
--
Gitblit v1.8.0