From c8289c743578df5d268bdf70033447a7b49a8750 Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Wed, 2 Aug 2023 17:24:12 +0800
Subject: [PATCH] rev

---
 .../LnshStationDeviceDriver.java              |   40 +-
 .../ConveyorPressStationDeviceDriver.java     |   40 +-
 .../LnshMixingMillDeviceDriver.java           |    8 +-
 ...nshPalletizingManipulatorDeviceDriver.java |    4 +-
 ...alletizingManipulatorSiteDeviceDriver.java |    2 +-
 .../lnsh_press/LnshPressDeviceDriver.java     |  121 +-
 .../lnsh_station/LnshStationDeviceDriver.java |   42 +-
 .../main/java/org/nl/acs/ext/wms/LmsUtil.java |   10 +-
 .../java/org/nl/acs/ext/wms/RespUtil.java     |    1 -
 .../java/org/nl/acs/ext/wms/data/Resp.java    |   19 +-
 .../main/resources/config/application-dev.yml |    5 +-
 .../acs/device/driver/lnsh/lnsh_press.vue     |  126 +-
 .../src/views/acs/monitor/device/index.vue    | 1170 +++++++++++------
 13 files changed, 1041 insertions(+), 547 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/converor_barcode/LnshStationDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/converor_barcode/LnshStationDeviceDriver.java
index 137fc84..2740de8 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/converor_barcode/LnshStationDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/converor_barcode/LnshStationDeviceDriver.java
@@ -486,12 +486,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             message = RequestMethodEnum.getName("apply_put_full_vehicle") + "apply_put_full_vehicle 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
             Resp resp = acsToWmsService.applyTask(request);
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("apply_put_full_vehicle") + "apply_put_full_vehicle 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("apply_put_full_vehicle") + "apply_put_full_vehicle 接口请求失败" + resp.getMessage();;
             }
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
             return true;
@@ -519,12 +519,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
@@ -551,12 +551,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             message = RequestMethodEnum.getName("apply_take_empty_vehicle") + "apply_take_empty_vehicle 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("apply_take_empty_vehicle") + "apply_take_empty_vehicle 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("apply_take_empty_vehicle") + "apply_take_empty_vehicle 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
@@ -584,12 +584,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
@@ -616,12 +616,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             message = RequestMethodEnum.getName("apply_force_take_full_vehicle") + "apply_force_take_full_vehicle 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("apply_force_take_full_vehicle") + "apply_force_take_full_vehicle 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("apply_force_take_full_vehicle") + "apply_force_take_full_vehicle 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
@@ -648,12 +648,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             message = RequestMethodEnum.getName("apply_force_take_full_vehicle_in_storage") + "apply_force_take_full_vehicle_in_storage 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("apply_force_take_full_vehicle_in_storage") + "apply_force_take_full_vehicle_in_storage 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("apply_force_take_full_vehicle_in_storage") + "apply_force_take_full_vehicle_in_storage 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
@@ -680,12 +680,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             message = RequestMethodEnum.getName("barcode_sucess_apply") + "barcode_sucess_apply 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("barcode_sucess_apply") + "barcode_sucess_apply 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("barcode_sucess_apply") + "barcode_sucess_apply 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
@@ -712,12 +712,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             message = RequestMethodEnum.getName("get_vehicle_info") + "get_vehicle_info 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("get_vehicle_info") + "get_vehicle_info 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("get_vehicle_info") + "get_vehicle_info 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
@@ -743,12 +743,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             message = RequestMethodEnum.getName("force_no_package") + "force_no_package 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("force_no_package") + "force_no_package 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("force_no_package") + "force_no_package 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
@@ -774,12 +774,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             message = RequestMethodEnum.getName("apply_labelling") + "apply_labelling 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("apply_labelling") + "apply_labelling 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("apply_labelling") + "apply_labelling 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ConveyorPressStationDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ConveyorPressStationDeviceDriver.java
index 2476966..a28cbd5 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ConveyorPressStationDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ConveyorPressStationDeviceDriver.java
@@ -486,12 +486,12 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im
             message = RequestMethodEnum.getName("apply_put_full_vehicle") + "apply_put_full_vehicle 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
             Resp resp = acsToWmsService.applyTask(request);
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("apply_put_full_vehicle") + "apply_put_full_vehicle 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("apply_put_full_vehicle") + "apply_put_full_vehicle 接口请求失败" + resp.getMessage();;
             }
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
             return true;
@@ -519,12 +519,12 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im
             message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
@@ -551,12 +551,12 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im
             message = RequestMethodEnum.getName("apply_take_empty_vehicle") + "apply_take_empty_vehicle 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("apply_take_empty_vehicle") + "apply_take_empty_vehicle 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("apply_take_empty_vehicle") + "apply_take_empty_vehicle 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
@@ -584,12 +584,12 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im
             message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
@@ -616,12 +616,12 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im
             message = RequestMethodEnum.getName("apply_force_take_full_vehicle") + "apply_force_take_full_vehicle 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("apply_force_take_full_vehicle") + "apply_force_take_full_vehicle 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("apply_force_take_full_vehicle") + "apply_force_take_full_vehicle 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
@@ -648,12 +648,12 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im
             message = RequestMethodEnum.getName("apply_force_take_full_vehicle_in_storage") + "apply_force_take_full_vehicle_in_storage 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("apply_force_take_full_vehicle_in_storage") + "apply_force_take_full_vehicle_in_storage 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("apply_force_take_full_vehicle_in_storage") + "apply_force_take_full_vehicle_in_storage 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
@@ -680,12 +680,12 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im
             message = RequestMethodEnum.getName("barcode_sucess_apply") + "barcode_sucess_apply 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("barcode_sucess_apply") + "barcode_sucess_apply 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("barcode_sucess_apply") + "barcode_sucess_apply 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
@@ -712,12 +712,12 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im
             message = RequestMethodEnum.getName("get_vehicle_info") + "get_vehicle_info 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("get_vehicle_info") + "get_vehicle_info 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("get_vehicle_info") + "get_vehicle_info 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
@@ -743,12 +743,12 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im
             message = RequestMethodEnum.getName("force_no_package") + "force_no_package 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("force_no_package") + "force_no_package 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("force_no_package") + "force_no_package 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
@@ -774,12 +774,12 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im
             message = RequestMethodEnum.getName("apply_labelling") + "apply_labelling 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("apply_labelling") + "apply_labelling 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("apply_labelling") + "apply_labelling 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java
index bffbb20..0e709c8 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java
@@ -397,12 +397,12 @@ public class LnshMixingMillDeviceDriver extends AbstractOpcDeviceDriver implemen
             message = RequestMethodEnum.getName("order_verify") + "order_verify 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
             Resp resp = acsToWmsService.applyTask(request);
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("order_verify") + "order_verify 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("order_verify") + "order_verify 接口请求失败" + resp.getMessage();;
             }
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
         }
@@ -419,12 +419,12 @@ public class LnshMixingMillDeviceDriver extends AbstractOpcDeviceDriver implemen
             message = RequestMethodEnum.getName("order_finish") + "order_finish 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
             Resp resp = acsToWmsService.applyTask(request);
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("order_finish") + "order_finish 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("order_finish") + "order_finish 接口请求失败" + resp.getMessage();;
             }
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
         }
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java
index 49fab5e..79da20f 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java
@@ -376,12 +376,12 @@ public class LnshPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDri
         message = RequestMethodEnum.getName("apply_one_grab") + "apply_one_grab 接口请求LMS...";
         lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
         Resp resp = acsToWmsService.applyTask(request);
