From a2a817ad244c00015168bd94653daf0552b9c7df Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Thu, 6 Apr 2023 10:40:52 +0800 Subject: [PATCH] =?UTF-8?q?rev=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/acs/device/config.vue | 16 +++--- .../hailiang_old_special_device.vue | 8 +-- .../hailiang_old_special_pick_station.vue | 4 +- .../hailiang_old_special_pour_station.vue | 4 +- .../acs/history/deviceErrorInfo/index.vue | 18 +++---- .../views/acs/history/instRecord/index.vue | 50 ++++++++--------- .../views/acs/history/taskRecord/index.vue | 46 ++++++++-------- .../acs/history/taskTreeRecord/index.vue | 36 ++++++------- .../src/views/acs/instruction/index.vue | 54 +++++++++---------- wcs/nladmin-ui/src/views/acs/order/index.vue | 46 ++++++++-------- wcs/nladmin-ui/src/views/acs/task/index.vue | 52 +++++++++--------- .../src/views/system/monitor/device/index.vue | 6 +-- 12 files changed, 171 insertions(+), 169 deletions(-) diff --git a/wcs/nladmin-ui/src/views/acs/device/config.vue b/wcs/nladmin-ui/src/views/acs/device/config.vue index 7cf18505..0be5ec77 100644 --- a/wcs/nladmin-ui/src/views/acs/device/config.vue +++ b/wcs/nladmin-ui/src/views/acs/device/config.vue @@ -22,13 +22,13 @@ :value="item.value" /> - + - - + + @@ -36,8 +36,8 @@ - - + + @@ -63,7 +63,7 @@ - + @@ -80,7 +80,7 @@ import standard_manipulator_inspect_site from './driver/standard_manipulator_ins import standard_special_inspect_site from './driver/standard_special_inspect_site' import special_ordinary_site from './driver/special_ordinary_site' import standard_conveyor_control_with_plcscanner - from '@/views/acs/device/driver/standard_conveyor_control_with_plcscanner' +from '@/views/acs/device/driver/standard_conveyor_control_with_plcscanner' import non_line_manipulator_inspect_site from '@/views/acs/device/driver/non_line_manipulator_inspect_site' import non_line_inspect_site from '@/views/acs/device/driver/non_line_inspect_site' import manipulator_inspect_site_NDC from '@/views/acs/device/driver/manipulator_inspect_site_NDC' @@ -108,7 +108,7 @@ import hailiang_auto_cache_line from '@/views/acs/device/driver/hailiang_one/hai import hailiang_cleaning_feeding_line from '@/views/acs/device/driver/hailiang_one/hailiang_cleaning_feeding_line' import hailiang_cleaning_machine from '@/views/acs/device/driver/hailiang_one/hailiang_cleaning_machine' import hailiang_cleaning_machine_storage_station - from '@/views/acs/device/driver/hailiang_one/hailiang_cleaning_machine_storage_station' +from '@/views/acs/device/driver/hailiang_one/hailiang_cleaning_machine_storage_station' import agv_ndc_one from '@/views/acs/device/driver/agv/agv_ndc_one' import agv_ndc_two from '@/views/acs/device/driver/agv/agv_ndc_two' import hailiang_xj_plc_test from '@/views/acs/device/driver/hailiang_one/hailiang_xj_plc_test' diff --git a/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_one/hailiang_old_special_device.vue b/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_one/hailiang_old_special_device.vue index df7e6764..27ad70c0 100644 --- a/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_one/hailiang_old_special_device.vue +++ b/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_one/hailiang_old_special_device.vue @@ -86,15 +86,17 @@ + type="number" + oninput="value = value.replace(/[^\d]/g, '')" + /> + v-model="form.ip_address" + /> diff --git a/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_one/hailiang_old_special_pick_station.vue b/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_one/hailiang_old_special_pick_station.vue index 13615597..7ecfc6d2 100644 --- a/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_one/hailiang_old_special_pick_station.vue +++ b/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_one/hailiang_old_special_pick_station.vue @@ -85,8 +85,8 @@ - - + + diff --git a/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_one/hailiang_old_special_pour_station.vue b/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_one/hailiang_old_special_pour_station.vue index 1def2f54..e917194b 100644 --- a/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_one/hailiang_old_special_pour_station.vue +++ b/wcs/nladmin-ui/src/views/acs/device/driver/hailiang_one/hailiang_old_special_pour_station.vue @@ -85,12 +85,12 @@ - + - + diff --git a/wcs/nladmin-ui/src/views/acs/history/deviceErrorInfo/index.vue b/wcs/nladmin-ui/src/views/acs/history/deviceErrorInfo/index.vue index 59f9af6b..9b5f6c50 100644 --- a/wcs/nladmin-ui/src/views/acs/history/deviceErrorInfo/index.vue +++ b/wcs/nladmin-ui/src/views/acs/history/deviceErrorInfo/index.vue @@ -31,10 +31,10 @@ class="filter-item" @keyup.enter.native="crud.toQuery" /> - + - + - + diff --git a/wcs/nladmin-ui/src/views/acs/history/instRecord/index.vue b/wcs/nladmin-ui/src/views/acs/history/instRecord/index.vue index eabb7f44..0f3a4aa3 100644 --- a/wcs/nladmin-ui/src/views/acs/history/instRecord/index.vue +++ b/wcs/nladmin-ui/src/views/acs/history/instRecord/index.vue @@ -32,7 +32,7 @@ style="width: 190px" @change="crud.toQuery" > - + - + - + - + - + - + - + - + diff --git a/wcs/nladmin-ui/src/views/acs/history/taskRecord/index.vue b/wcs/nladmin-ui/src/views/acs/history/taskRecord/index.vue index 06f0c181..206d89d3 100644 --- a/wcs/nladmin-ui/src/views/acs/history/taskRecord/index.vue +++ b/wcs/nladmin-ui/src/views/acs/history/taskRecord/index.vue @@ -32,7 +32,7 @@ style="width: 190px" @change="crud.toQuery" > - + - + - + - + - + - + - + - + diff --git a/wcs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue b/wcs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue index 4f297e78..0689c7e9 100644 --- a/wcs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue +++ b/wcs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue @@ -43,7 +43,7 @@ style="width: 190px" @change="crud.toQuery" > - + - + - + - + - - + + - - - - - - + + + + + + - - - - - + + + + + - + diff --git a/wcs/nladmin-ui/src/views/acs/instruction/index.vue b/wcs/nladmin-ui/src/views/acs/instruction/index.vue index 01711c6c..985f07dd 100644 --- a/wcs/nladmin-ui/src/views/acs/instruction/index.vue +++ b/wcs/nladmin-ui/src/views/acs/instruction/index.vue @@ -32,7 +32,7 @@ style="width: 190px" @change="crud.toQuery" > - + - + - + @@ -80,16 +80,16 @@ > - + - + - + - + diff --git a/wcs/nladmin-ui/src/views/acs/order/index.vue b/wcs/nladmin-ui/src/views/acs/order/index.vue index 6e2b448c..ebaa58c9 100644 --- a/wcs/nladmin-ui/src/views/acs/order/index.vue +++ b/wcs/nladmin-ui/src/views/acs/order/index.vue @@ -41,9 +41,9 @@ style="width: 190px" @change="crud.toQuery" > - + - + @@ -79,22 +79,22 @@ > - + - + - + - + - + - + - + @@ -138,32 +138,32 @@ style="width: 100%;" @selection-change="crud.selectionChangeHandler" > - - + + - - - - - - + + + + + + - - - - - + + + + + - + diff --git a/wcs/nladmin-ui/src/views/acs/task/index.vue b/wcs/nladmin-ui/src/views/acs/task/index.vue index cd866f83..c9493ace 100644 --- a/wcs/nladmin-ui/src/views/acs/task/index.vue +++ b/wcs/nladmin-ui/src/views/acs/task/index.vue @@ -32,7 +32,7 @@ style="width: 190px" @change="crud.toQuery" > - + - + - + @@ -84,7 +84,7 @@ - + - + - + - + - + diff --git a/wcs/nladmin-ui/src/views/system/monitor/device/index.vue b/wcs/nladmin-ui/src/views/system/monitor/device/index.vue index f4be0ede..f55c62c6 100644 --- a/wcs/nladmin-ui/src/views/system/monitor/device/index.vue +++ b/wcs/nladmin-ui/src/views/system/monitor/device/index.vue @@ -38,9 +38,9 @@ - 禁止进出 - 允许进入 - 允许离开 + 禁止进出 + 允许进入 + 允许离开