diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index fcb840e..d89046f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -219,6 +219,7 @@
         list.forEach(deviceDto -> {
             deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt()));
             deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
+            deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea()) + "/" + deviceDto.getPosition());
         });
         List<Object> res = new ArrayList<>();
         res.addAll(list);

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index fcb840e..d89046f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -219,6 +219,7 @@
         list.forEach(deviceDto -> {
             deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt()));
             deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
+            deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea()) + "/" + deviceDto.getPosition());
         });
         List<Object> res = new ArrayList<>();
         res.addAll(list);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java
index e690dd4..ac37dec 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java
@@ -20,25 +20,21 @@
      */
     DEVICE_EXPORT(new ArrayList() {{
         add(new Header("设备编号", "devcode"));
-        add(new Header("设备名称", "deviceName"));
-        add(new Header("监控内容", "watchType"));
+        add(new Header("设备类型", "deviceTypeName"));
         add(new Header("在线状态", "onlineStateName"));
-        add(new Header("设备位置", "position"));
+        add(new Header("设备位置", "areaFullName"));
         add(new Header("井编号", "wellCode"));
-        add(new Header("集中器编号", "concenCode"));
-        add(new Header("安装时间", "installDateFmt"));
+        add(new Header("安装时间", "installDate"));
     }}, new HashMap<String, Short>() {
         {
             put("设备编号", (short)6000);
-            put("设备名称", (short)8000);
-            put("监控内容", (short)6000);
-            put("设备位置", (short)6000);
+            put("设备类型", (short)8000);
+            put("设备位置", (short)12000);
             put("权属单位", (short)8000);
             put("井编号", (short)6000);
-            put("集中器编号", (short)6000);
             put("安装时间", (short)5000);
         }
-    }, "device.xlsx", "井盖设备数据导出"
+    }, "device.xlsx", "设备数据导出"
     );
 
     /**