-        if (StrUtil.equals(resp.result, "true")) {
+        if (resp.getCode() == 200) {
             this.writing(this.mode);
             this.setRequireSucess(true);
         } else {
             this.writing(400);
-            message = RequestMethodEnum.getName("apply_one_grab") + "apply_one_grab 接口请求失败" + resp.getComment();;
+            message = RequestMethodEnum.getName("apply_one_grab") + "apply_one_grab 接口请求失败" + resp.getMessage();;
         }
         lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
         return true;
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java
index 0b46b78..cb0ab22 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java
@@ -919,7 +919,7 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
         request.setRequestNo(IdUtil.simpleUUID());
         request.setRequestDate(AgvUtil.getDate());
         Resp resp = acsToWmsService.applyTask(request);
-        if (StrUtil.equals(resp.result, "true")) {
+        if (resp.getCode() == 200) {
             this.writing(this.mode);
             this.setRequireSucess(true);
         } else {
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDeviceDriver.java
index b55e6e3..09ee1fb 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDeviceDriver.java
@@ -3,6 +3,7 @@ package org.nl.acs.device_driver.lnsh.lnsh_press;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpResponse;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import lombok.Getter;
 import lombok.Setter;
@@ -11,9 +12,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.acs.device.device_driver.standard_inspect.ReadUtil;
 import org.nl.acs.device.service.DeviceService;
 import org.nl.acs.device_driver.DeviceDriver;
+import org.nl.acs.device_driver.RequestMethodEnum;
 import org.nl.acs.device_driver.RouteableDeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
+import org.nl.acs.ext.wms.data.AcsToWmsData.applyTask.ApplyTaskRequest;
+import org.nl.acs.ext.wms.data.Resp;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.instruction.service.InstructionService;
 import org.nl.acs.instruction.service.dto.Instruction;
@@ -24,12 +28,15 @@ import org.nl.acs.order.service.ProduceshiftorderService;
 import org.nl.acs.order.service.dto.ProduceshiftorderDto;
 import org.nl.acs.route.service.RouteLineService;
 import org.nl.acs.task.service.TaskService;
+import org.nl.modules.lucene.service.LuceneExecuteLogService;
+import org.nl.modules.lucene.service.dto.LuceneLogDto;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.openscada.opc.lib.da.Server;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -59,6 +66,8 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De
 
     ProduceshiftorderService produceshiftorderService = SpringContextHolder.getBean("produceshiftorderServiceImpl");
 
+    LuceneExecuteLogService lucene = SpringContextHolder.getBean("luceneExecuteLogServiceImpl");
+
     //放货准备锁
     String putReadyLock = null;
     //有货标记
@@ -125,7 +134,7 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De
             mode = this.itemProtocol.getMode();
             error = this.itemProtocol.getError();
             status = this.itemProtocol.getStatus();
-            open_time = this.itemProtocol.getOpen_time();
+            //open_time = this.itemProtocol.getOpen_time();
             standby_time = this.itemProtocol.getStandby_time();
             production_time = this.itemProtocol.getProduction_time();
             error_time = this.itemProtocol.getError_time();
@@ -191,6 +200,8 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De
             }
 
         } catch (Exception var17) {
+            log.info(var17.getMessage());
+            message = "错误:" + var17.getMessage();
             return;
         }
 
@@ -211,36 +222,24 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De
             message = "";
             Instruction instruction = null;
             List toInstructions;
-            switch (mode) {
-                case 1:
-                    log.debug("设备运转模式:等待工作");
-                    return;
-                case 2:
-                    break;
-                case 3:
-                    //排产单确认
-                    if (!requireSucess && !"0".equals(order_No) && StrUtil.isNotBlank(order_No)) {
-                        JSONObject json = new JSONObject();
-                        json.put("workorder_code", order_No);
-                        json.put("type", "1");
-                        enterProduction(json);
-                    }
-                    break;
-                case 4:
-                    //工单完成反馈
-                    if (!requireSucess && !"0".equals(order_No) && StrUtil.isNotBlank(order_No)) {
-                        JSONObject json = new JSONObject();
-                        json.put("workorder_code", order_No);
-                        json.put("qty", qty);
-                        json.put("unqualified_qty", unqualified);
-                        json.put("type", "2");
-                        enterProduction(json);
+
+
+            if (mode > 2 &&  !requireSucess) {
+                if (ObjectUtil.isNotEmpty(this.device.getExtraValue().get(String.valueOf(mode)))) {
+                    String modethod = this.device.getExtraValue().get(String.valueOf(mode)).toString();
+                    try {
+                        applyRequest(modethod);
+                    } catch (Exception e) {
+                        message = "错误:" + e.getMessage();
+                        this.setIserror(true);
                     }
-                    break;
+                } else {
+                    message = "无效模式请求,驱动未配置此请求方法";
+                }
+            } else {
+                message = "无请求";
             }
 
-            
-
         }
         last_mode = mode;
         last_status = status;
@@ -267,6 +266,72 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De
         }
     }
 
+
+    /**
+     * 请求
+     *
+     * @param
+     */
+    public synchronized boolean applyRequest(String modethod) throws Exception {
+        Object obj1 = this;
+        Date date = new Date();
+        if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) {
+            log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out);
+            return false;
+        } else {
+            this.instruction_require_time = date;
+            Object obj = this.getClass().getDeclaredConstructor().newInstance();
+            Method method1 = this.getClass().getMethod(modethod, null);
+            method1.invoke(this, null);
+            return true;
+        }
+    }
+
+
+    public synchronized boolean order_verify() {
+        if (!"0".equals(order_No) && StrUtil.isNotBlank(order_No)) {
+            ApplyTaskRequest request = new ApplyTaskRequest();
+            request.setDevice_code(this.getDevice_code());
+            request.setRequest_medthod_code(Thread.currentThread().getStackTrace()[1].getMethodName());
+            request.setRequest_medthod_name(RequestMethodEnum.getName(Thread.currentThread().getStackTrace()[1].getMethodName()));
+            request.setOrder_code(this.getOrder_No());
+            message = RequestMethodEnum.getName("order_verify") + "order_verify 接口请求LMS...";
+            lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
+            Resp resp = acsToWmsService.applyTask(request);
+            if (resp.getCode() == 200) {
+                this.writing(this.mode);
+                this.setRequireSucess(true);
+            } else {
+                this.writing(400);
+                message = RequestMethodEnum.getName("order_verify") + "order_verify 接口请求失败" + resp.getMessage();
+            }
+            lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
+        }
+        return true;
+    }
+
+    public synchronized boolean order_finish() {
+        if (!"0".equals(order_No) && StrUtil.isNotBlank(order_No)) {
+            ApplyTaskRequest request = new ApplyTaskRequest();
+            request.setDevice_code(this.getDevice_code());
+            request.setRequest_medthod_code(Thread.currentThread().getStackTrace()[1].getMethodName());
+            request.setRequest_medthod_name(RequestMethodEnum.getName(Thread.currentThread().getStackTrace()[1].getMethodName()));
+            request.setOrder_code(this.getOrder_No());
+            message = RequestMethodEnum.getName("order_finish") + "order_finish 接口请求LMS...";
+            lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
+            Resp resp = acsToWmsService.applyTask(request);
+            if (resp.getCode() == 200) {
+                this.writing(this.mode);
+                this.setRequireSucess(true);
+            } else {
+                this.writing(400);
+                message = RequestMethodEnum.getName("order_finish") + "order_finish 接口请求失败" + resp.getMessage();;
+            }
+            lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
+        }
+        return true;
+    }
+
     /**
      * 排产单确认
      *
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java
index 6bbfb42..4efbe9e 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java
@@ -202,7 +202,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             List toInstructions;
 
 
-            if (mode > 2) {
+            if (mode > 2 &&  !requireSucess) {
                 if (ObjectUtil.isNotEmpty(this.device.getExtraValue().get(String.valueOf(mode)))) {
                     String modethod = this.device.getExtraValue().get(String.valueOf(mode)).toString();
                     try {
@@ -486,12 +486,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             message = RequestMethodEnum.getName("apply_put_full_vehicle") + "apply_put_full_vehicle 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
             Resp resp = acsToWmsService.applyTask(request);
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("apply_put_full_vehicle") + "apply_put_full_vehicle 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("apply_put_full_vehicle") + "apply_put_full_vehicle 接口请求失败" + resp.getMessage();;
             }
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
             return true;
@@ -519,12 +519,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
@@ -551,12 +551,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             message = RequestMethodEnum.getName("apply_take_empty_vehicle") + "apply_take_empty_vehicle 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("apply_take_empty_vehicle") + "apply_take_empty_vehicle 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("apply_take_empty_vehicle") + "apply_take_empty_vehicle 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
@@ -584,12 +584,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
@@ -616,12 +616,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             message = RequestMethodEnum.getName("apply_force_take_full_vehicle") + "apply_force_take_full_vehicle 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("apply_force_take_full_vehicle") + "apply_force_take_full_vehicle 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("apply_force_take_full_vehicle") + "apply_force_take_full_vehicle 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
@@ -648,12 +648,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             message = RequestMethodEnum.getName("apply_force_take_full_vehicle_in_storage") + "apply_force_take_full_vehicle_in_storage 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("apply_force_take_full_vehicle_in_storage") + "apply_force_take_full_vehicle_in_storage 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("apply_force_take_full_vehicle_in_storage") + "apply_force_take_full_vehicle_in_storage 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
@@ -680,12 +680,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             message = RequestMethodEnum.getName("barcode_sucess_apply") + "barcode_sucess_apply 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("barcode_sucess_apply") + "barcode_sucess_apply 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("barcode_sucess_apply") + "barcode_sucess_apply 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
@@ -712,12 +712,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             message = RequestMethodEnum.getName("get_vehicle_info") + "get_vehicle_info 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("get_vehicle_info") + "get_vehicle_info 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("get_vehicle_info") + "get_vehicle_info 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
@@ -743,12 +743,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             message = RequestMethodEnum.getName("force_no_package") + "force_no_package 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("force_no_package") + "force_no_package 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("force_no_package") + "force_no_package 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
@@ -774,12 +774,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             message = RequestMethodEnum.getName("apply_labelling") + "apply_labelling 接口请求LMS...";
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
-            if (StrUtil.equals(resp.result, "true")) {
+            if (resp.getCode() == 200) {
                 this.writing(this.mode);
                 this.setRequireSucess(true);
             } else {
                 this.writing(400);
-                message = RequestMethodEnum.getName("apply_labelling") + "apply_labelling 接口请求失败" + resp.getComment();;
+                message = RequestMethodEnum.getName("apply_labelling") + "apply_labelling 接口请求失败" + resp.getMessage();;
             }
             return true;
         } else {
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/LmsUtil.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/LmsUtil.java
index 06b0b11..84b8de7 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/LmsUtil.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/LmsUtil.java
@@ -27,9 +27,8 @@ public class LmsUtil {
         String isConnect = paramService.findByCode("hasWms").getValue();
         if (StrUtil.equals("0", isConnect)) {
             JSONObject result = new JSONObject();
-            result.put("result", "false");
-            result.put("code", "1");
-            result.put("comment", "参数配置表中-hasWms为:0");
+            result.put("400", "500");
+            result.put("message", "参数配置表中-hasWms为:0");
             log.info("请求LMS异常返回参数:{}", String.valueOf(result));
             return String.valueOf(result);
             //throw new BadRequestException("参数配置表中-hasWms为:0");
@@ -46,9 +45,8 @@ public class LmsUtil {
             return body;
         } catch (Exception e) {
             JSONObject result = new JSONObject();
-            result.put("result", "false");
-            result.put("code", "1");
-            result.put("comment", e.getMessage());
+            result.put("code", "500");
+            result.put("message", e.getMessage());
             log.info("请求LMS异常返回参数:{}", String.valueOf(result));
             return String.valueOf(result);
         }
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/RespUtil.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/RespUtil.java
index 1480660..82ef17a 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/RespUtil.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/RespUtil.java
@@ -11,7 +11,6 @@ public class RespUtil {
     public static <T> Resp getResp(String result, T t) {
         JSONObject jsonObject = JSONObject.parseObject(result);
         Resp<T> resp = new Resp<>();
-        resp.setData(t);
         resp = JSONObject.toJavaObject(jsonObject, Resp.class);
         return resp;
     }
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/Resp.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/Resp.java
index 03f2b41..c58f668 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/Resp.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/Resp.java
@@ -9,24 +9,7 @@ import lombok.Data;
  * @createDate: 2022/11/24
  */
 @Data
