wuyouming666
2024-01-11 777ab73c60a2d27cff496add6710e1503b0b28b6
增加I/O 标志
5个文件已修改
650 ■■■■ 已修改文件
CanadaMes-ui/src/configuration/Sign.json 565 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/lang/locales/zh-CN.json 64 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/views/Electrical/Parameter2.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/views/Electrical/Sign.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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": [
    {
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.状态",
CanadaMes-ui/src/views/Electrical/Parameter2.vue
@@ -338,6 +338,15 @@
        const jsonString2 = JSON.stringify(jsonObject2);
        console.log("所有Type为0的value:", 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 (
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];
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,