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

wu

2023-12-20 0be2f95c0042bacfab5965bdf127046ad04ea488

 springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java

@@ -140,6 +140,11 @@
                jsonObject.append("countdown", countdowns);

            }

            // jsonObject.append("countdown", true);

            // 复位完成信号

            List<Boolean> resets = S7control.getinstance().ReadBits("DB103.284", 1);

            for (Boolean reset : resets) {

                jsonObject.append("reset", reset);

            }



            //是否急停

            List<Boolean> emergencystops = S7control.getinstance().ReadBits("DB104.5.1", 1);