diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java index ad89dd0c2..8617f3bec 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java @@ -801,7 +801,8 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple jo.put("task", task); jo.put("walk_y", String.valueOf(this.walk_y)); jo.put("isOnline", this.getIsonline()); - jo.put("error", this.getError()); + jo.put("error", StrUtil.isNotEmpty(ErrorUtil.getDictDetail("nbjhj_error_type", String.valueOf(this.getError()))) + ?ErrorUtil.getDictDetail("nbjhj_error_type", String.valueOf(this.getError())):this.getError()); jo.put("isError", this.getIserror()); jo.put("message", this.getMessage()); jo.put("is_click", true); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/rgv/RgvDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/rgv/RgvDeviceDriver.java index 7d96453aa..60dbc51f1 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/rgv/RgvDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/rgv/RgvDeviceDriver.java @@ -311,6 +311,8 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr mode = "单机"; } else if (this.getMode() == 2) { mode = "联机"; + } else if (this.getMode() == 3 && this.move2 == 1) { + mode = "等待人工吊卷"; } else if (this.getMode() == 3) { mode = "运行中"; } else if (this.getMode() == 4) { @@ -318,14 +320,14 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr } if (this.getMove1() == 0 && this.getMove2() == 0) { - move1 = "无货"; + move1 = "吊卷位"; move2 = "无货"; jo.put("hasGoods", false); } else if (this.getMove1() == 1 || this.getMove2() == 1) { if(this.getMove1() == 1){ - move1 = "有货"; + move1 = "下卷位"; }else if(this.getMove1() == 0){ - move1 = "无货"; + move2 = "吊卷位"; } if(this.getMove2() == 1){ move2 = "有货"; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java index 2b05d4067..0f318ce3e 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java @@ -287,8 +287,8 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl param.put("product_area", paramService.findByCode("productArea").getValue()); acsToWmsService.sendDeviceStatus(param); - /*logServer.deviceItemValue(this.device_code, "error", String.valueOf(error)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);*/ + logServer.deviceItemValue(this.device_code, "error", String.valueOf(error)); + logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error); } if (status != last_status) { logServer.deviceItemValue(this.device_code, "status", String.valueOf(status)); 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 0aa5a9538..e5a383c6d 100644 --- a/acs/nladmin-ui/src/views/system/monitor/device/index.vue +++ b/acs/nladmin-ui/src/views/system/monitor/device/index.vue @@ -675,10 +675,10 @@ export default { const obj = { name: '重量2', value: data[val] } this.arr.push(obj) } else if (val === 'move1') { - const obj = { name: '光电信号1', value: data[val] } + const obj = { name: '设备工位', value: data[val] } this.arr.push(obj) } else if (val === 'move2') { - const obj = { name: '光电信号2', value: data[val] } + const obj = { name: '设备有无货', value: data[val] } this.arr.push(obj) } else if (val === 'material1') { const obj = { name: '物料1', value: this.dict.label.material[data[val]] } diff --git a/acs2/nladmin-system/logPath_IS_UNDEFINED/ACS请求LMS/2024-03-15.0.log b/acs2/nladmin-system/logPath_IS_UNDEFINED/ACS请求LMS/2024-03-15.0.log deleted file mode 100644 index e69de29bb..000000000 diff --git a/acs2/nladmin-system/logPath_IS_UNDEFINED/ACS请求LMS/2024-03-18.0.log b/acs2/nladmin-system/logPath_IS_UNDEFINED/ACS请求LMS/2024-03-18.0.log deleted file mode 100644 index e69de29bb..000000000 diff --git a/acs2/nladmin-system/logPath_IS_UNDEFINED/ACS请求LMS/2024-03-20.0.log b/acs2/nladmin-system/logPath_IS_UNDEFINED/ACS请求LMS/2024-03-20.0.log deleted file mode 100644 index e69de29bb..000000000 diff --git a/acs2/nladmin-system/logPath_IS_UNDEFINED/LMS下发ACS/2024-03-15.0.log b/acs2/nladmin-system/logPath_IS_UNDEFINED/LMS下发ACS/2024-03-15.0.log deleted file mode 100644 index e69de29bb..000000000 diff --git a/acs2/nladmin-system/logPath_IS_UNDEFINED/LMS下发ACS/2024-03-18.0.log b/acs2/nladmin-system/logPath_IS_UNDEFINED/LMS下发ACS/2024-03-18.0.log deleted file mode 100644 index e69de29bb..000000000 diff --git a/acs2/nladmin-system/logPath_IS_UNDEFINED/LMS下发ACS/2024-03-20.0.log b/acs2/nladmin-system/logPath_IS_UNDEFINED/LMS下发ACS/2024-03-20.0.log deleted file mode 100644 index e69de29bb..000000000 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java index ec02a9c3b..e35b02b3b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java @@ -226,13 +226,10 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements container_type = this.itemProtocol.getContainer_type(); error = this.itemProtocol.getError(); task = this.itemProtocol.getTask(); - container_no = this.itemProtocol.getContainer_no(); - material_barcode= this.itemProtocol.getMaterialBarcode(); to_command = this.itemProtocol.getTo_command(); to_target = this.itemProtocol.getTotarget(); to_task = this.itemProtocol.getTo_task(); to_container_no = this.itemProtocol.getContainer_direction(); - to_container_type = this.itemProtocol.getContainer_no(); if (mode != last_mode) { @@ -547,28 +544,30 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements } private void writeData(String next_addr, List list, Instruction inst) { + List list1 = new ArrayList(); Map map = new HashMap(); map.put("code", "to_target"); map.put("value", next_addr); - list.add(map); + list1.add(map); + this.writing(list1); + List list2 = new ArrayList(); Map map1 = new HashMap(); map1.put("code", "to_task"); map1.put("value", inst.getInstruction_code()); - list.add(map1); - Map map2 = new HashMap(); - map2.put("code", "to_command"); - map2.put("value", "1"); - list.add(map2); + list2.add(map); + this.writing(list2); + List list4 = new ArrayList(); Map map3 = new HashMap(); map3.put("code", "to_container_type"); map3.put("value", inst.getVehicle_type()); - list.add(map3); - Map map4 = new HashMap(); - map4.put("code", "to_container_no"); - map4.put("value", "1"); - list.add(map4); - - this.writing(list); + list4.add(map3); + this.writing(list4); + List list3 = new ArrayList(); + Map map2 = new HashMap(); + map2.put("code", "to_command"); + map2.put("value", "1"); + list3.add(map2); + this.writing(list3); } private static void packageData(Instruction instdto, String route_plan_code, TaskDto taskdto, String taskid, String taskcode, String start_device_code, String next_device_code, String start_point_code, String next_point_code, String priority) { @@ -678,32 +677,19 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements jo.put("mode", mode); jo.put("message", LangProcess.msg(message)); jo.put("error", this.getError()); + String move = "无货"; + if(this.move == 1){ + move = "有货"; + } jo.put("move", move); + jo.put("task", task); + jo.put("type", container_type); jo.put("is_click", true); jo.put("isOnline", this.getIsonline()); jo.put("requireSucess", requireSucess); return jo; } -// /** -// * 获取任务信息 -// */ -// public JSONObject getLedMessage(Instruction instdto) { -// JSONObject json = new JSONObject(); -// json.put("task_code", instdto.getTask_code()); -// json.put("inst_code", instdto.getInstruction_code()); -// json.put("start_device_code", instdto.getStart_device_code()); -// json.put("next_device_code", instdto.getNext_device_code()); -// json.put("material_type", instdto.getMaterial()); -// json.put("quantity", instdto.getQuantity()); -// json.put("vehicle_code", instdto.getVehicle_code()); -// json.put("instruction_status", instdto.getInstruction_status()); -// json.put("entry_time", instdto.getCreate_time()); -// String acsIp = paramService.findByCode(AcsConfig.ACSIP).getValue(); -// json.put("ip", acsIp); -// return json; -// } - /** * 更新指令状态 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java index 9077fd383..f5f7081c4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java @@ -45,15 +45,6 @@ public class ItemProtocol { * 任务号 */ public static String item_task = "task"; - /** - * 出数字托盘号 - */ - public static String item_container_no = "container_no"; - - /** - * 子卷条码 - */ - public static String item_material_barcode = "material_barcode"; /** * 下发命令 @@ -63,10 +54,6 @@ public class ItemProtocol { * 下发托盘类型 */ public static String item_to_container_type = "to_container_type"; - /** - * 下发接纯数字托盘号 - */ - public static String item_to_container_no = "to_container_no"; /** * 下发任务号 */ @@ -76,11 +63,6 @@ public class ItemProtocol { */ public static String item_to_target = "to_target"; - /** - * 托盘条码 - */ - public static String item_barcode = "barcode"; - @@ -90,9 +72,6 @@ public class ItemProtocol { this.driver = driver; } - public String getMaterialBarcode() { - return this.getOpcStringValue(item_material_barcode); - } public int getHeartbeat() { return this.getOpcIntegerValue(item_heartbeat); } @@ -117,9 +96,6 @@ public class ItemProtocol { return this.getOpcIntegerValue(item_action); } - public int getContainer_no() { - return this.getOpcIntegerValue(item_container_no); - } public int getError() { return this.getOpcIntegerValue(item_error); @@ -133,9 +109,6 @@ public class ItemProtocol { return this.getOpcIntegerValue(item_to_task); } - public String getBarcode() { - return this.getOpcStringValue(item_barcode); - } @@ -151,9 +124,6 @@ public class ItemProtocol { return this.getOpcIntegerValue(item_to_container_type); } - public int getTo_container_no() { - return this.getOpcIntegerValue(item_to_container_no); - } Boolean isonline; @@ -198,12 +168,9 @@ public class ItemProtocol { list.add(new ItemDto(item_move, "光电信号", "DB101.B3")); list.add(new ItemDto(item_container_direction, "托盘方向", "DB101.B4")); list.add(new ItemDto(item_container_type, "托盘类型", "DB101.B5")); - list.add(new ItemDto(item_container_no, "纯数字托盘号", "DB101.D7")); list.add(new ItemDto(item_action, "动作类型", "DB101.B6")); list.add(new ItemDto(item_error, "报警", "DB101.B58")); list.add(new ItemDto(item_task, "任务号", "DB101.D68")); - list.add(new ItemDto(item_material_barcode, "子卷条码", "DB601.STRING1.50")); - list.add(new ItemDto(item_barcode, "托盘条码", "DB602.STRING1.50")); return list; } @@ -212,7 +179,6 @@ public class ItemProtocol { list.add(new ItemDto(item_to_target, "下发仓位号", "DB102.W2")); list.add(new ItemDto(item_to_command, "下发命令", "DB102.W4")); list.add(new ItemDto(item_to_task, "下发任务号", "DB102.D1")); - list.add(new ItemDto(item_to_container_no, "下发接纯数字托盘号", "DB102.D3")); list.add(new ItemDto(item_to_container_type, "下发托盘类型", "DB102.B5")); return list; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/ItemProtocol.java index 1f9095e80..7193f6337 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/ItemProtocol.java @@ -121,7 +121,7 @@ public class ItemProtocol { /** *木箱宽度 */ - public static String item_to_weight = "to_weight"; + public static String item_to_weight = "to_width"; /** *木箱高度 */ 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 cf482826e..81a79cef1 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 @@ -144,9 +144,9 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv String hand_material_barcode = null; - //数量 - int qty = 0; - int last_qty = 0; + //高度 + int height = 0; + int last_height = 0; //托盘方向 int carrier_direction = 0; @@ -219,7 +219,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv to_container_type = this.itemProtocol.getTo_container_type(); container_type = this.itemProtocol.getContainer_type(); carrier_direction = this.itemProtocol.getCarrier_direction(); - qty = this.itemProtocol.getQty(); + height = this.itemProtocol.getHeight(); weight = this.itemProtocol.getWeight(); barcode = this.itemProtocol.getBarcode(); material_barcode = this.itemProtocol.getMaterialBarcode(); @@ -338,7 +338,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv last_hj_task = hj_task; last_container_type = container_type; last_carrier_direction = carrier_direction; - last_qty = qty; + last_height = height; last_weight = weight; last_barcode = barcode; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ItemProtocol.java index d13d403d8..092dfa643 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ItemProtocol.java @@ -32,9 +32,9 @@ public class ItemProtocol { */ public static String item_error = "error"; /** - * 数量 + * 高度 */ - public static String item_qty = "qty"; + public static String item_height = "height"; /** * 任务号 */ @@ -112,8 +112,8 @@ public class ItemProtocol { return this.getOpcIntegerValue(item_task); } - public int getQty(){ - return this.getOpcIntegerValue(item_qty); + public int getHeight(){ + return this.getOpcIntegerValue(item_height); } public int getCarrier_direction(){ @@ -189,7 +189,7 @@ public class ItemProtocol { list.add(new ItemDto(item_task, "任务号", "DB1.D6")); list.add(new ItemDto(item_container_type, "托盘类型", "DB1.B7")); list.add(new ItemDto(item_carrier_direction, "托盘方向", "DB1.B8")); - list.add(new ItemDto(item_qty, "数量", "DB1.B9")); + list.add(new ItemDto(item_height, "高度", "DB1.B9")); list.add(new ItemDto(item_weight, "重量", "DB1.B10")); list.add(new ItemDto(item_barcode, "托盘条码", "DB602.STRING1.50")); list.add(new ItemDto(item_material_barcode, "子卷条码", "DB601.STRING1.50")); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/InteractionJsonDTO.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/InteractionJsonDTO.java index f6dbff375..1c14d4236 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/InteractionJsonDTO.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/InteractionJsonDTO.java @@ -11,7 +11,7 @@ public class InteractionJsonDTO { private String maxNo; /** - *木箱最大数量 + *木箱放入数量 */ private String boxNo; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java index cfeaad9c6..700cc05e3 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java @@ -233,8 +233,8 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } } - //放货完成 - if (action == 4 && move == 0) { + //任务完成 + if (action == 5 && move == 0) { if (inst != null) { try { logServer.deviceExecuteLog(this.device_code, "", "", "放货完成"); @@ -351,7 +351,7 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i notCreateInstMessage = "universal_notCreateInstMessage1"; throw new BadRequestException("设备：" + nextDevice.getDevice_code() + "未设置电气调度号！"); } - //存在托盘才可以申请任务 + /*//存在托盘才可以申请任务 BeltConveyorDeviceDriver beltConveyorDeviceDriver; if (nextDevice.getDeviceDriver() instanceof BeltConveyorDeviceDriver) { beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) nextDevice.getDeviceDriver(); @@ -359,7 +359,7 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i notCreateInstMessage = "universal_notCreateInstMessage2"; return false; } - } + }*/ String taskid = taskDto.getTask_id(); @@ -451,6 +451,12 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i map9.put("value", interactionJsonDTO.getLayer()); list.add(map9); } + if (ObjectUtil.isNotEmpty(interactionJsonDTO.getContainerType())) { + Map map10 = new HashMap<>(); + map10.put("code", "to_type"); + map10.put("value", interactionJsonDTO.getContainerType()); + list.add(map10); + } } this.writing(list); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/InteractionJsonDTO.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/InteractionJsonDTO.java index d791018fb..6ea0450bf 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/InteractionJsonDTO.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/InteractionJsonDTO.java @@ -28,4 +28,9 @@ public class InteractionJsonDTO { */ private String layer; + /** + * 托盘类型 + */ + private String containerType; + } diff --git a/acs2/nladmin-ui/dist (2).zip b/acs2/nladmin-ui/dist (2).zip deleted file mode 100644 index 7431eb8e4..000000000 Binary files a/acs2/nladmin-ui/dist (2).zip and /dev/null differ diff --git a/acs2/nladmin-ui/dist.zip b/acs2/nladmin-ui/dist.zip deleted file mode 100644 index df068c6bb..000000000 Binary files a/acs2/nladmin-ui/dist.zip and /dev/null differ 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 c39409845..a2858741c 100644 --- a/acs2/nladmin-ui/src/views/system/monitor/device/index.vue +++ b/acs2/nladmin-ui/src/views/system/monitor/device/index.vue @@ -252,8 +252,6 @@ import deviceCrud from '@/api/acs/device/device' import { getDeviceByCodes } from '@/api/acs/device/deviceStageMonitor' import '@logicflow/core/dist/style/index.css' import '@logicflow/extension/lib/style/index.css' -import paramCrud from '@/api/system/param' - import { LogicFlow } from '@logicflow/core' import { registerCustomElement } from '@/views/system/logicflow/editor/components/node' import i18n from '@/i18n' @@ -520,6 +518,9 @@ export default { } else if (val === 'last_inst_message') { const obj = { name: i18n.t('monitor.click.last_instruction_message'), value: data[val] } this.arr.push(obj) + } else if (val === 'container_type') { + const obj = { name: '托盘类型', value: data[val] } + this.arr.push(obj) } else if (val === 'barcode') { const obj = { name: i18n.t('monitor.click.barcode'), value: data[val] } this.arr.push(obj)