diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java index aea161fe8..c0192f9a8 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java @@ -629,16 +629,16 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv */ public JSONObject clearMessage() { JSONObject json = new JSONObject(); - json.put("task_code", ""); - json.put("inst_code", ""); - json.put("start_device_code", ""); - json.put("next_device_code", ""); - json.put("material_type", ""); - json.put("quantity", ""); - json.put("vehicle_code", ""); - json.put("instruction_status", ""); - json.put("entry_time", ""); - json.put("ip", ""); + json.put("task_code", "0"); + json.put("inst_code", "0"); + json.put("start_device_code", "0"); + json.put("next_device_code", "0"); + json.put("material_type", "0"); + json.put("quantity", "0"); + json.put("vehicle_code", "0"); + json.put("instruction_status", "0"); + json.put("entry_time", "0"); + json.put("ip", "0"); return json; } diff --git a/acs2/nladmin-ui/src/assets/images/bg_monitor.jpg b/acs2/nladmin-ui/src/assets/images/bg_monitor.jpg new file mode 100644 index 000000000..766397260 Binary files /dev/null and b/acs2/nladmin-ui/src/assets/images/bg_monitor.jpg differ diff --git a/acs2/nladmin-ui/src/views/system/logicflow/editor/components/node/html/htmlNode.js b/acs2/nladmin-ui/src/views/system/logicflow/editor/components/node/html/htmlNode.js index 10decf242..d91ec7559 100644 --- a/acs2/nladmin-ui/src/views/system/logicflow/editor/components/node/html/htmlNode.js +++ b/acs2/nladmin-ui/src/views/system/logicflow/editor/components/node/html/htmlNode.js @@ -6,8 +6,8 @@ import icon_alert from '../../../image/icon_alert.png' class ButtonNodeModel extends HtmlResize.model { initNodeData(data) { super.initNodeData(data) - this.width = 100 - this.height = 100 + this.width = 60 + this.height = 60 this.text.draggable = true this.text.editable = false } @@ -66,7 +66,7 @@ class ButtonNode extends HtmlResize.view { // el.id = 'uml-app' const html = `
-
+
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 717b97213..790756ab5 100644 --- a/acs2/nladmin-ui/src/views/system/monitor/device/index.vue +++ b/acs2/nladmin-ui/src/views/system/monitor/device/index.vue @@ -248,6 +248,7 @@