From 5b279f2149113c634bb15df3e5b60951fb15a32c Mon Sep 17 00:00:00 2001 From: lishuai <1793460677@qq.com> Date: Tue, 18 Jun 2024 13:27:44 +0800 Subject: [PATCH] =?UTF-8?q?add:=20=E5=89=8D=E6=AE=B5=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- acs2/nladmin-ui/src/views/acs/device/driver/belt_conveyor.vue | 4 ++-- acs2/nladmin-ui/src/views/system/monitor/device/index.vue | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/acs2/nladmin-ui/src/views/acs/device/driver/belt_conveyor.vue b/acs2/nladmin-ui/src/views/acs/device/driver/belt_conveyor.vue index 3149a4086..5726bc071 100644 --- a/acs2/nladmin-ui/src/views/acs/device/driver/belt_conveyor.vue +++ b/acs2/nladmin-ui/src/views/acs/device/driver/belt_conveyor.vue @@ -50,7 +50,7 @@ - + @@ -265,7 +265,7 @@ export default { data2: [], form: { inspect_in_stocck: true, - ignore_pickup_check: true, + ignore_pickup_check: false, ignore_release_check: true, apply_task: true, link_three_lamp: '', 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 6ad55d6a1..52720ae9e 100644 --- a/acs2/nladmin-ui/src/views/system/monitor/device/index.vue +++ b/acs2/nladmin-ui/src/views/system/monitor/device/index.vue @@ -742,6 +742,9 @@ export default { } else if (val === 'task_id') { const obj = { name: i18n.t('monitor.click.task_number'), value: data[val] } this.arr.push(obj) + } else if (val === 'command') { + const obj = { name: i18n.t('monitor.click.command'), value: data[val] } + this.arr.push(obj) } } }