Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

wuyouming666

2024-05-17 0671578faf91fde8093451fb23f6ae94515f3702

Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

 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,

 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",


 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",

 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