From 4df8527bb4eee49c1358fbd00523918255fe0ddc Mon Sep 17 00:00:00 2001 From: yanps Date: Tue, 14 May 2024 09:00:00 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E5=8E=86=E5=8F=B2=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=98=BE=E7=A4=BA=E8=B5=B7=E7=82=B92?= =?UTF-8?q?=E7=BB=88=E7=82=B92,=E7=9B=91=E6=8E=A7=E5=A4=A7=E5=B1=8F2?= =?UTF-8?q?=E7=A7=92=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StandardInspectSiteDeviceDriver.java | 1 - .../pull_head_manipulator/ItemProtocol.java | 2 +- .../pull_tail_manipulator/ItemProtocol.java | 2 +- .../service/impl/InstructionServiceImpl.java | 4 + .../views/acs/history/instRecord/index.vue | 16 +- .../views/acs/history/taskRecord/index.vue | 2 + .../src/views/system/monitor/device/index.vue | 203 +++++++++--------- 7 files changed, 125 insertions(+), 105 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java index 6b296d1ed..706f5e37d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java @@ -197,7 +197,6 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp //未联机 } else if (mode == 0) { this.setIsonline(false); - this.setIserror(true); message = "未联机"; //有报警 } else if (error != 0) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/ItemProtocol.java index 41e61bbcc..91b029f4d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/ItemProtocol.java @@ -127,7 +127,7 @@ public class ItemProtocol { Boolean isonline; - Boolean isError; + Boolean isError = false; public int getOpcIntegerValue(String protocol) { Integer value = this.driver.getIntegeregerValue(protocol); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/ItemProtocol.java index 020d30dbe..270aa9b02 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/ItemProtocol.java @@ -113,7 +113,7 @@ public class ItemProtocol { } Boolean isonline; - Boolean isError; + Boolean isError = false; public int getOpcIntegerValue(String protocol) { Integer value = this.driver.getIntegeregerValue(protocol); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index 9d60e98e9..e441959ea 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -235,6 +235,7 @@ public class InstructionServiceImpl extends CommonServiceImpl queryPage = PageUtil.toMybatisPage(page); @@ -252,6 +253,9 @@ public class InstructionServiceImpl extends CommonServiceImpl instructionMybatis.like(InstructionMybatis::getStart_point_code, point_code).or().like(InstructionMybatis::getNext_point_code, point_code)); } diff --git a/acs2/nladmin-ui/src/views/acs/history/instRecord/index.vue b/acs2/nladmin-ui/src/views/acs/history/instRecord/index.vue index 18c5fdcfd..dcedbedd2 100644 --- a/acs2/nladmin-ui/src/views/acs/history/instRecord/index.vue +++ b/acs2/nladmin-ui/src/views/acs/history/instRecord/index.vue @@ -60,6 +60,20 @@ + + + + + + + diff --git a/acs2/nladmin-ui/src/views/system/monitor/device/index.vue b/acs2/nladmin-ui/src/views/system/monitor/device/index.vue index b480afcc2..15b5d14ad 100644 --- a/acs2/nladmin-ui/src/views/system/monitor/device/index.vue +++ b/acs2/nladmin-ui/src/views/system/monitor/device/index.vue @@ -9,7 +9,7 @@ /> -
+
- + - + @@ -62,7 +62,7 @@ - + @@ -72,7 +72,7 @@ - +