diff --git a/src/main/java/com/supwisdom/dlpay/water/service/impl/DeviceServiceImpl.java b/src/main/java/com/supwisdom/dlpay/water/service/impl/DeviceServiceImpl.java
index 6334cce..182f4cc 100644
--- a/src/main/java/com/supwisdom/dlpay/water/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/supwisdom/dlpay/water/service/impl/DeviceServiceImpl.java
@@ -80,7 +80,7 @@
         if (regiOption.isPresent()) {
             TArea region = regiOption.get();
             device.setAreano(region.getAreano());
-            device.setDeviceStatus("正常");
+            device.setDeviceStatus("normal");
             deviceDao.save(device);
             return true;
         }
@@ -134,7 +134,7 @@
     public boolean deleteDevice(Integer deviceid) {
         TDevice device = queryDeviceById(deviceid);
         if (device != null) {
-            device.setDeviceStatus("注销");
+            device.setDeviceStatus("closed");
             deviceDao.save(device);
             return true;
         }
diff --git a/src/main/resources/templates/system/device/index.html b/src/main/resources/templates/system/device/index.html
index 8e0f32b..8670b7a 100644
--- a/src/main/resources/templates/system/device/index.html
+++ b/src/main/resources/templates/system/device/index.html
@@ -114,7 +114,23 @@
                 [
                     {field: 'devicename', align: 'center', title: '设备名称'},
                     {field: 'deviceno', align: 'center', title: '设备编号', unresize: true},
-                    {field: 'deviceStatus', align: 'center', title: '状态', unresize: true},
+                    {
+                        field: 'deviceStatus',
+                        align: 'center',
+                        title: '状态',
+                        unresize: true,
+                        templet: function (item) {
+                            if (item.deviceStatus === 'normal') {
+                                return '正常'
+                            } else if (item.deviceStatus === 'closed') {
+                                return '注销'
+                            } else if (item.deviceStatus === 'logout') {
+                                return '签出';
+                            } else {
+                                return item.deviceStatus
+                            }
+                        }
+                    },
                     {field: 'areaname', align: 'center', title: '所在区域'},
                     {field: 'deviceLineCheck', align: 'center', title: '心跳'},
                     {field: 'softVer', align: 'center', title: '版本号'},
@@ -138,7 +154,16 @@
             var devicename = $('#devicename-search-value').val();
             var deviceno = $('#deviceno-search-value').val();
             var areano = $('#select-region').val();
-            var status = $('#select-status').val();
+            var status;
+            if ($('#select-status').val() === '正常') {
+                status = 'normal'
+            } else if ($('#select-status').val() === '注销') {
+                status = 'closed'
+            } else if ($('#select-status').val() === '签出') {
+                status = 'logout'
+            } else {
+                status = $('#select-status').val()
+            }
             table.reload('devicetable', {
                 where: {
                     devicename: devicename,