-public class Resp<T> {
-    /**
-     * 成功返回true，失败返回false
-     */
-    public String result;
+public class Resp<T> extends  BaseResponse {
 
-    /**
-     * 错误码（0表示成功）1代表入库目的位置有货，其他更多情况待定
-     */
-    public String code;
 
-    /**
-     * 错误信息，如果成功则为null
-     */
-    public String comment;
-
-    /**
-     * 报文携带的数据
-     */
-    public T data;
 }
diff --git a/acs/nladmin-system/src/main/resources/config/application-dev.yml b/acs/nladmin-system/src/main/resources/config/application-dev.yml
index 2df3cd8..09af722 100644
--- a/acs/nladmin-system/src/main/resources/config/application-dev.yml
+++ b/acs/nladmin-system/src/main/resources/config/application-dev.yml
@@ -6,9 +6,10 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:rl_mg_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+#      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:rl_mg_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:rl_mg_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       username: ${DB_USER:root}
-      password: ${DB_PWD:123456}
+      password: ${DB_PWD:Root.123456}
       # 初始连接数
       initial-size: 5
       # 最小连接数
diff --git a/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_press.vue b/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_press.vue
index 4e464d6..abb8258 100644
--- a/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_press.vue
+++ b/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_press.vue
@@ -159,6 +159,67 @@
       </el-form>
     </el-card>
 
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">交互相关：</span>
+      </div>
+      <div class="crud-opts2" style="margin-bottom: 5px;">
+      <span class="crud-opts-right2">
+        <!--左侧插槽-->
+        <slot name="left" />
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="insertdtl()"
+        >
+          新增一行
+        </el-button>
+      </span>
+
+      </div>
+      <div class="app-container">
+        <el-table :data="modeform.tableData" border fit highlight-current-row style="width: 100%;" class="tb-edit">
+          <el-table-column label="mode" prop="模式" width="180">
+            <template scope="scope">
+              <el-input-number  value="3" :min="3" v-model="scope.row.mode" size="mini" />
+              <span v-show="scope.row.edit">{{ scope.row.mode }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="request" prop="请求方法" width="180">
+            <template scope="scope">
+              <el-select
+                v-model="scope.row.request"
+                filterable
+                clearable
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in requestMethodList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="操作" width="170" >
+            <template scope="scope">
+              <el-button
+                type="danger"
+                class="filter-item"
+                size="mini"
+                icon="el-icon-delete"
+                @click.native.prevent="deleteRow(scope.$index, modeform.tableData)"
+              />
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-card>
+
     <el-card class="box-card" shadow="never">
       <div slot="header" class="clearfix">
         <span class="role-span">PLC读取字段：</span>
@@ -294,8 +355,61 @@ export default {
       dataOpcservers: [],
       dataOpcPlcs: [],
       deviceList: [],
+      requestMethodList: [],
       data1: [],
       data2: [],
+      modeform: {
+        tableData: [
+          {
+            mode: '3',
+            request: 'order_verify'
+          },
+          {
+            mode: '4',
+            request: 'order_finish'
+          },
+          {
+            mode: '5',
+            request: 'apply_put_full_vehicle'
+          },
+          {
+            mode: '6',
+            request: 'apply_put_empty_vehicle'
+          },
+          {
+            mode: '7',
+            request: 'apply_take_empty_vehicle'
+          },
+          {
+            mode: '8',
+            request: 'apply_take_full_vehicle'
+          },
+          {
+            mode: '9',
+            request: 'apply_force_take_full_vehicle'
+          },
+          {
+            mode: '10',
+            request: 'apply_force_take_full_vehicle_in_storage'
+          },
+          {
+            mode: '11',
+            request: 'barcode_sucess_apply'
+          },
+          {
+            mode: '12',
+            request: 'get_vehicle_info'
+          },
+          {
+            mode: '13',
+            request: 'force_no_package'
+          },
+          {
+            mode: '14',
+            request: 'apply_labelling'
+          }
+        ]
+      },
       form: {
         inspect_in_stocck: true,
         ignore_pickup_check: true,
@@ -349,9 +463,19 @@ export default {
       deviceCrud.selectDeviceList().then(data => {
         this.deviceList = data
       })
+      deviceCrud.selectRequestMethodList().then(data => {
+        this.requestMethodList = data
+      })
     })
   },
   methods: {
+    insertdtl() {
+      this.modeform.tableData.push({mode: '', request: '' })
+    },
+    deleteRow(index, rows) {
+      debugger
+      rows.splice(index, 1)
+    },
     finishReadEdit(data) {
       // 编辑的是code列,并且值包含mode
       if (data.code.indexOf('mode') !== -1) {
@@ -518,7 +642,7 @@ export default {
           parentForm.is_route = true
           parentForm.plc_id = this.plc_id
           parentForm.opc_id = this.opc_id
-           updateConfig(parentForm, this.form, null, this.data1, this.data2).then(res => {
+          updateConfig(parentForm, this.form, this.modeform, this.data1, this.data2).then(res => {
             this.notify('保存成功', 'success')
             this.configLoading = false
           }).catch(err => {
diff --git a/acs/nladmin-ui/src/views/acs/monitor/device/index.vue b/acs/nladmin-ui/src/views/acs/monitor/device/index.vue
index 6b523f3..d989977 100644
--- a/acs/nladmin-ui/src/views/acs/monitor/device/index.vue
+++ b/acs/nladmin-ui/src/views/acs/monitor/device/index.vue
@@ -1,133 +1,34 @@
 <template>
-  <div class="monitor-wrap">
-    <el-row style="margin-top: 20px;margin-left: 20px;margin-bottom: 20px">
-      <el-col :span="6" />
-      <el-col :span="18">
-        <!-- 舞台:
-         <el-select v-model="stage_code" placeholder="请选择" @change="changeStage">
-           <el-option
-             v-for="item in stageSelectList"
-             :key="item.stage_code"
-             :label="item.stage_name"
-             :value="item.stage_code">
-           </el-option>
-         </el-select>
-         <el-button type="primary" @click="saveAll" :loading="saveLoading">保存</el-button>
-         <el-button type="success" @click="cleanArr2">清空</el-button>-->
-        <!-- <el-button type="info">操作</el-button>-->
-      </el-col>
-    </el-row>
-
+  <div style="overflow: hidden">
     <el-row>
-      <el-col :span="1" style="margin-left: 10px">
-        <div>
-          <!-- <draggable :list="arr1" animation="300"
-                      dragClass="dragClass"
-                      ghostClass="ghostClass"
-                      chosenClass="chosenClass"
-                      @start="onStart"
-                      @end="onEnd"
-                      :move="onMove"
-                      :group="{ name:'group', pull:'clone', put:false}"
-           >
-
-             &lt;!&ndash;vue中引入图片https://blog.csdn.net/qq_35393869/article/details/80333564&ndash;&gt;
-             <div v-for="(item,index) in arr1" :key="index"
-                  style="position: relative; width: 34px;height: 34px;display: inline-block;margin: 0 0 0 0 ;vertical-align:bottom;outline: 1px solid #f0f0f0;">
-               <img :src="require('../../../../assets/acs/' +item.img1+'.png')" alt="" width="34px" height="34px;"
-                    style="margin: 0 0 0 0;vertical-align:bottom;transform: rotate(0deg);"/>
-
-             </div>
-
-           </draggable>-->
-        </div>
-      </el-col>
-
-      <el-col :span="22" style="margin-left: 30px">
-        <el-scrollbar style="width:1100px;height: 650px;">
-          <!--使用draggable组件-->
-          <draggable
-            :list="arr2"
-            group="group"
-            animation="300"
-            filter=".forbid"
-            :style="'width:'+ grid_width +'px;'"
-          >
-
-            <div
-              v-for="(item) in arr2"
-              :key="item.index"
-              class="forbid"
-              style="position: relative; width: 34px;height: 34px;display: inline-block;margin: 0 0 0 0 ;vertical-align:bottom;"
-              @click="clickDevice(item)"
-            >
-
-              <el-popover
-                v-if="currentItem == item.index"
-                :ref="'pop_'+item.index"
-                placement="bottom"
-                effect="dark"
-                trigger="manual"
-                :value="currentItem == item.index"
-                :disabled="item.device_code == ''"
-                :popper-class="isErrorColor(item)"
-              >
-                <div v-if="item.device_code !== ''">
-                  <div style="padding: 3px;">
-                    设备信息
-                  </div>
-                  <el-table
-                    :data="moveShow(item)"
-                    style="width: 100%"
-                  >
-                    <af-table-column
-                      prop="name"
-                      label="监控项"
-                    />
-                    <af-table-column
-                      prop="value"
-                      label="当前值"
-                    />
-                  </el-table>
-                </div>
-              </el-popover>
-
-              <div v-popover="'pop_'+item.index" class="content" @mouseover="changeCurrentTime(item)">
-                <img
-                  :src="require('../../../../assets/acs/' +item.img2+'.png')"
-                  alt=""
-                  width="34px"
-                  height="34px;"
-                  :style="{ transform:' rotate('+item.angle+'deg)' }"
-                  style="outline: 1px solid #f0f0f0;"
-                >
-                <img
-                  v-if="hasGoods(item) && item.img2!='1' "
-                  :src="require('../../../../assets/acs/' +'托盘'+'.png')"
-                  style="position: absolute; top: 5px;right: 5px;width: 24px;height: 24px;"
-                >
-                <img
-                  v-if="statusPic(item) && item.img2!='1'"
-                  :src="require('../../../../assets/acs/' +'status0'+'.png')"
-                  style="position: absolute; top: 0;left: 0;"
-                >
-                <img
-                  v-if="!statusPic(item) && item.img2!='1' && item.device_code"
-                  :src="require('../../../../assets/acs/' +'status1'+'.png')"
-                  style="position: absolute; top: 0;left: 0;"
-                >
-                <img
-                  v-if="isError(item)"
-                  :src="require('../../../../assets/acs/' +'icon_alert'+'.png')"
-                  style="position: absolute; top: 5px;right: 5px;width: 23px;height: 23px;"
-                >
-              </div>
-            </div>
-          </draggable>
-        </el-scrollbar>
-      </el-col>
+      <div id="container" className="container" style="min-height: 100%" />
     </el-row>
-
+    <!--点击设备显示信息-->
+    <el-dialog
+      id="dialogs"
+      title="设备信息"
+      class="newDialog"
+      :visible.sync="dialogDeviceMsgVisible"
+      width="22%"
+      :top="tops"
+      :show-close="false"
+      :modal="false"
+    >
+      <el-table
+        :data="arr"
+        style="width: 100%"
+        max-height="500px"
+      >
+        <el-table-column
+          prop="name"
+          label="监控项"
+        />
+        <el-table-column
+          prop="value"
+          label="当前值"
+        />
+      </el-table>
+    </el-dialog>
     <!--弹窗设置设备与图标绑定与角度-->
     <el-dialog title="设备设置" :visible.sync="dialogFormVisible" width="35%">
       <el-form :model="form" size="small">
@@ -135,6 +36,26 @@
           <el-input v-model="form.device_code" :disabled="true" />
         </el-form-item>
 
+        <el-form-item label="设备状态" label-width="80px">
+          <el-radio-group v-model="form.option">
+            <el-radio-button :label="0">禁止进出</el-radio-button>
+            <el-radio-button :label="1">允许进入</el-radio-button>
+            <el-radio-button :label="2">允许离开</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogSave">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!--弹窗设置设备与图标绑定与角度-->
+    <el-dialog title="设备设置" :visible.sync="dialogFormVisible3" width="35%">
+      <el-form :model="form" size="small">
+        <el-form-item label="设备编号" prop="device_code" label-width="80px">
+          <el-input v-model="form.device_code" :disabled="true" />
+        </el-form-item>
         <el-form-item label="设备状态" label-width="80px">
           <el-radio-group v-model="form.hasGoodStatus">
             <el-radio-button :label="0">无货</el-radio-button>
@@ -142,9 +63,79 @@
             <el-radio-button :label="2">有托盘有货</el-radio-button>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="物料编码" prop="material_type" label-width="80px">
+          <el-input v-model="form.material_type" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button @click="dialogFormVisible3 = false">取 消</el-button>
+        <el-button type="primary" @click="dialogSave">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!--弹窗设置设备与图标绑定与角度-->
+    <el-dialog title="设备设置" :visible.sync="dialogFormVisible4" width="35%">
+      <el-form :model="form" size="small">
+        <el-form-item label="设备编号" prop="device_code" label-width="120px">
+          <el-input v-model="form.device_code" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="禁用机械手" prop="is_disable" label-width="120px">
+          <el-radio-group v-model="form.is_disable">
+            <el-radio-button :label="0">正常</el-radio-button>
+            <el-radio-button :label="1">禁用</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="请求标记" prop="requireSucess" label-width="120px">
+          <el-radio-group v-model="form.requireSucess">
+            <el-radio-button :label="0">否</el-radio-button>
+            <el-radio-button :label="1">是</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible4 = false">取 消</el-button>
+        <el-button type="primary" @click="dialogSave">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="设备设置" :visible.sync="dialogFormVisible5" width="35%">
+      <el-form :model="form" size="small">
+        <el-form-item label="设备编号" prop="device_code" label-width="120px">
+          <el-input v-model="form.device_code" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="请求标记" prop="requireSucess" label-width="120px">
+          <el-radio-group v-model="form.requireSucess">
+            <el-radio-button :label="false">否</el-radio-button>
+            <el-radio-button :label="true">是</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible5 = false">取 消</el-button>
+        <el-button type="primary" @click="dialogSave">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="设备设置" :visible.sync="dialogFormVisible6" width="35%">
+      <el-form :model="form" size="small">
+        <el-form-item label="设备编号" prop="device_code" label-width="120px">
+          <el-input v-model="form.device_code" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="申请指令标记" prop="requireSucess" label-width="120px">
+          <el-radio-group v-model="form.requireSucess">
+            <el-radio-button :label="0">否</el-radio-button>
+            <el-radio-button :label="1">是</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="请求任务标记" prop="applySucess" label-width="120px">
+          <el-radio-group v-model="form.applySucess">
+            <el-radio-button :label="0">否</el-radio-button>
+            <el-radio-button :label="1">是</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible5 = false">取 消</el-button>
         <el-button type="primary" @click="dialogSave">确 定</el-button>
       </div>
     </el-dialog>
@@ -165,99 +156,216 @@
         <el-button type="primary" @click="saveBarcode">确 定</el-button>
       </div>
     </el-dialog>
-
   </div>
 </template>
 
 <script>
-// 导入draggable组件
+import crudStage from '@/api/logicflow/stage'
+import paramCrud from '@/api/system/param'
 import deviceCrud from '@/api/acs/device/device'
-import draggable from 'vuedraggable'
-import crud from '@/mixins/crud'
-import actorCrud from '@/api/acs/stage/actor'
+import { getDeviceByCodes } from '@/api/acs/device/deviceStageMonitor'
+import '@logicflow/core/dist/style/index.css'
+import '@logicflow/extension/lib/style/index.css'
+import {isEqual} from "lodash"
+import { LogicFlow } from '@logicflow/core'
+import { registerCustomElement } from '@/views/system/logicflow/editor/components/node'
 
+let data = {}
+let lf = ''
 export default {
   name: 'MonitorDevice',
-  // 注册draggable组件
-  components: {
-    draggable
-  },
-  mixins: [crud],
   data() {
     return {
+      stageParam: 'stage_code', // 舞台参数
+      dialogDeviceMsgVisible: false, // 显示设备信息的dialog
+      device_code: null,
+      tops: '20vh', // 初始top
       stage_code: '',
+      stageSelectList: [],
+      arr: [], // 显示数组
       dialogFormVisible: false,
       dialogFormVisible1: false,
       dialogFormVisible2: false,
-      arr2: [],
-      currentItem: '',
-      stageSelectList: [],
-      deviceList: [],
+      dialogFormVisible3: false,
+      dialogFormVisible4: false,
+      dialogFormVisible5: false,
+      dialogFormVisible6: false,
       form: {
-        index: 0,
         device_code: '',
-        angle: 0,
         hasGoodStatus: null,
         barcode: '',
-        suspended: null
+        suspended: null,
+        material_type: '',
+        requireSucess: '',
+        fullrequireSucess: '',
+        is_disable: '',
+        applySucess: ''
       },
-      grid_width: 1000
+      allDeviceMsg: [],
+      msgTop: '200px',
+      msgLeft: '200px'
     }
   },
-  created() {
-    this.initArr2()
-    this.webSocket()
+  mounted() {
+    this.init()
+  },
+  beforeDestroy() {
+    // js提供的clearInterval方法用来清除定时器
+    console.log('定时器销毁')
+    clearInterval(this.timer)
   },
   methods: {
-    clickDevice(item) {
-      const index = item.index
-      const clickObj = this.arr2[index]
-      if (!clickObj.img2 || clickObj.img2 === '1' || !item.data) {
+    // 流程图初始化
+    init() {
+      // 初始化配置
+      lf = new LogicFlow({
+        overlapMode: 1,
+        container: document.querySelector('#container'), // 容器
+        // 画布配置
+        // width: window.innerWidth, // 宽度
+        height: window.innerHeight, // 高度
+        grid: { // 不用格子直接显示，使用背景
+          visible: false,
+          type: 'mesh',
+          size: 5
+        },
+        background: {
+          backgroundImage: 'url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDAiIGhlaWdodD0iNDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PHBhdHRlcm4gaWQ9ImdyaWQiIHdpZHRoPSI0MCIgaGVpZ2h0PSI0MCIgcGF0dGVyblVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHBhdGggZD0iTSAwIDEwIEwgNDAgMTAgTSAxMCAwIEwgMTAgNDAgTSAwIDIwIEwgNDAgMjAgTSAyMCAwIEwgMjAgNDAgTSAwIDMwIEwgNDAgMzAgTSAzMCAwIEwgMzAgNDAiIGZpbGw9Im5vbmUiIHN0cm9rZT0iI2QwZDBkMCIgb3BhY2l0eT0iMC4yIiBzdHJva2Utd2lkdGg9IjEiLz48cGF0aCBkPSJNIDQwIDAgTCAwIDAgMCA0MCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjZDBkMGQwIiBzdHJva2Utd2lkdGg9IjEiLz48L3BhdHRlcm4+PC9kZWZzPjxyZWN0IHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JpZCkiLz48L3N2Zz4=")',
+          backgroundRepeat: 'repeat'
+        },
+        isSilentMode: true,
+        adjustEdge: false,
+        adjustEdgeMiddle: false,
+        adjustEdgeStartAndEnd: false,
+        adjustNodePosition: false,
+        hideAnchors: true,
+        nodeTextEdit: false,
+        edgeTextEdit: false
+      })
+      lf.setTheme(
+        {
+          baseEdge: { strokeWidth: 1 },
+          baseNode: { strokeWidth: 1 },
+          nodeText: { overflowMode: 'autoWrap', lineHeight: 1.5 },
+          edgeText: { overflowMode: 'autoWrap', lineHeight: 1.5 }
+        }
+      )
+      // 注册自定义元素
+      registerCustomElement(lf)
+      // 删除默认的右键菜单
+      lf.extension.menu.setMenuConfig({
+        nodeMenu: false
+      })
+      lf.on('node:click', (data, e) => { // 鼠标点击节点
+        console.log('data: ', data)
+        // 展开显示设备信息
+        if (data.data.type !== 'pro-rect' && data.data.type !== 'pro-circle' && data.data.type !== 'triangle' && data.data.type !== 'rect-radius') {
+          if (data.data.properties.device) {
+            this.moveShow(data.data) // 传递节点数据，用来获取id做比对
+            this.dialogDeviceMsgVisible = true
+            this.device_code = data.data.properties.device
+            this.tops = data.e.y + 'px'
+            document.getElementsByClassName('el-dialog')[0].style.marginLeft = data.e.x + 'px'
+          }
+        }
+      })
+      lf.on('node:contextmenu', (data, e, position) => { // 右键编辑
+        if (data.data.type !== 'pro-rect' && data.data.type !== 'pro-circle' && data.data.type !== 'triangle' && data.data.type !== 'rect-radius') {
+          if (data.data.properties.device) {
+            this.editDevice(data.data.id) // 编辑
+          }
+        }
+      })
+      // 开始渲染
+      lf.render(data)
+      this.initStageData()
+    },
+    initStageData() {
+      // 获取舞台编码
+      paramCrud.getValueByCode(this.stageParam).then(res => {
+        // console.log(res)
+        debugger
+        if (res.value) {
+          crudStage.getNewStageDataByCode(res.value).then(res => { // 通过舞台编码获取舞台数据并且赋值到lf对象
+            data = JSON.parse(res.stage_data)
+            lf.render(data)
+            this.initStatus() // 初始化状态
+          })
+        } else {
+          this.$notify.error({
+            title: '错误',
+            message: '请设置参数!'
+          })
+        }
+      })
+      this.timer = setInterval(() => { // 定时刷新设备的状态信息
+        //console.log('定时器启动')
+        this.initStatus()
+      }, 2000)
+    },
+    editDevice(id) {
+      let item = ''
+      for (const i in this.allDeviceMsg) { // 查找点击节点的id
+        if (id === this.allDeviceMsg[i].id) {
+          item = this.allDeviceMsg[i]
+          break // 匹对完退出
+        }
+      }
+      const clickObj = item
+      console.log('clickObj.data', clickObj.data)
+      if (!item.data) {
         return
       }
-      if (clickObj.data.is_click !== true) {
+      if (!clickObj.data.is_click) {
         return
       }
-      if (clickObj.data.device_type === 'scanner') {
+      if (clickObj.data.device_type === 'scanner') { // 扫码器
         this.dialogFormVisible1 = true
       } else {
-        this.dialogFormVisible = true
+        console.log(clickObj.data.driver_type)
+        if (clickObj.data.driver_type === 'standard_ordinary_site') {
+          this.dialogFormVisible3 = true
+        } else if (clickObj.data.driver_type === 'hailiang_packer_station') {
+          this.dialogFormVisible4 = true
+        } else if (clickObj.data.driver_type === 'hailiang_xj_plc_test') {
+          this.$refs.child1.setForm(clickObj)
+        } else if (clickObj.data.driver_type === 'slit_two_manipulator') {
+          this.dialogFormVisible4 = true
+        } else if (clickObj.data.driver_type === 'hailiang_special_full_station' ||
+          clickObj.data.driver_type === 'hailiang_cleaning_feeding_line' ||
+          clickObj.data.driver_type === 'hailiang_engraving_machine' ||
+          clickObj.data.driver_type === 'hailiang_old_special_full_station' ||
+          clickObj.data.driver_type === 'hailiang_old_special_pour_station' ||
+          clickObj.data.driver_type === 'hailiang_packer_station') {
+          this.dialogFormVisible5 = true
+        } else if (clickObj.data.driver_type === 'standard_conveyor_control_with_scanner') {
+          this.dialogFormVisible6 = true
+        } else {
+          this.dialogFormVisible = true
+        }
       }
       this.form.angle = clickObj.angle
       this.form.index = clickObj.index
       this.form.device_code = clickObj.device_code
       this.form.hasGoodStatus = clickObj.data.hasGoods
+      this.form.material_type = clickObj.data.material_type
+      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
     },
-    hasGoods(item) {
-      if (item.data && item.data.hasGoods > 0) {
-        return true
-      }
-      return false
-    },
-    statusPic(item) {
-      if (item.data && item.data.isOnline === true) {
-        return true
-      }
-      return false
-    },
-    isError(item) {
-      if (item.data && item.data.isError === true) {
-        return true
-      }
-      return false
-    },
-    isErrorColor(item) {
-      if (item.data && item.data.isError === true) {
-        return 'error'
+    moveShow(nodeData) { // 点击之后显示出来的数据----只需要设备信息
+      let item = ''
+      for (const i in this.allDeviceMsg) { // 查找点击节点的id
+        if (nodeData.id === this.allDeviceMsg[i].id) {
+          item = this.allDeviceMsg[i]
+          break // 匹对完退出
+        }
       }
-      return 'normal'
-    },
-    changeCurrentTime(item) {
-      this.currentItem = item.index
-    },
-    moveShow(item) {
+      this.arr = [] // 清空
       if (item.device_code && item.data) {
-        const arr = [
+        // console.log('item', item)
+        this.arr = [
           { name: '设备编号', value: item.device_code },
           { name: '设备名称', value: item.device_name }
         ]
@@ -268,226 +376,489 @@ export default {
           }
           if (val === 'message' && data.isError === true) {
             const obj = { name: '设备信息', value: data[val] }
-            arr.push(obj)
+            this.arr.push(obj)
           }
 
           if (val === 'message' && data.isError === 'false') {
             const obj = { name: '异常信息', value: data[val] }
-            arr.push(obj)
+            this.arr.push(obj)
           }
 
           if (val === 'move') {
             const obj = { name: '光电信号', value: data[val] }
-            arr.push(obj)
+            this.arr.push(obj)
           } else if (val === 'mode') {
             const obj = { name: '模式', value: data[val] }
-            arr.push(obj)
+            this.arr.push(obj)
           } else if (val === 'error') {
             const obj = { name: '报警', value: data[val] }
-            arr.push(obj)
+            this.arr.push(obj)
           } else if (val === 'ip') {
             const obj = { name: 'IP地址', value: data[val] }
-            arr.push(obj)
+            this.arr.push(obj)
           } else if (val === 'number') {
             const obj = { name: '托盘数量', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'instruction_message') {
+            this.arr.push(obj)
+          } else if (val === 'inst_message') {
             const obj = { name: '指令信息', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'last_instruction_message') {
+            this.arr.push(obj)
+          } else if (val === 'message') {
+            const obj = { name: '备注信息', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'inst_message') {
+            const obj = { name: '当前指令信息', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'last_inst_message') {
             const obj = { name: '上次指令信息', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'container') {
+            this.arr.push(obj)
+          } else if (val === 'barcode') {
             const obj = { name: '载具号', value: data[val] }
-            arr.push(obj)
+            this.arr.push(obj)
+          } else if (val === 'barcode_length') {
+            const obj = { name: '载具长度', value: data[val] }
+            this.arr.push(obj)
           } else if (val === 'last_container') {
             const obj = { name: '上次载具号', value: data[val] }
-            arr.push(obj)
+            this.arr.push(obj)
           } else if (val === 'instruction_code') {
             const obj = { name: '指令号', value: data[val] }
-            arr.push(obj)
+            this.arr.push(obj)
+          } else if (val === 'task_code') {
+            const obj = { name: '任务号', value: data[val] }
+            this.arr.push(obj)
           } else if (val === 'last_instruction_code') {
             const obj = { name: '上次指令号', value: data[val] }
-            arr.push(obj)
+            this.arr.push(obj)
           } else if (val === 'action') {
             const obj = { name: '动作信号', value: data[val] }
-            arr.push(obj)
+            this.arr.push(obj)
           } else if (val === 'io_action') {
             const obj = { name: '允许进出信号', value: data[val] }
-            arr.push(obj)
+            this.arr.push(obj)
           } else if (val === 'material') {
             const obj = { name: '物料', value: data[val] }
-            arr.push(obj)
+            this.arr.push(obj)
           } else if (val === 'batch') {
             const obj = { name: '批次', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'requestSucess') {
-            const obj = { name: '是否请求任务', value: data[val] }
-            arr.push(obj)
+            this.arr.push(obj)
           } else if (val === 'applySucess') {
             const obj = { name: '是否申请指令', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'message') {
-            const obj = { name: '说明', value: data[val] }
-            arr.push(obj)
+            this.arr.push(obj)
           } else if (val === 'status') {
             const obj = { name: '设备状态', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'open_time') {
-            const obj = { name: '开机时间', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'close_time') {
-            const obj = { name: '关机时间', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'standby_time') {
-            const obj = { name: '待机时间', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'production_time') {
-            const obj = { name: '生产时间', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'error_time') {
-            const obj = { name: '故障时间', value: data[val] }
-            arr.push(obj)
+            this.arr.push(obj)
           } else if (val === 'weight') {
-            const obj = { name: '生产重量', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'order_No') {
-            const obj = { name: '工单号', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'mix_num') {
-            const obj = { name: '碾次', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'barcode') {
-            const obj = { name: '条码', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'qualified') {
-            const obj = { name: '合格数量', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'unqualified') {
-            const obj = { name: '不合格数量', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'put_station') {
-            const obj = { name: '当前码盘工位', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'encoder_qty') {
-            const obj = { name: '码盘数量', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'outKiln_move') {
-            const obj = { name: '出窑光电', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'outKiln_barcode') {
-            const obj = { name: '出窑条码', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'outKiln_device') {
-            const obj = { name: '出窑设备', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'car_sum') {
-            const obj = { name: '窑车总数', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'nullCar_qty') {
-            const obj = { name: '空窑车数', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'burning_car_qty') {
-            const obj = { name: '在烧窑车数', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'container_qty') {
-            const obj = { name: '托盘数', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'tray_crib_qty') {
-            const obj = { name: '托盘垛数', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'total_container') {
-            const obj = { name: '托盘总数量', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'total_split') {
-            const obj = { name: '累计拆垛数量', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'getStation') {
-            const obj = { name: '当前抓取工位', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'putStation') {
-            const obj = { name: '当前码盘工位', value: data[val] }
-            arr.push(obj)
+            const obj = { name: '重量', value: data[val] }
+            this.arr.push(obj)
           } else if (val === 'move_1') {
             const obj = { name: '前工位光电信号', value: data[val] }
-            arr.push(obj)
+            this.arr.push(obj)
+          } else if (val === 'open') {
+            const obj = { name: '开到位', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'close') {
+            const obj = { name: '关到位', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'phase') {
+            const obj = { name: 'AGV交互阶段', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'option') {
+            const obj = { name: 'AGV动作', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'agv_power') {
+            const obj = { name: 'AGV电量', value: data[val] }
+            this.arr.push(obj)
           } else if (val === 'move_2') {
             const obj = { name: '后工位光电信号', value: data[val] }
-            arr.push(obj)
+            this.arr.push(obj)
           } else if (val === 'action_1') {
             const obj = { name: '前工位动作信号', value: data[val] }
-            arr.push(obj)
+            this.arr.push(obj)
           } else if (val === 'action_2') {
             const obj = { name: '后工位动作信号', value: data[val] }
-            arr.push(obj)
+            this.arr.push(obj)
           } else if (val === 'walk_y') {
             const obj = { name: '行走列', value: data[val] }
-            arr.push(obj)
+            this.arr.push(obj)
           } else if (val === 'task1') {
             const obj = { name: '前工位任务号', value: data[val] }
-            arr.push(obj)
+            this.arr.push(obj)
           } else if (val === 'task2') {
             const obj = { name: '后工位任务号', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'labeling_qty') {
-            const obj = { name: '贴标数量', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'container_type') {
-            const obj = { name: '托盘类型', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'specifications') {
-            const obj = { name: '规格', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'onoff_status') {
-            const obj = { name: '开关机状态', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'task_qty') {
-            const obj = { name: '当前任务数量', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'finishTask_qty') {
-            const obj = { name: '完成任务数量', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'AlongSide') {
-            const obj = { name: 'A长边', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'BshortSide') {
-            const obj = { name: 'B短边', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'Htrapezoidal') {
-            const obj = { name: 'H梯形高', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'Wthickness') {
-            const obj = { name: 'W厚度', value: data[val] }
-            arr.push(obj)
-          } else if (val === 'qty') {
-            const obj = { name: '数量', value: data[val] }
-            arr.push(obj)
+            this.arr.push(obj)
+          } else if (val === 'task') {
+            const obj = { name: '任务号', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'is_disable') {
+            const obj = { name: '是否禁用', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'temperature') {
+            const obj = { name: '当前温度', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'finish') {
+            const obj = { name: '工单完成', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'door') {
+            const obj = { name: '门状态', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'notCreateTaskMessage') {
+            const obj = { name: '任务创建失败原因', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'notCreateInstMessage') {
+            const obj = { name: '指令创建失败原因', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'feedMessage') {
+            const obj = { name: '未反馈电气信号原因', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'requireSucess') {
+            const obj = { name: '请求成功标记', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'matching_barcode') {
+            const obj = { name: '开始匹配条码', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'matching_barcode_fail') {
+            const obj = { name: '条码匹配失败', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'task_type') {
+            const obj = { name: '任务类型', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'task_finish') {
+            const obj = { name: '任务完成', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'noFeedAgvMessage') {
+            const obj = { name: '未反馈AGV原因', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'prepare_ready') {
+            const obj = { name: '准备位就绪', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'in_ready') {
+            const obj = { name: '对接位入箱就绪', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'in_finish') {
+            const obj = { name: '对接位入箱完成', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'out_ready') {
+            const obj = { name: '对接位出箱就绪', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'pause') {
+            const obj = { name: '暂停', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'checking') {
+            const obj = { name: '盘点中', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'check_finish') {
+            const obj = { name: '盘点完成', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'check_compel_finish') {
+            const obj = { name: '盘点强制完成', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'hoist_target_layer') {
+            const obj = { name: '提升机条码目的层', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'prepare_barcode') {
+            const obj = { name: '准备位条码', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'docking_barcode') {
+            const obj = { name: '对接位条码', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'one_floor_barcode1') {
+            const obj = { name: '一层条码1', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'one_floor_barcode2') {
+            const obj = { name: '一层条码2', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'one_floor_barcode3') {
+            const obj = { name: '一层条码3', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'one_floor_barcode4') {
+            const obj = { name: '一层条码4', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'one_floor_barcode5') {
+            const obj = { name: '一层条码5', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'one_floor_barcode6') {
+            const obj = { name: '一层条码6', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'one_floor_barcode7') {
+            const obj = { name: '一层条码7', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'one_floor_barcode8') {
+            const obj = { name: '一层条码8', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'one_floor_barcode9') {
+            const obj = { name: '一层条码9', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'one_floor_barcode10') {
+            const obj = { name: '一层条码10', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'two_floor_barcode1') {
+            const obj = { name: '二层条码1', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'two_floor_barcode2') {
+            const obj = { name: '二层条码2', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'two_floor_barcode3') {
+            const obj = { name: '二层条码3', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'two_floor_barcode4') {
+            const obj = { name: '二层条码4', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'two_floor_barcode5') {
+            const obj = { name: '二层条码5', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'two_floor_barcode6') {
+            const obj = { name: '二层条码6', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'two_floor_barcode7') {
+            const obj = { name: '二层条码7', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'two_floor_barcode8') {
+            const obj = { name: '二层条码8', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'two_floor_barcode9') {
+            const obj = { name: '二层条码9', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'two_floor_barcode10') {
+            const obj = { name: '二层条码10', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'three_floor_barcode1') {
+            const obj = { name: '三层条码1', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'three_floor_barcode2') {
+            const obj = { name: '三层条码2', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'three_floor_barcode3') {
+            const obj = { name: '三层条码3', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'three_floor_barcode4') {
+            const obj = { name: '三层条码4', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'three_floor_barcode5') {
+            const obj = { name: '三层条码5', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'three_floor_barcode6') {
+            const obj = { name: '三层条码6', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'three_floor_barcode7') {
+            const obj = { name: '三层条码7', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'three_floor_barcode8') {
+            const obj = { name: '三层条码8', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'three_floor_barcode9') {
+            const obj = { name: '三层条码9', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'three_floor_barcode10') {
+            const obj = { name: '三层条码10', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'order') {
+            const obj = { name: '工单号', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'full_number') {
+            const obj = { name: '满料位数量', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'storage_stock_num') {
+            const obj = { name: '倒料位数量', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'now_one_box_num') {
+            const obj = { name: '当前箱数量（每框实时)', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'order_prod_allnum') {
+            const obj = { name: '工单生产总量', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'now_order_prod_num') {
+            const obj = { name: '当前生产总量（订单实时）', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'noApplyTaskMessage') {
+            const obj = { name: '未申请任务原因', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'line_stock_num') {
+            const obj = { name: '线体库存数量(接料位、满料位数量和)', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'order_compel_finish') {
+            const obj = { name: '工单强制完成', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'empty_put_finish') {
+            const obj = { name: '空箱位空箱补给完成', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'agv_take_finish') {
+            const obj = { name: '满箱已运出满箱位', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'one_qty') {
+            const obj = { name: '1号口数量', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'two_qty') {
+            const obj = { name: '2号口数量', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'three_qty') {
+            const obj = { name: '3号口数量', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'four_qty') {
+            const obj = { name: '4号口数量', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'five_qty') {
+            const obj = { name: '5号口数量', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'one_status') {
+            const obj = { name: '1号口状态', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'two_status') {
+            const obj = { name: '2号口状态', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'three_status') {
+            const obj = { name: '3号口状态', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'four_status') {
+            const obj = { name: '4号口状态', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'five_status') {
+            const obj = { name: '5号口状态', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'boxType') {
+            const obj = { name: '箱型', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'getStation') {
+            const obj = { name: '取货位', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'putStation') {
+            const obj = { name: '放货位', value: data[val] }
+            this.arr.push(obj)
+          } else if (val === 'barcodeArr') {
+            const obj = { name: '码垛条码', value: data[val] }
+            this.arr.push(obj)
+          }else if (val==='robotCode'){
+            const obj = { name: '编码', value: data[val] }
+            this.arr.push(obj)
+          }else if (val==='robotTypeCode'){
+            const obj = { name: '型号', value: data[val] }
+            this.arr.push(obj)
+          }else if (val==='pointCode'){
+            const obj = { name: '节点编码', value: data[val] }
+            this.arr.push(obj)
+          }else if (val==='positionX'){
+            const obj = { name: '坐标x', value: data[val] }
+            this.arr.push(obj)
+          }else if (val==='positionY'){
+            const obj = { name: '坐标y', value: data[val] }
+            this.arr.push(obj)
+          }else if (val==='theta'){
+            const obj = { name: '⻆度', value: data[val] }
+            this.arr.push(obj)
+          }else if (val==='forkHeight'){
+            const obj = { name: '货叉⾼度', value: data[val] }
+            this.arr.push(obj)
+          }else if (val==='forkLength'){
+            const obj = { name: '货叉⻓度', value: data[val] }
+            this.arr.push(obj)
+          }else if (val==='forkTheta'){
+            const obj = { name: '货叉相对机器⼈⻆度', value: data[val] }
+            this.arr.push(obj)
+          }else if (val==='stationCode'){
+            const obj = { name: '⼯作站编码', value: data[val] }
+            this.arr.push(obj)
+          }else if (val==='locationCode'){
+            const obj = { name: '⼯作位编码', value: data[val] }
+            this.arr.push(obj)
+          }else if (val==='state'){
+            const obj = { name: '机器⼈状态', value: data[val] }
+            this.arr.push(obj)
+          }else if (val==='hardwareState'){
+            const obj = { name: '机器⼈硬件状态', value: data[val] }
+            this.arr.push(obj)
+          }else if (val==='trays'){
+            const obj = { name: '背篓描述', value: data[val] }
+            this.arr.push(obj)
+          }else if (val==='trayLevel'){
+            const obj = { name: '背篓序号', value: data[val] }
+            this.arr.push(obj)
+          }else if (val==='containerCode'){
+            const obj = { name: '容器编码', value: data[val] }
+            this.arr.push(obj)
+          }else if (val==='taskCodes'){
+            const obj = { name: '业务任务', value: data[val] }
+            this.arr.push(obj)
+          }else if (val==='positionCode'){
+            const obj = { name: '位置编码', value: data[val] }
+            this.arr.push(obj)
           }
-          /* else {
-            const obj = { name: val, value: data[val] }
-            arr.push(obj)
-          }*/
         }
-        return arr
       }
+      // console.log('arr:', this.arr)
+    },
+    initStatus() { // 初始化所有节点的设备信息，通过节点id对应设备编号
+      let resion = {}
+      resion = lf.getGraphData().nodes.map(item => ({ id: item.id, device_code: item.properties.device }))
+      getDeviceByCodes(resion).then(res => {
+        let startTime=new Date().getTime();
+        let arr=[];
+        let obj={};
+        if(window.lastArr){
+          res.forEach(i=>{
+            obj[i.id]=i
+          })
+
+          window.lastArr.forEach(old=>{
+            let _new=obj[old.id];
+            if(!isEqual(old,_new)){
+              arr.push(_new)
+            }
+          })
+        }
+
+        this.allDeviceMsg = res // 拿到所有节点的设备数据
+        // console.log('initStatus-res', res)
+        // 实时设置状态信息
+        for (var item of arr) { // 循环并且设置属性值
+
+          let  temp={}
+          if (item.data !== undefined) {
+            if (item.data.isOnline !== undefined) {
+              temp.isOnline = item.data.isOnline
+              // lf.setProperties(item.id, {
+              //   isOnline: item.data.isOnline
+              // })
+            }
+            if (item.data.hasGoods !== undefined) {
+              temp.hasGoods = item.data.hasGoods
+              // lf.setProperties(item.id, {
+              //   hasGoods: item.data.hasGoods
+              // })
+            }
+            if (item.data.isError !== undefined) {
+              temp.isError = item.data.isError
+              // lf.setProperties(item.id, {
+              //   isError: item.data.isError
+              // })
+            }
+            lf.setProperties(item.id , temp)
+          }
+        }
+        window.lastArr = res
+        // 设置动态实时显示设备信息
+        const { nodes } = lf.getSelectElements() // 获取选中的节点
+        // console.log(nodes)
+        if (nodes.length === 1) { // 因为是定时器，没有选中则不用实时更新显示数据
+          this.moveShow(nodes[0]) // 监控模式下不可能托选，因此就只有一个数据
+        }
+        let endTime=new Date().getTime();
+
+        console.log("time:",endTime - startTime)
+      })
     },
     dialogSave() {
       deviceCrud.changeDeviceStatus(this.form).then(res => {
-        this.notify('操作成功', 'success')
+        this.$notify({ title: '操作成功', message: '', type: 'success' })
         this.dialogFormVisible = false
-        this.initArr2()
+        this.dialogFormVisible3 = false
+        this.dialogFormVisible4 = false
+        this.dialogFormVisible5 = false
+        this.dialogFormVisible6 = false
+        this.initStageData()
       }).catch(err => {
         this.dialogFormVisible = false
-        console.log(err.response.data.message)
-      })
-    },
-    statusSave() {
-      deviceCrud.changeFenceStatus(this.form).then(res => {
-        this.notify('操作成功', 'success')
-        this.dialogFormVisible2 = false
-        this.initArr2()
-      }).catch(err => {
-        this.dialogFormVisible2 = false
+        this.dialogFormVisible3 = false
+        this.dialogFormVisible4 = false
+        this.dialogFormVisible5 = false
         console.log(err.response.data.message)
       })
     },
@@ -495,99 +866,52 @@ export default {
       deviceCrud.saveBarcode(this.form).then(res => {
         this.notify('操作成功', 'success')
         this.dialogFormVisible1 = false
-        this.initArr2()
+        this.initStageData()
       }).catch(err => {
         this.dialogFormVisible1 = false
         console.log(err.response.data.message)
       })
-    },
-    initArr2() {
-      actorCrud.queryStageActor('SHDP').then(data => {
-        if (data.detail.length > 0) {
-          this.grid_width = data.form.grid_width
-          this.arr2 = []
-          for (let i = 0; i < data.form.grid_length; i++) {
-            const a = { 'id': i, 'name': '', device_code: '', img: '', index: i, img2: '1', angle: '0' }
-            this.arr2.push(a)
-          }
-          for (const i of data.detail) {
-            const index = i.index
-            this.arr2.splice(index, 1, i)
-          }
-        }
-      }).catch(err => {
-        console.log(err.response.data.message)
-      })
-    },
-    webSocket() {
-      const that = this
-      if (typeof (WebSocket) === 'undefined') {
-        this.$notify({
-          title: '提示',
-          message: '当前浏览器无法接收实时报警信息，请使用谷歌浏览器！',
-          type: 'warning',
-          duration: 0
-        })
-      } else {
-        const id = 'device_monitor'
-        // 获取token保存到vuex中的用户信息，此处仅适用于本项目，注意删除或修改
-        // 实例化socket，这里我把用户名传给了后台，使后台能判断要把消息发给哪个用户，其实也可以后台直接获取用户IP来判断并推送
-
-        // const wsUri = process.env.VUE_APP_WS_API + '/webSocket/' + id
-        const wsUri = window.g.prod.VUE_APP_BASE_API.replace('http', 'ws') + '/webSocket/' + id
-        this.socket = new WebSocket(wsUri)
-        // 监听socket打开
-        this.socket.onopen = function() {
-          console.log('浏览器WebSocket已打开')
-          // that.socket.send('测试客户端发送消息')
-        }
-
-        // 监听socket消息接收
-        this.socket.onmessage = function(msg) {
-          const list = JSON.parse(msg.data).msg.detail
-          // console.log(list)
-
-          for (const item of list) {
-            const index = item.index
-            // that.arr2.splice(index, 1, item)
-
-            if (item.data) {
-              Object.assign(that.arr2[index].data, item.data)
-            }
-          }
-        }
-
-        // 监听socket错误
-        this.socket.onerror = function() {
-          that.$notify({
-            title: '错误',
-            message: '服务器错误，无法接收实时报警信息',
-            type: 'error',
-            duration: 0
-          })
-        }
-        // 监听socket关闭
-        this.socket.onclose = function() {
-          console.log('WebSocket已关闭')
-        }
-      }
     }
   }
 }
 </script>
+
+<style>
+html, body {
+  height: 100%;
+}
+
+body {
+  padding: 0;
+  margin: 0;
+}
+</style>
 <style scoped>
-.normal {
-  background: #4a659c !important;
+.container {
+  background-color: #f8f9fa;
+  height: 100%;
 }
 
-.error {
-  background: #95341c !important;
+.newDialog /deep/ .el-dialog__header {
+  padding: 1vh 1vw 0 1vw;
 }
 
-</style>
-<style>
+.newDialog /deep/ .el-dialog__body {
+  padding: 1vh 1vw;
+}
 
-.monitor-wrap .el-popover {
-  margin-left: 35px;
+.toolbar-sty {
+  position: absolute;
+  margin-top: 5px;
+  top: 0;
+  padding: 5px;
+  left: 30px;
+  height: 45px;
+  /*width: 310px;*/
+  display: flex;
+  align-items: center;
+  border-bottom: 1px solid #e5e5e5;
+  z-index: 10;
+  background: #e5e5e5;
 }
 </style>