From b4278445d7b578f33c08bda340b34f6a89e501a2 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 15 十二月 2023 13:47:55 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 1 +
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 4 +++-
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 9 ++++++++-
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index b137523..ed730fa 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -891,6 +891,7 @@
this.CountDown();
}
//鏄惁鏈夎繘鐗囪姹�
+ console.log(obj.D01RequestState[0]);
this.D01RequestState = obj.D01RequestState[0];
//鏄惁鍏佽鍑虹墖
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
index 811fd04..c093df8 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
@@ -48,12 +48,14 @@
boolean B02backs = spianService.listbool("DB106.62");// b02姹囨姤
StringBuilder B01glassid = spianService.queGlassid("DB103.184", 14);// BO1鐨勭幓鐠僫d
StringBuilder B02glassid = spianService.queGlassid("DB103.212", 14);// B02鐨勭幓鐠僫d
+ int aaa=1;
// 褰撹繘鐗囧皬杞﹀畬鎴愪换鍔℃椂
if (B01backs == true) {
// 褰揃01灏忚溅姹囨姤瀹屾垚鏃舵洿鏀圭幓鐠冪姸鎬� 涓�1
spianService.overtask(B01glassid.toString());// 瀹屾垚浠诲姟
S7control.getinstance().WriteWord("DB106.60", (short) 0);// 鎭㈠B01灏忚溅搴旂瓟鏀逛负0
- System.out.println("姹囨姤鏃禕01|" + B01glassid);
+ System.out.println("姹囨姤鏃禕01|绗�"+aaa+"娆�"+ B01glassid);
+ aaa+=1;
}
// 褰撳嚭鐗囧皬杞﹀畬鎴愪换鍔℃椂
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
index 67666ae..34a8ef2 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -129,7 +129,7 @@
//鑾峰彇杩涚墖璇锋眰鐘舵��
List<Short> D01Request = S7control.getinstance().ReadWord("DB106.24", 1);
- boolean D01RequestState = D01Request.contains((short) 1);
+ boolean D01RequestState = D01Request.contains((short)1);
// boolean D01RequestState =true;
jsonObject.append("D01RequestState", D01RequestState);
@@ -140,6 +140,13 @@
jsonObject.append("countdown", countdowns);
}
// jsonObject.append("countdown", true);
+
+ //鏄惁鎬ュ仠
+ List<Boolean> emergencystops = S7control.getinstance().ReadBits("DB104.5.1", 1);
+ for (Boolean emergencystop : emergencystops) {
+ jsonObject.append("emergencystop", emergencystop);
+ }
+
// 閾濇绾夸氦浜�
// //閾濇id璇锋眰瀛�
--
Gitblit v1.8.0