diff --git a/acs/nladmin-system/logPath_IS_UNDEFINED/ACS请求WMS/2023-02-03.0.log b/acs/nladmin-system/logPath_IS_UNDEFINED/ACS请求WMS/2023-02-03.0.log new file mode 100644 index 000000000..e69de29bb diff --git a/acs/nladmin-system/logPath_IS_UNDEFINED/ACS请求立库/2023-02-03.0.log b/acs/nladmin-system/logPath_IS_UNDEFINED/ACS请求立库/2023-02-03.0.log new file mode 100644 index 000000000..e69de29bb diff --git a/acs/nladmin-system/logPath_IS_UNDEFINED/AgvNdcOneDeviceDriver/2023-02-03.0.log b/acs/nladmin-system/logPath_IS_UNDEFINED/AgvNdcOneDeviceDriver/2023-02-03.0.log new file mode 100644 index 000000000..e69de29bb diff --git a/acs/nladmin-system/logPath_IS_UNDEFINED/WMS下发ACS/2023-02-03.0.log b/acs/nladmin-system/logPath_IS_UNDEFINED/WMS下发ACS/2023-02-03.0.log new file mode 100644 index 000000000..e69de29bb diff --git a/acs/nladmin-system/logPath_IS_UNDEFINED/一楼NDC系统/2023-02-03.0.log b/acs/nladmin-system/logPath_IS_UNDEFINED/一楼NDC系统/2023-02-03.0.log new file mode 100644 index 000000000..e69de29bb diff --git a/acs/nladmin-system/logPath_IS_UNDEFINED/下发KEP信号/2023-02-03.0.log b/acs/nladmin-system/logPath_IS_UNDEFINED/下发KEP信号/2023-02-03.0.log new file mode 100644 index 000000000..e69de29bb diff --git a/acs/nladmin-system/logPath_IS_UNDEFINED/立库请求ACS/2023-02-03.0.log b/acs/nladmin-system/logPath_IS_UNDEFINED/立库请求ACS/2023-02-03.0.log new file mode 100644 index 000000000..e69de29bb diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java index 7277df9df..950595ff7 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java @@ -828,6 +828,7 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe jo.put("mode", mode); jo.put("move", move); jo.put("action", action); + jo.put("is_click", true); jo.put("isOnline", this.getIsonline()); jo.put("error", this.getError()); jo.put("isError", this.getIserror()); diff --git a/acs/nladmin-ui/src/views/system/monitor/device/index.vue b/acs/nladmin-ui/src/views/system/monitor/device/index.vue index 27daccefa..df82add74 100644 --- a/acs/nladmin-ui/src/views/system/monitor/device/index.vue +++ b/acs/nladmin-ui/src/views/system/monitor/device/index.vue @@ -97,13 +97,13 @@ - + - + @@ -309,7 +309,6 @@ export default { this.dialogFormVisible5 = true } else if (clickObj.data.driver_type === 'standard_conveyor_control_with_scanner') { this.dialogFormVisible5 = true - console.log('11111111111') } else { this.dialogFormVisible = true } @@ -322,6 +321,7 @@ export default { this.form.requireSucess = clickObj.data.requireSucess this.form.fullrequireSucess = clickObj.data.fullrequireSucess this.form.is_disable = clickObj.data.is_disable1 + this.form.applySucess = clickObj.data.applySucess }, moveShow(nodeData) { // 点击之后显示出来的数据----只需要设备信息 let item = ''