提升机缺少floor

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/device_status/DeviceStatusDeviceDriver.java

@@ -74,6 +74,7 @@ public class DeviceStatusDeviceDriver extends AbstractOpcDeviceDriver implements
     String load = "";
     String alarm = "";
     String task_id = "";
+    String floor ="";
 
     Boolean iserror = false;
     Boolean hasGoods = false;
@@ -110,6 +111,7 @@ public class DeviceStatusDeviceDriver extends AbstractOpcDeviceDriver implements
         jo.put("load", load);
         jo.put("alarm", alarm);
         jo.put("task_id", task_id);
+        jo.put("floor",floor);
         jo.put("isOnline", this.getIsonline());
         jo.put("isError",this.getIserror());
         jo.put("hasGoods", this.getHasGoods());

acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/DeviceStatusData.java

@@ -29,4 +29,7 @@ public class DeviceStatusData {
     //任务号
     String taskId;
 
+    //楼层
+    String floor;
+
 }

acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryLKDeviceStatus.java

@@ -70,6 +70,7 @@ public class QueryLKDeviceStatus {
             deviceStatusDeviceDriver.setLoad(deviceStatusData.getLoad());
             deviceStatusDeviceDriver.setAlarm(deviceStatusData.getAlarm());
             deviceStatusDeviceDriver.setTask_id(deviceStatusData.getTaskId());
+            deviceStatusDeviceDriver.setFloor(deviceStatusData.getFloor());
             deviceStatusDeviceDriver.setIsonline(true);
             if(!"0".equals(deviceStatusData.getAlarm())) {
                 deviceStatusDeviceDriver.setIserror(true);

acs/nladmin-ui/src/views/system/monitor/device/index.vue

@@ -608,6 +608,9 @@ export default {
           } else if (val === 'task_id') {
             const obj = { name: '任务号', value: data[val] }
             this.arr.push(obj)
+          } else if (val === 'floor') {
+            const obj = { name: '楼层', value: data[val] }
+            this.arr.push(obj)
           }
         }
       }