From b7188d4a9ac8db316aa402e47c69de8e4da654dc Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Fri, 25 Nov 2022 11:09:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E9=80=89=20=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java | 2 +- acs/nladmin-ui/src/views/acs/route/routeLine/index.vue | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java index a28f39b..5b56bc2 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java @@ -518,7 +518,7 @@ public class HfTwoRGVDeviceDriver extends AbstractOpcDeviceDriver implements Dev this.writing("to_target1", String.valueOf(next_addrIndex)); this.writing("to_task1", instruction.getInstruction_code()); this.writing("to_command1", "1"); - requireHeadSucess = true; + requireBackSucess = true; return true; }else { List taskDtoList = taskserver.queryTaskByDeviceCode(startDeviceCode); diff --git a/acs/nladmin-ui/src/views/acs/route/routeLine/index.vue b/acs/nladmin-ui/src/views/acs/route/routeLine/index.vue index 6c2f897..92d3c0e 100644 --- a/acs/nladmin-ui/src/views/acs/route/routeLine/index.vue +++ b/acs/nladmin-ui/src/views/acs/route/routeLine/index.vue @@ -308,6 +308,11 @@ export default { [CRUD.HOOK.beforeRefresh]() { return true }, + [CRUD.HOOK.beforeToEdit](data) { + this.form.device_code = Array.of(data.form.device_code.split('').join('')) + this.form.next_device_code = Array.of(data.form.next_device_code.split('').join('')) + return true + }, // 改变状态 changeEnabled(data) { var msg = '停用'