wuyouming666
2024-01-19 0a5cbfbcc2b882a9c8bd15bd28cd4d6ab962ba2b
修改交互信息状态 页面
8个文件已修改
57 ■■■■■ 已修改文件
CanadaMes-ui/src/configuration/InteractionState.json 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/views/Electrical/InteractionState.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/views/Electrical/Parameter2.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/views/home/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/component/PlcInteractionState.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot-vue3/src/main/resources/config.properties 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CanadaMes-ui/src/configuration/InteractionState.json
@@ -334,7 +334,7 @@
            "max":9999
          },
          {
            "name": "B01小车当前任务位",
            "name": "B01小车当前任务位置",
            "read": 22,
            "sending": 0,
            "unit": "mm",
@@ -368,7 +368,7 @@
            }, "type": "1"
          },
          {
            "name": "B02小车当前位置",
            "name": "B02小车当前任务位置",
            "read": 22,
            "sending": 0,
            "unit": "mm",
CanadaMes-ui/src/views/Electrical/InteractionState.vue
@@ -229,7 +229,7 @@
  const specialChars = /[^\w\s]/g;
  if(obj.zuhe1){
    
//console.log(obj);
console.log(obj);
 for (let i = 0; i < jsondata2.length; i++) {
  const item = jsondata2[i];
CanadaMes-ui/src/views/Electrical/Parameter2.vue
@@ -285,6 +285,9 @@
    },
    updateButtonValue(dataGroup, itemIndex) {
      console.log(dataGroup)
      console.log(itemIndex)
      if (dataGroup[itemIndex].button.value2 === 1) {
        // 如果当前按钮的值是 0,将其设为 1
        this.$set(dataGroup[itemIndex].button, "value2", 0);
CanadaMes-ui/src/views/home/index.vue
@@ -1306,7 +1306,7 @@
            }
        },
        //获取扫码位和上片位数据
        SelectGlassByGlassIDs(parameter) {
        SelectGlassByGlassIDs() {
            this.showform3();
            // if (parameter == 1) {
            //     SelectGlassByGlassID(this.glassid2).then(res => {
@@ -2056,7 +2056,7 @@
                }
            });
        },
        SoftEmergencyStop() {
        SoftEmergencyStop2() {
            SoftEmergencyStop.then(res => {
                if (res.data.message == 200) {
                    this.$message.success(this.$t('Operation successful'));
springboot-vue3/src/main/java/com/example/springboot/component/PlcInteractionState.java
@@ -59,6 +59,9 @@
            List<String> addresses5 = Arrays.asList(config.getProperty("PlcInteractionState.MEStaskinformation").split(","));
            List<String> arraylist5 = S7control.getinstance().readStringsandword(addresses5);
            List<String> addresses6 = Arrays.asList(config.getProperty("PlcInteractionState.MEStaskinformation2").split(","));
            List<String> arraylist6 = S7control.getinstance().readStringsandword(addresses6);
//            String[] values = { ".x11","x21 ","x21 ","x21 ","x21 ","x21"};
//   List<String> arraylist = new ArrayList<>(Arrays.asList(values));
@@ -68,8 +71,12 @@
//            List<String> arraylist3 = new ArrayList<>(Arrays.asList(values3));
//            String[] values4 = { ".x11 ","x21 ","x21 ","x21 "};
//            List<String> arraylist4 = new ArrayList<>(Arrays.asList(values4));
//            String[] values5 = { ".x11 ","x21 ","x21 ","x21 ","x21 ","x21 ","x21 ","x21 ","x21 ","x21 "};
//            String[] values5 = { ".x11 ","x21 ","x21 ","b02","x21 ","x21 "};
//            List<String> arraylist5 = new ArrayList<>(Arrays.asList(values5));
//
//            String[] values6 = { "x21 ","x21 ","x21 ","x21 ","x21 ","x21 ","x21 "};
//            List<String> arraylist6 = new ArrayList<>(Arrays.asList(values6));
            JSONObject jsonObject = new JSONObject();
@@ -80,6 +87,7 @@
            jsonArray.put(arraylist3);
            jsonArray.put(arraylist4);
            jsonArray.put(arraylist5);
            jsonArray.put(arraylist6);
            jsonObject.put("zuhe1", jsonArray);
springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
@@ -108,6 +108,20 @@
            List<String> B02start = Arrays.asList(config.getProperty("mlp.B02start"));
            // 故障地址
            List<String> waddresses5 = Arrays.asList(config.getProperty("PlcManualonePosition.fault2").split(","));
            // 复位地址
            List<String> waddresses6 = Arrays.asList(config.getProperty("PlcManualonePosition.Reset").split(","));
            List<Boolean> readreast = S7control.getinstance().readBits(waddresses6);
            short[] reast6 = PLCBooleanConverter.convertListsToBinaryShortArray(readreast);
            // 回零地址
            List<String> waddresses7 = Arrays.asList(config.getProperty("PlcManualonePosition.Zero").split(","));
            List<Boolean> readhuiling = S7control.getinstance().readBits(waddresses7);
            short[] huiling7 = PLCBooleanConverter.convertListsToBinaryShortArray(readhuiling);
            List<Boolean> A01readstart = S7control.getinstance().readBits(A01start);
            List<Boolean> A02readstart = S7control.getinstance().readBits(A02start);
            List<Boolean> B01readstart = S7control.getinstance().readBits(B01start);
@@ -163,6 +177,8 @@
            jsonObject.append("guzhang", params2);
            jsonObject.append("weihuiling", params3);
            jsonObject.append("qidong", combinedBinaryShortArray);
            jsonObject.append("fuwei", reast6);
            jsonObject.append("huiling", huiling7);
//      WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualonePosition");
//      if (sendwServer != null) {
@@ -179,16 +195,6 @@
                        List<String> messages = webserver.getMessages();
                        // 故障地址
                        List<String> waddresses5 = Arrays.asList(config.getProperty("PlcManualonePosition.fault2").split(","));
                        // 复位地址
                        List<String> waddresses6 = Arrays.asList(config.getProperty("PlcManualonePosition.Reset").split(","));
                        // 回零地址
                        List<String> waddresses7 = Arrays.asList(config.getProperty("PlcManualonePosition.Zero").split(","));
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -39,7 +39,7 @@
        //new Plclog().start();
        new PlcInteractionState().start();
new PlcParameter1Review().start();
//new PlcParameter1Review().start();
       // new PLCAutomaticParameterSettingReview().start();
    }
}
springboot-vue3/src/main/resources/config.properties
@@ -218,10 +218,10 @@
PlcInteractionState.PLCProductiontask=DB106.20,DB106.16,DB106.18,DB103.156-169
#任务信息
PlcInteractionState.MEStaskinformation=DB105.48,DB105.50,DB105.48,DB105.50,DB106.42,DB106.48,DB106.50,DB106.58,DB103.128-141,DB103.142-155,DB103.156-169,DB103.184-197,DB103.212-225
PlcInteractionState.MEStaskinformation=DB105.48,DB105.50,DB105.48,DB105.50,DB106.42,DB106.48
#任务信息2
PlcInteractionState.MEStaskinformation2=DB106.52,DB106.58,DB103.128-141,DB103.142-155,DB103.156-169,DB103.184-197,DB103.212-225