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

ZengTao

2023-12-15 7e96470071c4a7d9187d71d4c24d1d02503b0440

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

@@ -134,14 +134,10 @@
            jsonObject.append("D01RequestState", D01RequestState);

            //复位倒计时
            // 地址104.9.6

            List<Boolean> countdown = S7control.getinstance().ReadBits("DB104.9.6", 1);
            for (Boolean countdowns : countdown) {
                jsonObject.append("countdown", countdowns);
            }
            //是否急停
            List<Boolean> emergencystops = S7control.getinstance().ReadBits("DB104.5.1", 1);
            for (Boolean emergencystop : emergencystops) {
                jsonObject.append("emergencystop", emergencystop);
            }
            // jsonObject.append("countdown", true);
            // 铝框线交互