diff --git a/mock/system/user.js b/mock/system/user.js
index 37f5ff2..6399039 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -84,16 +84,20 @@
   'menus': [
     { 'code': 'data', 'icon': 'icon-data', 'id': '1138702379389775873', 'ismenu': '1', 'levels': 1, 'name': '数据管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/data' },
     { 'code': 'sys_config', 'icon': 'icon-sysconfig', 'id': '1184010804933668866', 'ismenu': '1', 'levels': 1, 'name': '系统配置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/sysconfig' },
-    { 'code': 'nbdevice', 'icon': '', 'id': '1138694597554958338', 'ismenu': '1', 'levels': 1, 'name': '电信NB注册', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/nbdevice/list' },
     { 'code': 'overview', 'icon': 'icon-overview', 'id': '1138701347507105794', 'ismenu': '1', 'levels': 1, 'name': '窨井状态总览', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/overview/wellList' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138692702442582017', 'ismenu': '1', 'levels': 1, 'name': '集中器管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/concentrator/list' },
     { 'code': 'well', 'icon': 'icon-well', 'id': '1138377674778685442', 'ismenu': '1', 'levels': 1, 'name': '窨井管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/well' },
     { 'code': 'dashboard', 'icon': '', 'id': '1275011720930205698', 'ismenu': '0', 'levels': 1, 'name': '首页', 'num': 0, 'parentId': '0', 'resourceType': '04', 'url': '/dashboard' },
     { 'code': 'alarm', 'icon': 'icon-alarm', 'id': '1138696443757555713', 'ismenu': '1', 'levels': 1, 'name': '告警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/alarm' },
     { 'code': 'alarmrule', 'icon': '', 'id': '1138697759749795842', 'ismenu': '1', 'levels': 1, 'name': '告警规则设置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/alarmRule/list' },
     { 'code': 'job', 'icon': '', 'id': '1138699051712868353', 'ismenu': '1', 'levels': 1, 'name': '告警工单', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/job/list' },
     { 'code': 'device', 'icon': 'icon-device', 'id': '1138378119630761985', 'ismenu': '1', 'levels': 1, 'name': '设备管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device' },
+    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138692702442582017', 'ismenu': '1', 'levels': 1, 'name': '集中器管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/concentrator/list' },
+    { 'code': 'device_list', 'icon': '', 'id': '1138678001323175937', 'ismenu': '1', 'levels': 11, 'name': '设备列表', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '03', 'url': '/device/list' },
     { 'code': 'device_config', 'icon': '', 'id': '1138690889324654593', 'ismenu': '1', 'levels': 1, 'name': '设备配置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/config' },
+    { 'code': 'nbdevice', 'icon': '', 'id': '1138694597554958338', 'ismenu': '1', 'levels': 1, 'name': '电信NB注册', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/nbdevice/list' },
+    { 'code': 'device_type', 'icon': '', 'id': '1138694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备类型管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/type' },
+    { 'code': 'device_model', 'icon': '', 'id': '1128694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备型号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/model' },
+    { 'code': 'device_model', 'icon': '', 'id': '1128694597554958338', 'ismenu': '1', 'levels': 1, 'name': '设备SIM卡号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/imei' },
     { 'code': 'system', 'icon': 'icon-setting', 'id': '105', 'ismenu': '1', 'levels': 1, 'name': '系统管理', 'num': 4, 'parentId': '0', 'resourceType': '03', 'url': '/system' },
     { 'code': 'well_add', 'icon': '', 'id': '1138614981481963521', 'ismenu': '1', 'levels': 2, 'name': '新增窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/add' },
     { 'code': 'noisedataList', 'icon': '', 'id': '1301828354294067202', 'ismenu': '0', 'levels': 2, 'name': '噪声记录仪', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/noisedata/list' },
@@ -181,7 +185,6 @@
     { 'code': 'alarm_now', 'icon': '', 'id': '1138696791851233281', 'ismenu': '1', 'levels': 11, 'name': '当前告警', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '03', 'url': '/alarm/now' },
     { 'code': 'alarm_content_type', 'icon': '', 'id': '1138697337723121665', 'ismenu': '0', 'levels': 11, 'name': '获取告警内容', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '04', 'url': '/alarm/contentType' },
     { 'code': 'alarmrule_update', 'icon': '', 'id': '1138698760955326466', 'ismenu': '0', 'levels': 11, 'name': '编辑告警规则', 'num': 0, 'parentId': '1138697759749795842', 'resourceType': '04', 'url': '/alarmRule/update' },
-    { 'code': 'device_list', 'icon': '', 'id': '1138678001323175937', 'ismenu': '1', 'levels': 11, 'name': '设备列表', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '03', 'url': '/device/list' },
     { 'code': 'device_add', 'icon': '', 'id': '1138686212658917378', 'ismenu': '0', 'levels': 11, 'name': '新增设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/add' },
     { 'code': 'device_delete', 'icon': '', 'id': '1138689666945085441', 'ismenu': '0', 'levels': 11, 'name': '删除设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/delete' },
     { 'code': 'device_export', 'icon': '', 'id': '1138690037587341314', 'ismenu': '0', 'levels': 11, 'name': '批量导出设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/batchExport' },

diff --git a/mock/system/user.js b/mock/system/user.js
index 37f5ff2..6399039 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -84,16 +84,20 @@
   'menus': [
     { 'code': 'data', 'icon': 'icon-data', 'id': '1138702379389775873', 'ismenu': '1', 'levels': 1, 'name': '数据管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/data' },
     { 'code': 'sys_config', 'icon': 'icon-sysconfig', 'id': '1184010804933668866', 'ismenu': '1', 'levels': 1, 'name': '系统配置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/sysconfig' },
-    { 'code': 'nbdevice', 'icon': '', 'id': '1138694597554958338', 'ismenu': '1', 'levels': 1, 'name': '电信NB注册', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/nbdevice/list' },
     { 'code': 'overview', 'icon': 'icon-overview', 'id': '1138701347507105794', 'ismenu': '1', 'levels': 1, 'name': '窨井状态总览', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/overview/wellList' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138692702442582017', 'ismenu': '1', 'levels': 1, 'name': '集中器管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/concentrator/list' },
     { 'code': 'well', 'icon': 'icon-well', 'id': '1138377674778685442', 'ismenu': '1', 'levels': 1, 'name': '窨井管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/well' },
     { 'code': 'dashboard', 'icon': '', 'id': '1275011720930205698', 'ismenu': '0', 'levels': 1, 'name': '首页', 'num': 0, 'parentId': '0', 'resourceType': '04', 'url': '/dashboard' },
     { 'code': 'alarm', 'icon': 'icon-alarm', 'id': '1138696443757555713', 'ismenu': '1', 'levels': 1, 'name': '告警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/alarm' },
     { 'code': 'alarmrule', 'icon': '', 'id': '1138697759749795842', 'ismenu': '1', 'levels': 1, 'name': '告警规则设置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/alarmRule/list' },
     { 'code': 'job', 'icon': '', 'id': '1138699051712868353', 'ismenu': '1', 'levels': 1, 'name': '告警工单', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/job/list' },
     { 'code': 'device', 'icon': 'icon-device', 'id': '1138378119630761985', 'ismenu': '1', 'levels': 1, 'name': '设备管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device' },
+    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138692702442582017', 'ismenu': '1', 'levels': 1, 'name': '集中器管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/concentrator/list' },
+    { 'code': 'device_list', 'icon': '', 'id': '1138678001323175937', 'ismenu': '1', 'levels': 11, 'name': '设备列表', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '03', 'url': '/device/list' },
     { 'code': 'device_config', 'icon': '', 'id': '1138690889324654593', 'ismenu': '1', 'levels': 1, 'name': '设备配置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/config' },
+    { 'code': 'nbdevice', 'icon': '', 'id': '1138694597554958338', 'ismenu': '1', 'levels': 1, 'name': '电信NB注册', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/nbdevice/list' },
+    { 'code': 'device_type', 'icon': '', 'id': '1138694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备类型管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/type' },
+    { 'code': 'device_model', 'icon': '', 'id': '1128694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备型号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/model' },
+    { 'code': 'device_model', 'icon': '', 'id': '1128694597554958338', 'ismenu': '1', 'levels': 1, 'name': '设备SIM卡号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/imei' },
     { 'code': 'system', 'icon': 'icon-setting', 'id': '105', 'ismenu': '1', 'levels': 1, 'name': '系统管理', 'num': 4, 'parentId': '0', 'resourceType': '03', 'url': '/system' },
     { 'code': 'well_add', 'icon': '', 'id': '1138614981481963521', 'ismenu': '1', 'levels': 2, 'name': '新增窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/add' },
     { 'code': 'noisedataList', 'icon': '', 'id': '1301828354294067202', 'ismenu': '0', 'levels': 2, 'name': '噪声记录仪', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/noisedata/list' },
@@ -181,7 +185,6 @@
     { 'code': 'alarm_now', 'icon': '', 'id': '1138696791851233281', 'ismenu': '1', 'levels': 11, 'name': '当前告警', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '03', 'url': '/alarm/now' },
     { 'code': 'alarm_content_type', 'icon': '', 'id': '1138697337723121665', 'ismenu': '0', 'levels': 11, 'name': '获取告警内容', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '04', 'url': '/alarm/contentType' },
     { 'code': 'alarmrule_update', 'icon': '', 'id': '1138698760955326466', 'ismenu': '0', 'levels': 11, 'name': '编辑告警规则', 'num': 0, 'parentId': '1138697759749795842', 'resourceType': '04', 'url': '/alarmRule/update' },
-    { 'code': 'device_list', 'icon': '', 'id': '1138678001323175937', 'ismenu': '1', 'levels': 11, 'name': '设备列表', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '03', 'url': '/device/list' },
     { 'code': 'device_add', 'icon': '', 'id': '1138686212658917378', 'ismenu': '0', 'levels': 11, 'name': '新增设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/add' },
     { 'code': 'device_delete', 'icon': '', 'id': '1138689666945085441', 'ismenu': '0', 'levels': 11, 'name': '删除设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/delete' },
     { 'code': 'device_export', 'icon': '', 'id': '1138690037587341314', 'ismenu': '0', 'levels': 11, 'name': '批量导出设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/batchExport' },
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 8f7d2ac..12bdcf2 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -139,6 +139,24 @@
         name: 'NbDevice',
         component: () => import('@/views/nbDevice/listNbDevice'),
         meta: { title: 'NB注册', icon: 'icon-config', permission: ['/nbdevice/list'] }
+      },
+      {
+        path: '/deviceType',
+        name: 'DeviceType',
+        component: () => import('@/views/deviceManage/deviceType/deviceType'),
+        meta: { title: '设备类型管理', icon: 'icon-config', permission: ['/device/type'] }
+      },
+      {
+        path: '/deviceModel',
+        name: 'DeviceModel',
+        component: () => import('@/views/deviceManage/deviceModel/deviceModel'),
+        meta: { title: '设备型号管理', icon: 'icon-config', permission: ['/device/model'] }
+      },
+      {
+        path: '/deviceImei',
+        name: 'DeviceImei',
+        component: () => import('@/views/deviceManage/deviceImei/deviceImei'),
+        meta: { title: '设备SIM卡号管理', icon: 'icon-config', permission: ['/device/imei'] }
       }
     ]
   },

diff --git a/mock/system/user.js b/mock/system/user.js
index 37f5ff2..6399039 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -84,16 +84,20 @@
   'menus': [
     { 'code': 'data', 'icon': 'icon-data', 'id': '1138702379389775873', 'ismenu': '1', 'levels': 1, 'name': '数据管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/data' },
     { 'code': 'sys_config', 'icon': 'icon-sysconfig', 'id': '1184010804933668866', 'ismenu': '1', 'levels': 1, 'name': '系统配置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/sysconfig' },
-    { 'code': 'nbdevice', 'icon': '', 'id': '1138694597554958338', 'ismenu': '1', 'levels': 1, 'name': '电信NB注册', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/nbdevice/list' },
     { 'code': 'overview', 'icon': 'icon-overview', 'id': '1138701347507105794', 'ismenu': '1', 'levels': 1, 'name': '窨井状态总览', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/overview/wellList' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138692702442582017', 'ismenu': '1', 'levels': 1, 'name': '集中器管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/concentrator/list' },
     { 'code': 'well', 'icon': 'icon-well', 'id': '1138377674778685442', 'ismenu': '1', 'levels': 1, 'name': '窨井管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/well' },
     { 'code': 'dashboard', 'icon': '', 'id': '1275011720930205698', 'ismenu': '0', 'levels': 1, 'name': '首页', 'num': 0, 'parentId': '0', 'resourceType': '04', 'url': '/dashboard' },
     { 'code': 'alarm', 'icon': 'icon-alarm', 'id': '1138696443757555713', 'ismenu': '1', 'levels': 1, 'name': '告警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/alarm' },
     { 'code': 'alarmrule', 'icon': '', 'id': '1138697759749795842', 'ismenu': '1', 'levels': 1, 'name': '告警规则设置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/alarmRule/list' },
     { 'code': 'job', 'icon': '', 'id': '1138699051712868353', 'ismenu': '1', 'levels': 1, 'name': '告警工单', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/job/list' },
     { 'code': 'device', 'icon': 'icon-device', 'id': '1138378119630761985', 'ismenu': '1', 'levels': 1, 'name': '设备管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device' },
+    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138692702442582017', 'ismenu': '1', 'levels': 1, 'name': '集中器管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/concentrator/list' },
+    { 'code': 'device_list', 'icon': '', 'id': '1138678001323175937', 'ismenu': '1', 'levels': 11, 'name': '设备列表', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '03', 'url': '/device/list' },
     { 'code': 'device_config', 'icon': '', 'id': '1138690889324654593', 'ismenu': '1', 'levels': 1, 'name': '设备配置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/config' },
+    { 'code': 'nbdevice', 'icon': '', 'id': '1138694597554958338', 'ismenu': '1', 'levels': 1, 'name': '电信NB注册', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/nbdevice/list' },
+    { 'code': 'device_type', 'icon': '', 'id': '1138694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备类型管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/type' },
+    { 'code': 'device_model', 'icon': '', 'id': '1128694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备型号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/model' },
+    { 'code': 'device_model', 'icon': '', 'id': '1128694597554958338', 'ismenu': '1', 'levels': 1, 'name': '设备SIM卡号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/imei' },
     { 'code': 'system', 'icon': 'icon-setting', 'id': '105', 'ismenu': '1', 'levels': 1, 'name': '系统管理', 'num': 4, 'parentId': '0', 'resourceType': '03', 'url': '/system' },
     { 'code': 'well_add', 'icon': '', 'id': '1138614981481963521', 'ismenu': '1', 'levels': 2, 'name': '新增窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/add' },
     { 'code': 'noisedataList', 'icon': '', 'id': '1301828354294067202', 'ismenu': '0', 'levels': 2, 'name': '噪声记录仪', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/noisedata/list' },
@@ -181,7 +185,6 @@
     { 'code': 'alarm_now', 'icon': '', 'id': '1138696791851233281', 'ismenu': '1', 'levels': 11, 'name': '当前告警', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '03', 'url': '/alarm/now' },
     { 'code': 'alarm_content_type', 'icon': '', 'id': '1138697337723121665', 'ismenu': '0', 'levels': 11, 'name': '获取告警内容', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '04', 'url': '/alarm/contentType' },
     { 'code': 'alarmrule_update', 'icon': '', 'id': '1138698760955326466', 'ismenu': '0', 'levels': 11, 'name': '编辑告警规则', 'num': 0, 'parentId': '1138697759749795842', 'resourceType': '04', 'url': '/alarmRule/update' },
-    { 'code': 'device_list', 'icon': '', 'id': '1138678001323175937', 'ismenu': '1', 'levels': 11, 'name': '设备列表', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '03', 'url': '/device/list' },
     { 'code': 'device_add', 'icon': '', 'id': '1138686212658917378', 'ismenu': '0', 'levels': 11, 'name': '新增设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/add' },
     { 'code': 'device_delete', 'icon': '', 'id': '1138689666945085441', 'ismenu': '0', 'levels': 11, 'name': '删除设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/delete' },
     { 'code': 'device_export', 'icon': '', 'id': '1138690037587341314', 'ismenu': '0', 'levels': 11, 'name': '批量导出设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/batchExport' },
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 8f7d2ac..12bdcf2 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -139,6 +139,24 @@
         name: 'NbDevice',
         component: () => import('@/views/nbDevice/listNbDevice'),
         meta: { title: 'NB注册', icon: 'icon-config', permission: ['/nbdevice/list'] }
+      },
+      {
+        path: '/deviceType',
+        name: 'DeviceType',
+        component: () => import('@/views/deviceManage/deviceType/deviceType'),
+        meta: { title: '设备类型管理', icon: 'icon-config', permission: ['/device/type'] }
+      },
+      {
+        path: '/deviceModel',
+        name: 'DeviceModel',
+        component: () => import('@/views/deviceManage/deviceModel/deviceModel'),
+        meta: { title: '设备型号管理', icon: 'icon-config', permission: ['/device/model'] }
+      },
+      {
+        path: '/deviceImei',
+        name: 'DeviceImei',
+        component: () => import('@/views/deviceManage/deviceImei/deviceImei'),
+        meta: { title: '设备SIM卡号管理', icon: 'icon-config', permission: ['/device/imei'] }
       }
     ]
   },
diff --git a/src/utils/request.js b/src/utils/request.js
index 02dcee1..9ce2ab2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -39,19 +39,20 @@
     } else if (res.code !== 200) {
       // 50008:非法的token; 50012:其他客户端登录了;  50014:Token 过期了;
       if (res.code === 401 || res.code === 50012 || res.code === 50014) {
-        MessageBox.confirm(
-          '你已被登出，可以取消继续留在该页面，或者重新登录',
-          '确定登出',
-          {
-            confirmButtonText: '重新登录',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          store.dispatch('FedLogOut').then(() => {
-            location.reload() // 为了重新实例化vue-router对象 避免bug
-          })
-        })
+        // 开发完页面以后下面的这个注释需要打开
+        // MessageBox.confirm(
+        //   '你已被登出，可以取消继续留在该页面，或者重新登录',
+        //   '确定登出',
+        //   {
+        //     confirmButtonText: '重新登录',
+        //     cancelButtonText: '取消',
+        //     type: 'warning'
+        //   }
+        // ).then(() => {
+        //   store.dispatch('FedLogOut').then(() => {
+        //     location.reload() // 为了重新实例化vue-router对象 避免bug
+        //   })
+        // })
       } else {
         Message({
           showClose: true,

diff --git a/mock/system/user.js b/mock/system/user.js
index 37f5ff2..6399039 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -84,16 +84,20 @@
   'menus': [
     { 'code': 'data', 'icon': 'icon-data', 'id': '1138702379389775873', 'ismenu': '1', 'levels': 1, 'name': '数据管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/data' },
     { 'code': 'sys_config', 'icon': 'icon-sysconfig', 'id': '1184010804933668866', 'ismenu': '1', 'levels': 1, 'name': '系统配置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/sysconfig' },
-    { 'code': 'nbdevice', 'icon': '', 'id': '1138694597554958338', 'ismenu': '1', 'levels': 1, 'name': '电信NB注册', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/nbdevice/list' },
     { 'code': 'overview', 'icon': 'icon-overview', 'id': '1138701347507105794', 'ismenu': '1', 'levels': 1, 'name': '窨井状态总览', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/overview/wellList' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138692702442582017', 'ismenu': '1', 'levels': 1, 'name': '集中器管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/concentrator/list' },
     { 'code': 'well', 'icon': 'icon-well', 'id': '1138377674778685442', 'ismenu': '1', 'levels': 1, 'name': '窨井管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/well' },
     { 'code': 'dashboard', 'icon': '', 'id': '1275011720930205698', 'ismenu': '0', 'levels': 1, 'name': '首页', 'num': 0, 'parentId': '0', 'resourceType': '04', 'url': '/dashboard' },
     { 'code': 'alarm', 'icon': 'icon-alarm', 'id': '1138696443757555713', 'ismenu': '1', 'levels': 1, 'name': '告警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/alarm' },
     { 'code': 'alarmrule', 'icon': '', 'id': '1138697759749795842', 'ismenu': '1', 'levels': 1, 'name': '告警规则设置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/alarmRule/list' },
     { 'code': 'job', 'icon': '', 'id': '1138699051712868353', 'ismenu': '1', 'levels': 1, 'name': '告警工单', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/job/list' },
     { 'code': 'device', 'icon': 'icon-device', 'id': '1138378119630761985', 'ismenu': '1', 'levels': 1, 'name': '设备管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device' },
+    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138692702442582017', 'ismenu': '1', 'levels': 1, 'name': '集中器管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/concentrator/list' },
+    { 'code': 'device_list', 'icon': '', 'id': '1138678001323175937', 'ismenu': '1', 'levels': 11, 'name': '设备列表', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '03', 'url': '/device/list' },
     { 'code': 'device_config', 'icon': '', 'id': '1138690889324654593', 'ismenu': '1', 'levels': 1, 'name': '设备配置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/config' },
+    { 'code': 'nbdevice', 'icon': '', 'id': '1138694597554958338', 'ismenu': '1', 'levels': 1, 'name': '电信NB注册', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/nbdevice/list' },
+    { 'code': 'device_type', 'icon': '', 'id': '1138694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备类型管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/type' },
+    { 'code': 'device_model', 'icon': '', 'id': '1128694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备型号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/model' },
+    { 'code': 'device_model', 'icon': '', 'id': '1128694597554958338', 'ismenu': '1', 'levels': 1, 'name': '设备SIM卡号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/imei' },
     { 'code': 'system', 'icon': 'icon-setting', 'id': '105', 'ismenu': '1', 'levels': 1, 'name': '系统管理', 'num': 4, 'parentId': '0', 'resourceType': '03', 'url': '/system' },
     { 'code': 'well_add', 'icon': '', 'id': '1138614981481963521', 'ismenu': '1', 'levels': 2, 'name': '新增窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/add' },
     { 'code': 'noisedataList', 'icon': '', 'id': '1301828354294067202', 'ismenu': '0', 'levels': 2, 'name': '噪声记录仪', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/noisedata/list' },
@@ -181,7 +185,6 @@
     { 'code': 'alarm_now', 'icon': '', 'id': '1138696791851233281', 'ismenu': '1', 'levels': 11, 'name': '当前告警', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '03', 'url': '/alarm/now' },
     { 'code': 'alarm_content_type', 'icon': '', 'id': '1138697337723121665', 'ismenu': '0', 'levels': 11, 'name': '获取告警内容', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '04', 'url': '/alarm/contentType' },
     { 'code': 'alarmrule_update', 'icon': '', 'id': '1138698760955326466', 'ismenu': '0', 'levels': 11, 'name': '编辑告警规则', 'num': 0, 'parentId': '1138697759749795842', 'resourceType': '04', 'url': '/alarmRule/update' },
-    { 'code': 'device_list', 'icon': '', 'id': '1138678001323175937', 'ismenu': '1', 'levels': 11, 'name': '设备列表', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '03', 'url': '/device/list' },
     { 'code': 'device_add', 'icon': '', 'id': '1138686212658917378', 'ismenu': '0', 'levels': 11, 'name': '新增设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/add' },
     { 'code': 'device_delete', 'icon': '', 'id': '1138689666945085441', 'ismenu': '0', 'levels': 11, 'name': '删除设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/delete' },
     { 'code': 'device_export', 'icon': '', 'id': '1138690037587341314', 'ismenu': '0', 'levels': 11, 'name': '批量导出设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/batchExport' },
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 8f7d2ac..12bdcf2 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -139,6 +139,24 @@
         name: 'NbDevice',
         component: () => import('@/views/nbDevice/listNbDevice'),
         meta: { title: 'NB注册', icon: 'icon-config', permission: ['/nbdevice/list'] }
+      },
+      {
+        path: '/deviceType',
+        name: 'DeviceType',
+        component: () => import('@/views/deviceManage/deviceType/deviceType'),
+        meta: { title: '设备类型管理', icon: 'icon-config', permission: ['/device/type'] }
+      },
+      {
+        path: '/deviceModel',
+        name: 'DeviceModel',
+        component: () => import('@/views/deviceManage/deviceModel/deviceModel'),
+        meta: { title: '设备型号管理', icon: 'icon-config', permission: ['/device/model'] }
+      },
+      {
+        path: '/deviceImei',
+        name: 'DeviceImei',
+        component: () => import('@/views/deviceManage/deviceImei/deviceImei'),
+        meta: { title: '设备SIM卡号管理', icon: 'icon-config', permission: ['/device/imei'] }
       }
     ]
   },
diff --git a/src/utils/request.js b/src/utils/request.js
index 02dcee1..9ce2ab2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -39,19 +39,20 @@
     } else if (res.code !== 200) {
       // 50008:非法的token; 50012:其他客户端登录了;  50014:Token 过期了;
       if (res.code === 401 || res.code === 50012 || res.code === 50014) {
-        MessageBox.confirm(
-          '你已被登出，可以取消继续留在该页面，或者重新登录',
-          '确定登出',
-          {
-            confirmButtonText: '重新登录',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          store.dispatch('FedLogOut').then(() => {
-            location.reload() // 为了重新实例化vue-router对象 避免bug
-          })
-        })
+        // 开发完页面以后下面的这个注释需要打开
+        // MessageBox.confirm(
+        //   '你已被登出，可以取消继续留在该页面，或者重新登录',
+        //   '确定登出',
+        //   {
+        //     confirmButtonText: '重新登录',
+        //     cancelButtonText: '取消',
+        //     type: 'warning'
+        //   }
+        // ).then(() => {
+        //   store.dispatch('FedLogOut').then(() => {
+        //     location.reload() // 为了重新实例化vue-router对象 避免bug
+        //   })
+        // })
       } else {
         Message({
           showClose: true,
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..b22e406
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,272 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
+      <el-row :gutter="20">
+        <!--<el-col :span="12">-->
+        <!--<el-form-item label="设备名称" prop="deviceName">-->
+        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="安装日期" prop="installDate">
+            <el-date-picker
+              v-model.trim="deviceForm.installDate"
+              :disabled="isDetailMode"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备型号" prop="modelId">
+            <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
+              <el-option
+                v-for="item in deviceModelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="井编号" prop="wellCode">
+            <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-show="!(isDetailMode&&deviceForm.concenCode=='')" label="集中器编号" prop="concenCode">
+            <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDevice, updateDevice, getDeviceType, getDeviceModel } from '@/api/device/device'
+
+export default {
+  name: 'EditDevice',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceForm: {
+        id: '',
+        deviceName: '',
+        devcode: '',
+        deviceType: '',
+        wellCode: '',
+        modelId: '',
+        installDate: '',
+        concenCode: ''
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增啊啊啊啊啊啊',
+        detail: '详情'
+      }, // 表头显示标题
+      deviceTypeList: null, // 设备类型列表
+      deviceModelList: null, // 设备型号列表
+      showDeviceType: true, // 是否显示设备类型选项
+      showModelType: true, // 是否显示型号选项
+      rules: {
+        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
+        devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
+        installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      isEditMode: false, // 编辑模式
+      isDetailMode: false // 详情模式
+    }
+  },
+  watch: {
+    'deviceForm.deviceType': function(val, oldval) {
+      this.fetchDeviceModel(val)
+    }
+  },
+  mounted() {
+    this.fetchDeviceType()
+    // this.fetchDeviceModel()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+        this.isDetailMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = false
+      } else {
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = true
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        id: '',
+        deviceName: '',
+        devcode: '',
+        deviceType: '',
+        wellCode: '',
+        modelId: '',
+        installDate: '',
+        concenCode: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDevice(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDevice(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 获取设备型号
+    fetchDeviceType() {
+      getDeviceType().then(response => {
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
+        }
+      })
+    },
+    typeChanged() {
+      this.deviceForm.modelId = ''
+    },
+    // 获取设备型号
+    fetchDeviceModel(val) {
+      getDeviceModel(val).then(response => {
+        this.deviceModelList = response.data
+        if (this.deviceModelList.length <= 1) {
+          this.showModelType = false
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 37f5ff2..6399039 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -84,16 +84,20 @@
   'menus': [
     { 'code': 'data', 'icon': 'icon-data', 'id': '1138702379389775873', 'ismenu': '1', 'levels': 1, 'name': '数据管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/data' },
     { 'code': 'sys_config', 'icon': 'icon-sysconfig', 'id': '1184010804933668866', 'ismenu': '1', 'levels': 1, 'name': '系统配置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/sysconfig' },
-    { 'code': 'nbdevice', 'icon': '', 'id': '1138694597554958338', 'ismenu': '1', 'levels': 1, 'name': '电信NB注册', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/nbdevice/list' },
     { 'code': 'overview', 'icon': 'icon-overview', 'id': '1138701347507105794', 'ismenu': '1', 'levels': 1, 'name': '窨井状态总览', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/overview/wellList' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138692702442582017', 'ismenu': '1', 'levels': 1, 'name': '集中器管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/concentrator/list' },
     { 'code': 'well', 'icon': 'icon-well', 'id': '1138377674778685442', 'ismenu': '1', 'levels': 1, 'name': '窨井管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/well' },
     { 'code': 'dashboard', 'icon': '', 'id': '1275011720930205698', 'ismenu': '0', 'levels': 1, 'name': '首页', 'num': 0, 'parentId': '0', 'resourceType': '04', 'url': '/dashboard' },
     { 'code': 'alarm', 'icon': 'icon-alarm', 'id': '1138696443757555713', 'ismenu': '1', 'levels': 1, 'name': '告警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/alarm' },
     { 'code': 'alarmrule', 'icon': '', 'id': '1138697759749795842', 'ismenu': '1', 'levels': 1, 'name': '告警规则设置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/alarmRule/list' },
     { 'code': 'job', 'icon': '', 'id': '1138699051712868353', 'ismenu': '1', 'levels': 1, 'name': '告警工单', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/job/list' },
     { 'code': 'device', 'icon': 'icon-device', 'id': '1138378119630761985', 'ismenu': '1', 'levels': 1, 'name': '设备管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device' },
+    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138692702442582017', 'ismenu': '1', 'levels': 1, 'name': '集中器管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/concentrator/list' },
+    { 'code': 'device_list', 'icon': '', 'id': '1138678001323175937', 'ismenu': '1', 'levels': 11, 'name': '设备列表', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '03', 'url': '/device/list' },
     { 'code': 'device_config', 'icon': '', 'id': '1138690889324654593', 'ismenu': '1', 'levels': 1, 'name': '设备配置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/config' },
+    { 'code': 'nbdevice', 'icon': '', 'id': '1138694597554958338', 'ismenu': '1', 'levels': 1, 'name': '电信NB注册', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/nbdevice/list' },
+    { 'code': 'device_type', 'icon': '', 'id': '1138694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备类型管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/type' },
+    { 'code': 'device_model', 'icon': '', 'id': '1128694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备型号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/model' },
+    { 'code': 'device_model', 'icon': '', 'id': '1128694597554958338', 'ismenu': '1', 'levels': 1, 'name': '设备SIM卡号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/imei' },
     { 'code': 'system', 'icon': 'icon-setting', 'id': '105', 'ismenu': '1', 'levels': 1, 'name': '系统管理', 'num': 4, 'parentId': '0', 'resourceType': '03', 'url': '/system' },
     { 'code': 'well_add', 'icon': '', 'id': '1138614981481963521', 'ismenu': '1', 'levels': 2, 'name': '新增窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/add' },
     { 'code': 'noisedataList', 'icon': '', 'id': '1301828354294067202', 'ismenu': '0', 'levels': 2, 'name': '噪声记录仪', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/noisedata/list' },
@@ -181,7 +185,6 @@
     { 'code': 'alarm_now', 'icon': '', 'id': '1138696791851233281', 'ismenu': '1', 'levels': 11, 'name': '当前告警', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '03', 'url': '/alarm/now' },
     { 'code': 'alarm_content_type', 'icon': '', 'id': '1138697337723121665', 'ismenu': '0', 'levels': 11, 'name': '获取告警内容', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '04', 'url': '/alarm/contentType' },
     { 'code': 'alarmrule_update', 'icon': '', 'id': '1138698760955326466', 'ismenu': '0', 'levels': 11, 'name': '编辑告警规则', 'num': 0, 'parentId': '1138697759749795842', 'resourceType': '04', 'url': '/alarmRule/update' },
-    { 'code': 'device_list', 'icon': '', 'id': '1138678001323175937', 'ismenu': '1', 'levels': 11, 'name': '设备列表', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '03', 'url': '/device/list' },
     { 'code': 'device_add', 'icon': '', 'id': '1138686212658917378', 'ismenu': '0', 'levels': 11, 'name': '新增设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/add' },
     { 'code': 'device_delete', 'icon': '', 'id': '1138689666945085441', 'ismenu': '0', 'levels': 11, 'name': '删除设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/delete' },
     { 'code': 'device_export', 'icon': '', 'id': '1138690037587341314', 'ismenu': '0', 'levels': 11, 'name': '批量导出设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/batchExport' },
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 8f7d2ac..12bdcf2 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -139,6 +139,24 @@
         name: 'NbDevice',
         component: () => import('@/views/nbDevice/listNbDevice'),
         meta: { title: 'NB注册', icon: 'icon-config', permission: ['/nbdevice/list'] }
+      },
+      {
+        path: '/deviceType',
+        name: 'DeviceType',
+        component: () => import('@/views/deviceManage/deviceType/deviceType'),
+        meta: { title: '设备类型管理', icon: 'icon-config', permission: ['/device/type'] }
+      },
+      {
+        path: '/deviceModel',
+        name: 'DeviceModel',
+        component: () => import('@/views/deviceManage/deviceModel/deviceModel'),
+        meta: { title: '设备型号管理', icon: 'icon-config', permission: ['/device/model'] }
+      },
+      {
+        path: '/deviceImei',
+        name: 'DeviceImei',
+        component: () => import('@/views/deviceManage/deviceImei/deviceImei'),
+        meta: { title: '设备SIM卡号管理', icon: 'icon-config', permission: ['/device/imei'] }
       }
     ]
   },
diff --git a/src/utils/request.js b/src/utils/request.js
index 02dcee1..9ce2ab2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -39,19 +39,20 @@
     } else if (res.code !== 200) {
       // 50008:非法的token; 50012:其他客户端登录了;  50014:Token 过期了;
       if (res.code === 401 || res.code === 50012 || res.code === 50014) {
-        MessageBox.confirm(
-          '你已被登出，可以取消继续留在该页面，或者重新登录',
-          '确定登出',
-          {
-            confirmButtonText: '重新登录',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          store.dispatch('FedLogOut').then(() => {
-            location.reload() // 为了重新实例化vue-router对象 避免bug
-          })
-        })
+        // 开发完页面以后下面的这个注释需要打开
+        // MessageBox.confirm(
+        //   '你已被登出，可以取消继续留在该页面，或者重新登录',
+        //   '确定登出',
+        //   {
+        //     confirmButtonText: '重新登录',
+        //     cancelButtonText: '取消',
+        //     type: 'warning'
+        //   }
+        // ).then(() => {
+        //   store.dispatch('FedLogOut').then(() => {
+        //     location.reload() // 为了重新实例化vue-router对象 避免bug
+        //   })
+        // })
       } else {
         Message({
           showClose: true,
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..b22e406
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,272 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
+      <el-row :gutter="20">
+        <!--<el-col :span="12">-->
+        <!--<el-form-item label="设备名称" prop="deviceName">-->
+        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="安装日期" prop="installDate">
+            <el-date-picker
+              v-model.trim="deviceForm.installDate"
+              :disabled="isDetailMode"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备型号" prop="modelId">
+            <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
+              <el-option
+                v-for="item in deviceModelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="井编号" prop="wellCode">
+            <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-show="!(isDetailMode&&deviceForm.concenCode=='')" label="集中器编号" prop="concenCode">
+            <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDevice, updateDevice, getDeviceType, getDeviceModel } from '@/api/device/device'
+
+export default {
+  name: 'EditDevice',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceForm: {
+        id: '',
+        deviceName: '',
+        devcode: '',
+        deviceType: '',
+        wellCode: '',
+        modelId: '',
+        installDate: '',
+        concenCode: ''
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增啊啊啊啊啊啊',
+        detail: '详情'
+      }, // 表头显示标题
+      deviceTypeList: null, // 设备类型列表
+      deviceModelList: null, // 设备型号列表
+      showDeviceType: true, // 是否显示设备类型选项
+      showModelType: true, // 是否显示型号选项
+      rules: {
+        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
+        devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
+        installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      isEditMode: false, // 编辑模式
+      isDetailMode: false // 详情模式
+    }
+  },
+  watch: {
+    'deviceForm.deviceType': function(val, oldval) {
+      this.fetchDeviceModel(val)
+    }
+  },
+  mounted() {
+    this.fetchDeviceType()
+    // this.fetchDeviceModel()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+        this.isDetailMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = false
+      } else {
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = true
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        id: '',
+        deviceName: '',
+        devcode: '',
+        deviceType: '',
+        wellCode: '',
+        modelId: '',
+        installDate: '',
+        concenCode: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDevice(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDevice(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 获取设备型号
+    fetchDeviceType() {
+      getDeviceType().then(response => {
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
+        }
+      })
+    },
+    typeChanged() {
+      this.deviceForm.modelId = ''
+    },
+    // 获取设备型号
+    fetchDeviceModel(val) {
+      getDeviceModel(val).then(response => {
+        this.deviceModelList = response.data
+        if (this.deviceModelList.length <= 1) {
+          this.showModelType = false
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
new file mode 100644
index 0000000..8559872
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -0,0 +1,429 @@
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <!-- <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号/井编号" clearable />
+          </el-form-item> -->
+          <el-form-item v-if="showDeviceType" class="selectForm-container-item">
+            <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.isValid" placeholder="是否启用" clearable>
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item v-if="isAdmin" class="selectForm-container-item">
+            <el-select v-model="listQuery.isOnline" placeholder="在线情况" clearable>
+              <el-option
+                v-for="item in onlineStates"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item> -->
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+            搜索
+          </el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/device/batchExport')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template v-if="hasPerm('/device/batchImport')" :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/device/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/device/delete')" class="edit_btn" size="small" @click="del">
+            删除
+          </el-button>
+          <el-button v-if="hasPerm('/device/add')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column v-if="hasPerm('/device/delete')" align="center" type="selection" width="55" />
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
+              {{ scope.row[column.value] }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="datalist(scope.row)">
+              历史数据
+            </el-button>
+            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+            <el-button type="text" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+
+    <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
+
+    <detail-device v-show="detailShow" ref="detaildevice" />
+
+    <info-well v-show="wellShow" ref="wellInfo" />
+  </div>
+</template>
+
+<script>
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
+import detailDevice from '@/views/deviceManage/detailDevice'
+import { getDeviceList, getDeviceType, delDevice, batchImportDevice, batchExportDevice } from '@/api/device/device'
+import DownloadTemplate from '@/components/DownloadTemplate'
+import InfoWell from '@/views/wellManage/infoWell'
+import { isAdministrator, notContainConcentrator } from '@/utils/permission'
+
+export default {
+  name: 'ListDevice',
+  components: { DownloadTemplate, editDevice, detailDevice, InfoWell },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc',
+        isValid: ''
+      }, // 筛选条件
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      columns: [
+        {
+          text: '设备编号',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '描述',
+          value: 'typeDescription',
+          align: 'center'
+        },
+        {
+          text: '是否启用',
+          value: 'valid',
+          align: 'center'
+        },
+        {
+          text: '监控内容',
+          value: 'watchType',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 设备类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      fileList: [],
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      deptShowTop: false, // 是否显示顶级
+      onlineStates: [
+        { value: '1', name: '在线' },
+        { value: '0', name: '离线' }
+      ], // 在线情况
+      wellShow: false
+    }
+  },
+  computed: {
+    isAdmin() {
+      return isAdministrator()
+    }
+  },
+  mounted() {
+    this.fetchDeviceType()// 获取设备列表
+    if (!notContainConcentrator()) {
+      this.columns.splice(-1, 1)
+    }
+    // 如果参数中有井编号，则将查询条件填入，否则正常
+    if (this.$route.query && this.$route.query.wellCode && this.$route.query.wellCode !== '') {
+      this.listQuery.keywords = this.$route.query.wellCode
+      this.fetchData(true)
+    } else {
+      this.fetchData()// 获取数据
+    }
+  },
+  methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑设备信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row)
+    },
+    detail(row) {
+      this.$refs.editdevice.initDialog('detail', true, row)
+    },
+    // 删除设备
+    del() {
+      if (this.checkSelection()) {
+        const deviceIds = []
+        this.multipleSelection.forEach(function(value, index) {
+          deviceIds.push(value.id)
+        })
+        // wellNames = wellNames.slice(0, wellNames.length - 1)
+        this.$confirm(
+          '确定要删除所选设备吗？',
+          '确认操作',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          delDevice(deviceIds).then(response => {
+            if (response.code === 200) {
+              this.$message.success('删除成功')
+              this.fetchData()
+            }
+          })
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 批量导入集中器
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportDevice(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportDevice(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `设备列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取集中器数据
+    fetchData(isNowPage = true) {
+      // this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getDeviceList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    // 获取设备类型
+    fetchDeviceType() {
+      getDeviceType(this.listQuery).then(response => {
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
+        }
+        if (this.deviceTypeList.length <= 1) {
+          this.showDeviceType = false
+        }
+      })
+    },
+    datalist(row) {
+      const params = { devcode: row.devcode, deviceType: row.deviceType }
+      this.$router.push({ name: 'DataManage', query: params })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 37f5ff2..6399039 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -84,16 +84,20 @@
   'menus': [
     { 'code': 'data', 'icon': 'icon-data', 'id': '1138702379389775873', 'ismenu': '1', 'levels': 1, 'name': '数据管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/data' },
     { 'code': 'sys_config', 'icon': 'icon-sysconfig', 'id': '1184010804933668866', 'ismenu': '1', 'levels': 1, 'name': '系统配置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/sysconfig' },
-    { 'code': 'nbdevice', 'icon': '', 'id': '1138694597554958338', 'ismenu': '1', 'levels': 1, 'name': '电信NB注册', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/nbdevice/list' },
     { 'code': 'overview', 'icon': 'icon-overview', 'id': '1138701347507105794', 'ismenu': '1', 'levels': 1, 'name': '窨井状态总览', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/overview/wellList' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138692702442582017', 'ismenu': '1', 'levels': 1, 'name': '集中器管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/concentrator/list' },
     { 'code': 'well', 'icon': 'icon-well', 'id': '1138377674778685442', 'ismenu': '1', 'levels': 1, 'name': '窨井管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/well' },
     { 'code': 'dashboard', 'icon': '', 'id': '1275011720930205698', 'ismenu': '0', 'levels': 1, 'name': '首页', 'num': 0, 'parentId': '0', 'resourceType': '04', 'url': '/dashboard' },
     { 'code': 'alarm', 'icon': 'icon-alarm', 'id': '1138696443757555713', 'ismenu': '1', 'levels': 1, 'name': '告警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/alarm' },
     { 'code': 'alarmrule', 'icon': '', 'id': '1138697759749795842', 'ismenu': '1', 'levels': 1, 'name': '告警规则设置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/alarmRule/list' },
     { 'code': 'job', 'icon': '', 'id': '1138699051712868353', 'ismenu': '1', 'levels': 1, 'name': '告警工单', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/job/list' },
     { 'code': 'device', 'icon': 'icon-device', 'id': '1138378119630761985', 'ismenu': '1', 'levels': 1, 'name': '设备管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device' },
+    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138692702442582017', 'ismenu': '1', 'levels': 1, 'name': '集中器管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/concentrator/list' },
+    { 'code': 'device_list', 'icon': '', 'id': '1138678001323175937', 'ismenu': '1', 'levels': 11, 'name': '设备列表', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '03', 'url': '/device/list' },
     { 'code': 'device_config', 'icon': '', 'id': '1138690889324654593', 'ismenu': '1', 'levels': 1, 'name': '设备配置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/config' },
+    { 'code': 'nbdevice', 'icon': '', 'id': '1138694597554958338', 'ismenu': '1', 'levels': 1, 'name': '电信NB注册', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/nbdevice/list' },
+    { 'code': 'device_type', 'icon': '', 'id': '1138694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备类型管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/type' },
+    { 'code': 'device_model', 'icon': '', 'id': '1128694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备型号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/model' },
+    { 'code': 'device_model', 'icon': '', 'id': '1128694597554958338', 'ismenu': '1', 'levels': 1, 'name': '设备SIM卡号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/imei' },
     { 'code': 'system', 'icon': 'icon-setting', 'id': '105', 'ismenu': '1', 'levels': 1, 'name': '系统管理', 'num': 4, 'parentId': '0', 'resourceType': '03', 'url': '/system' },
     { 'code': 'well_add', 'icon': '', 'id': '1138614981481963521', 'ismenu': '1', 'levels': 2, 'name': '新增窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/add' },
     { 'code': 'noisedataList', 'icon': '', 'id': '1301828354294067202', 'ismenu': '0', 'levels': 2, 'name': '噪声记录仪', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/noisedata/list' },
@@ -181,7 +185,6 @@
     { 'code': 'alarm_now', 'icon': '', 'id': '1138696791851233281', 'ismenu': '1', 'levels': 11, 'name': '当前告警', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '03', 'url': '/alarm/now' },
     { 'code': 'alarm_content_type', 'icon': '', 'id': '1138697337723121665', 'ismenu': '0', 'levels': 11, 'name': '获取告警内容', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '04', 'url': '/alarm/contentType' },
     { 'code': 'alarmrule_update', 'icon': '', 'id': '1138698760955326466', 'ismenu': '0', 'levels': 11, 'name': '编辑告警规则', 'num': 0, 'parentId': '1138697759749795842', 'resourceType': '04', 'url': '/alarmRule/update' },
-    { 'code': 'device_list', 'icon': '', 'id': '1138678001323175937', 'ismenu': '1', 'levels': 11, 'name': '设备列表', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '03', 'url': '/device/list' },
     { 'code': 'device_add', 'icon': '', 'id': '1138686212658917378', 'ismenu': '0', 'levels': 11, 'name': '新增设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/add' },
     { 'code': 'device_delete', 'icon': '', 'id': '1138689666945085441', 'ismenu': '0', 'levels': 11, 'name': '删除设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/delete' },
     { 'code': 'device_export', 'icon': '', 'id': '1138690037587341314', 'ismenu': '0', 'levels': 11, 'name': '批量导出设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/batchExport' },
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 8f7d2ac..12bdcf2 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -139,6 +139,24 @@
         name: 'NbDevice',
         component: () => import('@/views/nbDevice/listNbDevice'),
         meta: { title: 'NB注册', icon: 'icon-config', permission: ['/nbdevice/list'] }
+      },
+      {
+        path: '/deviceType',
+        name: 'DeviceType',
+        component: () => import('@/views/deviceManage/deviceType/deviceType'),
+        meta: { title: '设备类型管理', icon: 'icon-config', permission: ['/device/type'] }
+      },
+      {
+        path: '/deviceModel',
+        name: 'DeviceModel',
+        component: () => import('@/views/deviceManage/deviceModel/deviceModel'),
+        meta: { title: '设备型号管理', icon: 'icon-config', permission: ['/device/model'] }
+      },
+      {
+        path: '/deviceImei',
+        name: 'DeviceImei',
+        component: () => import('@/views/deviceManage/deviceImei/deviceImei'),
+        meta: { title: '设备SIM卡号管理', icon: 'icon-config', permission: ['/device/imei'] }
       }
     ]
   },
diff --git a/src/utils/request.js b/src/utils/request.js
index 02dcee1..9ce2ab2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -39,19 +39,20 @@
     } else if (res.code !== 200) {
       // 50008:非法的token; 50012:其他客户端登录了;  50014:Token 过期了;
       if (res.code === 401 || res.code === 50012 || res.code === 50014) {
-        MessageBox.confirm(
-          '你已被登出，可以取消继续留在该页面，或者重新登录',
-          '确定登出',
-          {
-            confirmButtonText: '重新登录',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          store.dispatch('FedLogOut').then(() => {
-            location.reload() // 为了重新实例化vue-router对象 避免bug
-          })
-        })
+        // 开发完页面以后下面的这个注释需要打开
+        // MessageBox.confirm(
+        //   '你已被登出，可以取消继续留在该页面，或者重新登录',
+        //   '确定登出',
+        //   {
+        //     confirmButtonText: '重新登录',
+        //     cancelButtonText: '取消',
+        //     type: 'warning'
+        //   }
+        // ).then(() => {
+        //   store.dispatch('FedLogOut').then(() => {
+        //     location.reload() // 为了重新实例化vue-router对象 避免bug
+        //   })
+        // })
       } else {
         Message({
           showClose: true,
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..b22e406
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,272 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
+      <el-row :gutter="20">
+        <!--<el-col :span="12">-->
+        <!--<el-form-item label="设备名称" prop="deviceName">-->
+        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="安装日期" prop="installDate">
+            <el-date-picker
+              v-model.trim="deviceForm.installDate"
+              :disabled="isDetailMode"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备型号" prop="modelId">
+            <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
+              <el-option
+                v-for="item in deviceModelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="井编号" prop="wellCode">
+            <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-show="!(isDetailMode&&deviceForm.concenCode=='')" label="集中器编号" prop="concenCode">
+            <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDevice, updateDevice, getDeviceType, getDeviceModel } from '@/api/device/device'
+
+export default {
+  name: 'EditDevice',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceForm: {
+        id: '',
+        deviceName: '',
+        devcode: '',
+        deviceType: '',
+        wellCode: '',
+        modelId: '',
+        installDate: '',
+        concenCode: ''
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增啊啊啊啊啊啊',
+        detail: '详情'
+      }, // 表头显示标题
+      deviceTypeList: null, // 设备类型列表
+      deviceModelList: null, // 设备型号列表
+      showDeviceType: true, // 是否显示设备类型选项
+      showModelType: true, // 是否显示型号选项
+      rules: {
+        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
+        devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
+        installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      isEditMode: false, // 编辑模式
+      isDetailMode: false // 详情模式
+    }
+  },
+  watch: {
+    'deviceForm.deviceType': function(val, oldval) {
+      this.fetchDeviceModel(val)
+    }
+  },
+  mounted() {
+    this.fetchDeviceType()
+    // this.fetchDeviceModel()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+        this.isDetailMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = false
+      } else {
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = true
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        id: '',
+        deviceName: '',
+        devcode: '',
+        deviceType: '',
+        wellCode: '',
+        modelId: '',
+        installDate: '',
+        concenCode: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDevice(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDevice(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 获取设备型号
+    fetchDeviceType() {
+      getDeviceType().then(response => {
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
+        }
+      })
+    },
+    typeChanged() {
+      this.deviceForm.modelId = ''
+    },
+    // 获取设备型号
+    fetchDeviceModel(val) {
+      getDeviceModel(val).then(response => {
+        this.deviceModelList = response.data
+        if (this.deviceModelList.length <= 1) {
+          this.showModelType = false
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
new file mode 100644
index 0000000..8559872
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -0,0 +1,429 @@
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <!-- <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号/井编号" clearable />
+          </el-form-item> -->
+          <el-form-item v-if="showDeviceType" class="selectForm-container-item">
+            <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.isValid" placeholder="是否启用" clearable>
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item v-if="isAdmin" class="selectForm-container-item">
+            <el-select v-model="listQuery.isOnline" placeholder="在线情况" clearable>
+              <el-option
+                v-for="item in onlineStates"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item> -->
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+            搜索
+          </el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/device/batchExport')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template v-if="hasPerm('/device/batchImport')" :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/device/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/device/delete')" class="edit_btn" size="small" @click="del">
+            删除
+          </el-button>
+          <el-button v-if="hasPerm('/device/add')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column v-if="hasPerm('/device/delete')" align="center" type="selection" width="55" />
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
+              {{ scope.row[column.value] }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="datalist(scope.row)">
+              历史数据
+            </el-button>
+            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+            <el-button type="text" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+
+    <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
+
+    <detail-device v-show="detailShow" ref="detaildevice" />
+
+    <info-well v-show="wellShow" ref="wellInfo" />
+  </div>
+</template>
+
+<script>
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
+import detailDevice from '@/views/deviceManage/detailDevice'
+import { getDeviceList, getDeviceType, delDevice, batchImportDevice, batchExportDevice } from '@/api/device/device'
+import DownloadTemplate from '@/components/DownloadTemplate'
+import InfoWell from '@/views/wellManage/infoWell'
+import { isAdministrator, notContainConcentrator } from '@/utils/permission'
+
+export default {
+  name: 'ListDevice',
+  components: { DownloadTemplate, editDevice, detailDevice, InfoWell },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc',
+        isValid: ''
+      }, // 筛选条件
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      columns: [
+        {
+          text: '设备编号',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '描述',
+          value: 'typeDescription',
+          align: 'center'
+        },
+        {
+          text: '是否启用',
+          value: 'valid',
+          align: 'center'
+        },
+        {
+          text: '监控内容',
+          value: 'watchType',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 设备类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      fileList: [],
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      deptShowTop: false, // 是否显示顶级
+      onlineStates: [
+        { value: '1', name: '在线' },
+        { value: '0', name: '离线' }
+      ], // 在线情况
+      wellShow: false
+    }
+  },
+  computed: {
+    isAdmin() {
+      return isAdministrator()
+    }
+  },
+  mounted() {
+    this.fetchDeviceType()// 获取设备列表
+    if (!notContainConcentrator()) {
+      this.columns.splice(-1, 1)
+    }
+    // 如果参数中有井编号，则将查询条件填入，否则正常
+    if (this.$route.query && this.$route.query.wellCode && this.$route.query.wellCode !== '') {
+      this.listQuery.keywords = this.$route.query.wellCode
+      this.fetchData(true)
+    } else {
+      this.fetchData()// 获取数据
+    }
+  },
+  methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑设备信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row)
+    },
+    detail(row) {
+      this.$refs.editdevice.initDialog('detail', true, row)
+    },
+    // 删除设备
+    del() {
+      if (this.checkSelection()) {
+        const deviceIds = []
+        this.multipleSelection.forEach(function(value, index) {
+          deviceIds.push(value.id)
+        })
+        // wellNames = wellNames.slice(0, wellNames.length - 1)
+        this.$confirm(
+          '确定要删除所选设备吗？',
+          '确认操作',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          delDevice(deviceIds).then(response => {
+            if (response.code === 200) {
+              this.$message.success('删除成功')
+              this.fetchData()
+            }
+          })
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 批量导入集中器
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportDevice(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportDevice(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `设备列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取集中器数据
+    fetchData(isNowPage = true) {
+      // this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getDeviceList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    // 获取设备类型
+    fetchDeviceType() {
+      getDeviceType(this.listQuery).then(response => {
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
+        }
+        if (this.deviceTypeList.length <= 1) {
+          this.showDeviceType = false
+        }
+      })
+    },
+    datalist(row) {
+      const params = { devcode: row.devcode, deviceType: row.deviceType }
+      this.$router.push({ name: 'DataManage', query: params })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..b22e406
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,272 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
+      <el-row :gutter="20">
+        <!--<el-col :span="12">-->
+        <!--<el-form-item label="设备名称" prop="deviceName">-->
+        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="安装日期" prop="installDate">
+            <el-date-picker
+              v-model.trim="deviceForm.installDate"
+              :disabled="isDetailMode"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备型号" prop="modelId">
+            <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
+              <el-option
+                v-for="item in deviceModelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="井编号" prop="wellCode">
+            <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-show="!(isDetailMode&&deviceForm.concenCode=='')" label="集中器编号" prop="concenCode">
+            <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDevice, updateDevice, getDeviceType, getDeviceModel } from '@/api/device/device'
+
+export default {
+  name: 'EditDevice',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceForm: {
+        id: '',
+        deviceName: '',
+        devcode: '',
+        deviceType: '',
+        wellCode: '',
+        modelId: '',
+        installDate: '',
+        concenCode: ''
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增啊啊啊啊啊啊',
+        detail: '详情'
+      }, // 表头显示标题
+      deviceTypeList: null, // 设备类型列表
+      deviceModelList: null, // 设备型号列表
+      showDeviceType: true, // 是否显示设备类型选项
+      showModelType: true, // 是否显示型号选项
+      rules: {
+        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
+        devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
+        installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      isEditMode: false, // 编辑模式
+      isDetailMode: false // 详情模式
+    }
+  },
+  watch: {
+    'deviceForm.deviceType': function(val, oldval) {
+      this.fetchDeviceModel(val)
+    }
+  },
+  mounted() {
+    this.fetchDeviceType()
+    // this.fetchDeviceModel()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+        this.isDetailMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = false
+      } else {
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = true
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        id: '',
+        deviceName: '',
+        devcode: '',
+        deviceType: '',
+        wellCode: '',
+        modelId: '',
+        installDate: '',
+        concenCode: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDevice(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDevice(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 获取设备型号
+    fetchDeviceType() {
+      getDeviceType().then(response => {
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
+        }
+      })
+    },
+    typeChanged() {
+      this.deviceForm.modelId = ''
+    },
+    // 获取设备型号
+    fetchDeviceModel(val) {
+      getDeviceModel(val).then(response => {
+        this.deviceModelList = response.data
+        if (this.deviceModelList.length <= 1) {
+          this.showModelType = false
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 37f5ff2..6399039 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -84,16 +84,20 @@
   'menus': [
     { 'code': 'data', 'icon': 'icon-data', 'id': '1138702379389775873', 'ismenu': '1', 'levels': 1, 'name': '数据管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/data' },
     { 'code': 'sys_config', 'icon': 'icon-sysconfig', 'id': '1184010804933668866', 'ismenu': '1', 'levels': 1, 'name': '系统配置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/sysconfig' },
-    { 'code': 'nbdevice', 'icon': '', 'id': '1138694597554958338', 'ismenu': '1', 'levels': 1, 'name': '电信NB注册', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/nbdevice/list' },
     { 'code': 'overview', 'icon': 'icon-overview', 'id': '1138701347507105794', 'ismenu': '1', 'levels': 1, 'name': '窨井状态总览', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/overview/wellList' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138692702442582017', 'ismenu': '1', 'levels': 1, 'name': '集中器管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/concentrator/list' },
     { 'code': 'well', 'icon': 'icon-well', 'id': '1138377674778685442', 'ismenu': '1', 'levels': 1, 'name': '窨井管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/well' },
     { 'code': 'dashboard', 'icon': '', 'id': '1275011720930205698', 'ismenu': '0', 'levels': 1, 'name': '首页', 'num': 0, 'parentId': '0', 'resourceType': '04', 'url': '/dashboard' },
     { 'code': 'alarm', 'icon': 'icon-alarm', 'id': '1138696443757555713', 'ismenu': '1', 'levels': 1, 'name': '告警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/alarm' },
     { 'code': 'alarmrule', 'icon': '', 'id': '1138697759749795842', 'ismenu': '1', 'levels': 1, 'name': '告警规则设置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/alarmRule/list' },
     { 'code': 'job', 'icon': '', 'id': '1138699051712868353', 'ismenu': '1', 'levels': 1, 'name': '告警工单', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/job/list' },
     { 'code': 'device', 'icon': 'icon-device', 'id': '1138378119630761985', 'ismenu': '1', 'levels': 1, 'name': '设备管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device' },
+    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138692702442582017', 'ismenu': '1', 'levels': 1, 'name': '集中器管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/concentrator/list' },
+    { 'code': 'device_list', 'icon': '', 'id': '1138678001323175937', 'ismenu': '1', 'levels': 11, 'name': '设备列表', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '03', 'url': '/device/list' },
     { 'code': 'device_config', 'icon': '', 'id': '1138690889324654593', 'ismenu': '1', 'levels': 1, 'name': '设备配置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/config' },
+    { 'code': 'nbdevice', 'icon': '', 'id': '1138694597554958338', 'ismenu': '1', 'levels': 1, 'name': '电信NB注册', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/nbdevice/list' },
+    { 'code': 'device_type', 'icon': '', 'id': '1138694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备类型管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/type' },
+    { 'code': 'device_model', 'icon': '', 'id': '1128694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备型号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/model' },
+    { 'code': 'device_model', 'icon': '', 'id': '1128694597554958338', 'ismenu': '1', 'levels': 1, 'name': '设备SIM卡号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/imei' },
     { 'code': 'system', 'icon': 'icon-setting', 'id': '105', 'ismenu': '1', 'levels': 1, 'name': '系统管理', 'num': 4, 'parentId': '0', 'resourceType': '03', 'url': '/system' },
     { 'code': 'well_add', 'icon': '', 'id': '1138614981481963521', 'ismenu': '1', 'levels': 2, 'name': '新增窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/add' },
     { 'code': 'noisedataList', 'icon': '', 'id': '1301828354294067202', 'ismenu': '0', 'levels': 2, 'name': '噪声记录仪', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/noisedata/list' },
@@ -181,7 +185,6 @@
     { 'code': 'alarm_now', 'icon': '', 'id': '1138696791851233281', 'ismenu': '1', 'levels': 11, 'name': '当前告警', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '03', 'url': '/alarm/now' },
     { 'code': 'alarm_content_type', 'icon': '', 'id': '1138697337723121665', 'ismenu': '0', 'levels': 11, 'name': '获取告警内容', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '04', 'url': '/alarm/contentType' },
     { 'code': 'alarmrule_update', 'icon': '', 'id': '1138698760955326466', 'ismenu': '0', 'levels': 11, 'name': '编辑告警规则', 'num': 0, 'parentId': '1138697759749795842', 'resourceType': '04', 'url': '/alarmRule/update' },
-    { 'code': 'device_list', 'icon': '', 'id': '1138678001323175937', 'ismenu': '1', 'levels': 11, 'name': '设备列表', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '03', 'url': '/device/list' },
     { 'code': 'device_add', 'icon': '', 'id': '1138686212658917378', 'ismenu': '0', 'levels': 11, 'name': '新增设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/add' },
     { 'code': 'device_delete', 'icon': '', 'id': '1138689666945085441', 'ismenu': '0', 'levels': 11, 'name': '删除设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/delete' },
     { 'code': 'device_export', 'icon': '', 'id': '1138690037587341314', 'ismenu': '0', 'levels': 11, 'name': '批量导出设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/batchExport' },
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 8f7d2ac..12bdcf2 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -139,6 +139,24 @@
         name: 'NbDevice',
         component: () => import('@/views/nbDevice/listNbDevice'),
         meta: { title: 'NB注册', icon: 'icon-config', permission: ['/nbdevice/list'] }
+      },
+      {
+        path: '/deviceType',
+        name: 'DeviceType',
+        component: () => import('@/views/deviceManage/deviceType/deviceType'),
+        meta: { title: '设备类型管理', icon: 'icon-config', permission: ['/device/type'] }
+      },
+      {
+        path: '/deviceModel',
+        name: 'DeviceModel',
+        component: () => import('@/views/deviceManage/deviceModel/deviceModel'),
+        meta: { title: '设备型号管理', icon: 'icon-config', permission: ['/device/model'] }
+      },
+      {
+        path: '/deviceImei',
+        name: 'DeviceImei',
+        component: () => import('@/views/deviceManage/deviceImei/deviceImei'),
+        meta: { title: '设备SIM卡号管理', icon: 'icon-config', permission: ['/device/imei'] }
       }
     ]
   },
diff --git a/src/utils/request.js b/src/utils/request.js
index 02dcee1..9ce2ab2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -39,19 +39,20 @@
     } else if (res.code !== 200) {
       // 50008:非法的token; 50012:其他客户端登录了;  50014:Token 过期了;
       if (res.code === 401 || res.code === 50012 || res.code === 50014) {
-        MessageBox.confirm(
-          '你已被登出，可以取消继续留在该页面，或者重新登录',
-          '确定登出',
-          {
-            confirmButtonText: '重新登录',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          store.dispatch('FedLogOut').then(() => {
-            location.reload() // 为了重新实例化vue-router对象 避免bug
-          })
-        })
+        // 开发完页面以后下面的这个注释需要打开
+        // MessageBox.confirm(
+        //   '你已被登出，可以取消继续留在该页面，或者重新登录',
+        //   '确定登出',
+        //   {
+        //     confirmButtonText: '重新登录',
+        //     cancelButtonText: '取消',
+        //     type: 'warning'
+        //   }
+        // ).then(() => {
+        //   store.dispatch('FedLogOut').then(() => {
+        //     location.reload() // 为了重新实例化vue-router对象 避免bug
+        //   })
+        // })
       } else {
         Message({
           showClose: true,
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..b22e406
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,272 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
+      <el-row :gutter="20">
+        <!--<el-col :span="12">-->
+        <!--<el-form-item label="设备名称" prop="deviceName">-->
+        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="安装日期" prop="installDate">
+            <el-date-picker
+              v-model.trim="deviceForm.installDate"
+              :disabled="isDetailMode"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备型号" prop="modelId">
+            <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
+              <el-option
+                v-for="item in deviceModelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="井编号" prop="wellCode">
+            <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-show="!(isDetailMode&&deviceForm.concenCode=='')" label="集中器编号" prop="concenCode">
+            <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDevice, updateDevice, getDeviceType, getDeviceModel } from '@/api/device/device'
+
+export default {
+  name: 'EditDevice',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceForm: {
+        id: '',
+        deviceName: '',
+        devcode: '',
+        deviceType: '',
+        wellCode: '',
+        modelId: '',
+        installDate: '',
+        concenCode: ''
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增啊啊啊啊啊啊',
+        detail: '详情'
+      }, // 表头显示标题
+      deviceTypeList: null, // 设备类型列表
+      deviceModelList: null, // 设备型号列表
+      showDeviceType: true, // 是否显示设备类型选项
+      showModelType: true, // 是否显示型号选项
+      rules: {
+        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
+        devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
+        installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      isEditMode: false, // 编辑模式
+      isDetailMode: false // 详情模式
+    }
+  },
+  watch: {
+    'deviceForm.deviceType': function(val, oldval) {
+      this.fetchDeviceModel(val)
+    }
+  },
+  mounted() {
+    this.fetchDeviceType()
+    // this.fetchDeviceModel()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+        this.isDetailMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = false
+      } else {
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = true
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        id: '',
+        deviceName: '',
+        devcode: '',
+        deviceType: '',
+        wellCode: '',
+        modelId: '',
+        installDate: '',
+        concenCode: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDevice(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDevice(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 获取设备型号
+    fetchDeviceType() {
+      getDeviceType().then(response => {
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
+        }
+      })
+    },
+    typeChanged() {
+      this.deviceForm.modelId = ''
+    },
+    // 获取设备型号
+    fetchDeviceModel(val) {
+      getDeviceModel(val).then(response => {
+        this.deviceModelList = response.data
+        if (this.deviceModelList.length <= 1) {
+          this.showModelType = false
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
new file mode 100644
index 0000000..8559872
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -0,0 +1,429 @@
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <!-- <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号/井编号" clearable />
+          </el-form-item> -->
+          <el-form-item v-if="showDeviceType" class="selectForm-container-item">
+            <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.isValid" placeholder="是否启用" clearable>
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item v-if="isAdmin" class="selectForm-container-item">
+            <el-select v-model="listQuery.isOnline" placeholder="在线情况" clearable>
+              <el-option
+                v-for="item in onlineStates"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item> -->
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+            搜索
+          </el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/device/batchExport')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template v-if="hasPerm('/device/batchImport')" :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/device/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/device/delete')" class="edit_btn" size="small" @click="del">
+            删除
+          </el-button>
+          <el-button v-if="hasPerm('/device/add')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column v-if="hasPerm('/device/delete')" align="center" type="selection" width="55" />
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
+              {{ scope.row[column.value] }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="datalist(scope.row)">
+              历史数据
+            </el-button>
+            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+            <el-button type="text" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+
+    <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
+
+    <detail-device v-show="detailShow" ref="detaildevice" />
+
+    <info-well v-show="wellShow" ref="wellInfo" />
+  </div>
+</template>
+
+<script>
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
+import detailDevice from '@/views/deviceManage/detailDevice'
+import { getDeviceList, getDeviceType, delDevice, batchImportDevice, batchExportDevice } from '@/api/device/device'
+import DownloadTemplate from '@/components/DownloadTemplate'
+import InfoWell from '@/views/wellManage/infoWell'
+import { isAdministrator, notContainConcentrator } from '@/utils/permission'
+
+export default {
+  name: 'ListDevice',
+  components: { DownloadTemplate, editDevice, detailDevice, InfoWell },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc',
+        isValid: ''
+      }, // 筛选条件
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      columns: [
+        {
+          text: '设备编号',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '描述',
+          value: 'typeDescription',
+          align: 'center'
+        },
+        {
+          text: '是否启用',
+          value: 'valid',
+          align: 'center'
+        },
+        {
+          text: '监控内容',
+          value: 'watchType',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 设备类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      fileList: [],
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      deptShowTop: false, // 是否显示顶级
+      onlineStates: [
+        { value: '1', name: '在线' },
+        { value: '0', name: '离线' }
+      ], // 在线情况
+      wellShow: false
+    }
+  },
+  computed: {
+    isAdmin() {
+      return isAdministrator()
+    }
+  },
+  mounted() {
+    this.fetchDeviceType()// 获取设备列表
+    if (!notContainConcentrator()) {
+      this.columns.splice(-1, 1)
+    }
+    // 如果参数中有井编号，则将查询条件填入，否则正常
+    if (this.$route.query && this.$route.query.wellCode && this.$route.query.wellCode !== '') {
+      this.listQuery.keywords = this.$route.query.wellCode
+      this.fetchData(true)
+    } else {
+      this.fetchData()// 获取数据
+    }
+  },
+  methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑设备信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row)
+    },
+    detail(row) {
+      this.$refs.editdevice.initDialog('detail', true, row)
+    },
+    // 删除设备
+    del() {
+      if (this.checkSelection()) {
+        const deviceIds = []
+        this.multipleSelection.forEach(function(value, index) {
+          deviceIds.push(value.id)
+        })
+        // wellNames = wellNames.slice(0, wellNames.length - 1)
+        this.$confirm(
+          '确定要删除所选设备吗？',
+          '确认操作',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          delDevice(deviceIds).then(response => {
+            if (response.code === 200) {
+              this.$message.success('删除成功')
+              this.fetchData()
+            }
+          })
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 批量导入集中器
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportDevice(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportDevice(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `设备列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取集中器数据
+    fetchData(isNowPage = true) {
+      // this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getDeviceList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    // 获取设备类型
+    fetchDeviceType() {
+      getDeviceType(this.listQuery).then(response => {
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
+        }
+        if (this.deviceTypeList.length <= 1) {
+          this.showDeviceType = false
+        }
+      })
+    },
+    datalist(row) {
+      const params = { devcode: row.devcode, deviceType: row.deviceType }
+      this.$router.push({ name: 'DataManage', query: params })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..b22e406
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,272 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
+      <el-row :gutter="20">
+        <!--<el-col :span="12">-->
+        <!--<el-form-item label="设备名称" prop="deviceName">-->
+        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="安装日期" prop="installDate">
+            <el-date-picker
+              v-model.trim="deviceForm.installDate"
+              :disabled="isDetailMode"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备型号" prop="modelId">
+            <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
+              <el-option
+                v-for="item in deviceModelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="井编号" prop="wellCode">
+            <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-show="!(isDetailMode&&deviceForm.concenCode=='')" label="集中器编号" prop="concenCode">
+            <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDevice, updateDevice, getDeviceType, getDeviceModel } from '@/api/device/device'
+
+export default {
+  name: 'EditDevice',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceForm: {
+        id: '',
+        deviceName: '',
+        devcode: '',
+        deviceType: '',
+        wellCode: '',
+        modelId: '',
+        installDate: '',
+        concenCode: ''
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增啊啊啊啊啊啊',
+        detail: '详情'
+      }, // 表头显示标题
+      deviceTypeList: null, // 设备类型列表
+      deviceModelList: null, // 设备型号列表
+      showDeviceType: true, // 是否显示设备类型选项
+      showModelType: true, // 是否显示型号选项
+      rules: {
+        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
+        devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
+        installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      isEditMode: false, // 编辑模式
+      isDetailMode: false // 详情模式
+    }
+  },
+  watch: {
+    'deviceForm.deviceType': function(val, oldval) {
+      this.fetchDeviceModel(val)
+    }
+  },
+  mounted() {
+    this.fetchDeviceType()
+    // this.fetchDeviceModel()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+        this.isDetailMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = false
+      } else {
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = true
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        id: '',
+        deviceName: '',
+        devcode: '',
+        deviceType: '',
+        wellCode: '',
+        modelId: '',
+        installDate: '',
+        concenCode: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDevice(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDevice(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 获取设备型号
+    fetchDeviceType() {
+      getDeviceType().then(response => {
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
+        }
+      })
+    },
+    typeChanged() {
+      this.deviceForm.modelId = ''
+    },
+    // 获取设备型号
+    fetchDeviceModel(val) {
+      getDeviceModel(val).then(response => {
+        this.deviceModelList = response.data
+        if (this.deviceModelList.length <= 1) {
+          this.showModelType = false
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
new file mode 100644
index 0000000..eed7ed8
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -0,0 +1,429 @@
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <!-- <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号/井编号" clearable />
+          </el-form-item> -->
+          <el-form-item v-if="showDeviceType" class="selectForm-container-item">
+            <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.isValid" placeholder="是否启用" clearable>
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item v-if="isAdmin" class="selectForm-container-item">
+            <el-select v-model="listQuery.isOnline" placeholder="在线情况" clearable>
+              <el-option
+                v-for="item in onlineStates"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item> -->
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+            搜索
+          </el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/device/batchExport')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template v-if="hasPerm('/device/batchImport')" :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/device/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/device/delete')" class="edit_btn" size="small" @click="del">
+            删除
+          </el-button>
+          <el-button v-if="hasPerm('/device/add')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column v-if="hasPerm('/device/delete')" align="center" type="selection" width="55" />
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
+              {{ scope.row[column.value] }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="datalist(scope.row)">
+              历史数据
+            </el-button>
+            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+            <el-button type="text" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+
+    <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
+
+    <detail-device v-show="detailShow" ref="detaildevice" />
+
+    <info-well v-show="wellShow" ref="wellInfo" />
+  </div>
+</template>
+
+<script>
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
+import detailDevice from '@/views/deviceManage/detailDevice'
+import { getDeviceList, getDeviceType, delDevice, batchImportDevice, batchExportDevice } from '@/api/device/device'
+import DownloadTemplate from '@/components/DownloadTemplate'
+import InfoWell from '@/views/wellManage/infoWell'
+import { isAdministrator, notContainConcentrator } from '@/utils/permission'
+
+export default {
+  name: 'ListDevice',
+  components: { DownloadTemplate, editDevice, detailDevice, InfoWell },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc',
+        isValid: ''
+      }, // 筛选条件
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      columns: [
+        {
+          text: '设备编号',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '类型名称',
+          value: 'modelName',
+          align: 'center'
+        },
+        {
+          text: '设备类型主键',
+          value: 'deviceType',
+          align: 'center'
+        },
+        {
+          text: '设备类型名称',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '通信方式',
+          value: 'communication',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 设备类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      fileList: [],
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      deptShowTop: false, // 是否显示顶级
+      onlineStates: [
+        { value: '1', name: '在线' },
+        { value: '0', name: '离线' }
+      ], // 在线情况
+      wellShow: false
+    }
+  },
+  computed: {
+    isAdmin() {
+      return isAdministrator()
+    }
+  },
+  mounted() {
+    this.fetchDeviceType()// 获取设备列表
+    if (!notContainConcentrator()) {
+      this.columns.splice(-1, 1)
+    }
+    // 如果参数中有井编号，则将查询条件填入，否则正常
+    if (this.$route.query && this.$route.query.wellCode && this.$route.query.wellCode !== '') {
+      this.listQuery.keywords = this.$route.query.wellCode
+      this.fetchData(true)
+    } else {
+      this.fetchData()// 获取数据
+    }
+  },
+  methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑设备信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row)
+    },
+    detail(row) {
+      this.$refs.editdevice.initDialog('detail', true, row)
+    },
+    // 删除设备
+    del() {
+      if (this.checkSelection()) {
+        const deviceIds = []
+        this.multipleSelection.forEach(function(value, index) {
+          deviceIds.push(value.id)
+        })
+        // wellNames = wellNames.slice(0, wellNames.length - 1)
+        this.$confirm(
+          '确定要删除所选设备吗？',
+          '确认操作',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          delDevice(deviceIds).then(response => {
+            if (response.code === 200) {
+              this.$message.success('删除成功')
+              this.fetchData()
+            }
+          })
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 批量导入集中器
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportDevice(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportDevice(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `设备列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取集中器数据
+    fetchData(isNowPage = true) {
+      // this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getDeviceList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    // 获取设备类型
+    fetchDeviceType() {
+      getDeviceType(this.listQuery).then(response => {
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
+        }
+        if (this.deviceTypeList.length <= 1) {
+          this.showDeviceType = false
+        }
+      })
+    },
+    datalist(row) {
+      const params = { devcode: row.devcode, deviceType: row.deviceType }
+      this.$router.push({ name: 'DataManage', query: params })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 37f5ff2..6399039 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -84,16 +84,20 @@
   'menus': [
     { 'code': 'data', 'icon': 'icon-data', 'id': '1138702379389775873', 'ismenu': '1', 'levels': 1, 'name': '数据管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/data' },
     { 'code': 'sys_config', 'icon': 'icon-sysconfig', 'id': '1184010804933668866', 'ismenu': '1', 'levels': 1, 'name': '系统配置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/sysconfig' },
-    { 'code': 'nbdevice', 'icon': '', 'id': '1138694597554958338', 'ismenu': '1', 'levels': 1, 'name': '电信NB注册', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/nbdevice/list' },
     { 'code': 'overview', 'icon': 'icon-overview', 'id': '1138701347507105794', 'ismenu': '1', 'levels': 1, 'name': '窨井状态总览', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/overview/wellList' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138692702442582017', 'ismenu': '1', 'levels': 1, 'name': '集中器管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/concentrator/list' },
     { 'code': 'well', 'icon': 'icon-well', 'id': '1138377674778685442', 'ismenu': '1', 'levels': 1, 'name': '窨井管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/well' },
     { 'code': 'dashboard', 'icon': '', 'id': '1275011720930205698', 'ismenu': '0', 'levels': 1, 'name': '首页', 'num': 0, 'parentId': '0', 'resourceType': '04', 'url': '/dashboard' },
     { 'code': 'alarm', 'icon': 'icon-alarm', 'id': '1138696443757555713', 'ismenu': '1', 'levels': 1, 'name': '告警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/alarm' },
     { 'code': 'alarmrule', 'icon': '', 'id': '1138697759749795842', 'ismenu': '1', 'levels': 1, 'name': '告警规则设置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/alarmRule/list' },
     { 'code': 'job', 'icon': '', 'id': '1138699051712868353', 'ismenu': '1', 'levels': 1, 'name': '告警工单', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/job/list' },
     { 'code': 'device', 'icon': 'icon-device', 'id': '1138378119630761985', 'ismenu': '1', 'levels': 1, 'name': '设备管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device' },
+    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138692702442582017', 'ismenu': '1', 'levels': 1, 'name': '集中器管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/concentrator/list' },
+    { 'code': 'device_list', 'icon': '', 'id': '1138678001323175937', 'ismenu': '1', 'levels': 11, 'name': '设备列表', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '03', 'url': '/device/list' },
     { 'code': 'device_config', 'icon': '', 'id': '1138690889324654593', 'ismenu': '1', 'levels': 1, 'name': '设备配置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/config' },
+    { 'code': 'nbdevice', 'icon': '', 'id': '1138694597554958338', 'ismenu': '1', 'levels': 1, 'name': '电信NB注册', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/nbdevice/list' },
+    { 'code': 'device_type', 'icon': '', 'id': '1138694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备类型管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/type' },
+    { 'code': 'device_model', 'icon': '', 'id': '1128694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备型号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/model' },
+    { 'code': 'device_model', 'icon': '', 'id': '1128694597554958338', 'ismenu': '1', 'levels': 1, 'name': '设备SIM卡号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/imei' },
     { 'code': 'system', 'icon': 'icon-setting', 'id': '105', 'ismenu': '1', 'levels': 1, 'name': '系统管理', 'num': 4, 'parentId': '0', 'resourceType': '03', 'url': '/system' },
     { 'code': 'well_add', 'icon': '', 'id': '1138614981481963521', 'ismenu': '1', 'levels': 2, 'name': '新增窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/add' },
     { 'code': 'noisedataList', 'icon': '', 'id': '1301828354294067202', 'ismenu': '0', 'levels': 2, 'name': '噪声记录仪', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/noisedata/list' },
@@ -181,7 +185,6 @@
     { 'code': 'alarm_now', 'icon': '', 'id': '1138696791851233281', 'ismenu': '1', 'levels': 11, 'name': '当前告警', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '03', 'url': '/alarm/now' },
     { 'code': 'alarm_content_type', 'icon': '', 'id': '1138697337723121665', 'ismenu': '0', 'levels': 11, 'name': '获取告警内容', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '04', 'url': '/alarm/contentType' },
     { 'code': 'alarmrule_update', 'icon': '', 'id': '1138698760955326466', 'ismenu': '0', 'levels': 11, 'name': '编辑告警规则', 'num': 0, 'parentId': '1138697759749795842', 'resourceType': '04', 'url': '/alarmRule/update' },
-    { 'code': 'device_list', 'icon': '', 'id': '1138678001323175937', 'ismenu': '1', 'levels': 11, 'name': '设备列表', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '03', 'url': '/device/list' },
     { 'code': 'device_add', 'icon': '', 'id': '1138686212658917378', 'ismenu': '0', 'levels': 11, 'name': '新增设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/add' },
     { 'code': 'device_delete', 'icon': '', 'id': '1138689666945085441', 'ismenu': '0', 'levels': 11, 'name': '删除设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/delete' },
     { 'code': 'device_export', 'icon': '', 'id': '1138690037587341314', 'ismenu': '0', 'levels': 11, 'name': '批量导出设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/batchExport' },
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 8f7d2ac..12bdcf2 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -139,6 +139,24 @@
         name: 'NbDevice',
         component: () => import('@/views/nbDevice/listNbDevice'),
         meta: { title: 'NB注册', icon: 'icon-config', permission: ['/nbdevice/list'] }
+      },
+      {
+        path: '/deviceType',
+        name: 'DeviceType',
+        component: () => import('@/views/deviceManage/deviceType/deviceType'),
+        meta: { title: '设备类型管理', icon: 'icon-config', permission: ['/device/type'] }
+      },
+      {
+        path: '/deviceModel',
+        name: 'DeviceModel',
+        component: () => import('@/views/deviceManage/deviceModel/deviceModel'),
+        meta: { title: '设备型号管理', icon: 'icon-config', permission: ['/device/model'] }
+      },
+      {
+        path: '/deviceImei',
+        name: 'DeviceImei',
+        component: () => import('@/views/deviceManage/deviceImei/deviceImei'),
+        meta: { title: '设备SIM卡号管理', icon: 'icon-config', permission: ['/device/imei'] }
       }
     ]
   },
diff --git a/src/utils/request.js b/src/utils/request.js
index 02dcee1..9ce2ab2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -39,19 +39,20 @@
     } else if (res.code !== 200) {
       // 50008:非法的token; 50012:其他客户端登录了;  50014:Token 过期了;
       if (res.code === 401 || res.code === 50012 || res.code === 50014) {
-        MessageBox.confirm(
-          '你已被登出，可以取消继续留在该页面，或者重新登录',
-          '确定登出',
-          {
-            confirmButtonText: '重新登录',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          store.dispatch('FedLogOut').then(() => {
-            location.reload() // 为了重新实例化vue-router对象 避免bug
-          })
-        })
+        // 开发完页面以后下面的这个注释需要打开
+        // MessageBox.confirm(
+        //   '你已被登出，可以取消继续留在该页面，或者重新登录',
+        //   '确定登出',
+        //   {
+        //     confirmButtonText: '重新登录',
+        //     cancelButtonText: '取消',
+        //     type: 'warning'
+        //   }
+        // ).then(() => {
+        //   store.dispatch('FedLogOut').then(() => {
+        //     location.reload() // 为了重新实例化vue-router对象 避免bug
+        //   })
+        // })
       } else {
         Message({
           showClose: true,
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..b22e406
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,272 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
+      <el-row :gutter="20">
+        <!--<el-col :span="12">-->
+        <!--<el-form-item label="设备名称" prop="deviceName">-->
+        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="安装日期" prop="installDate">
+            <el-date-picker
+              v-model.trim="deviceForm.installDate"
+              :disabled="isDetailMode"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备型号" prop="modelId">
+            <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
+              <el-option
+                v-for="item in deviceModelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="井编号" prop="wellCode">
+            <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-show="!(isDetailMode&&deviceForm.concenCode=='')" label="集中器编号" prop="concenCode">
+            <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDevice, updateDevice, getDeviceType, getDeviceModel } from '@/api/device/device'
+
+export default {
+  name: 'EditDevice',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceForm: {
+        id: '',
+        deviceName: '',
+        devcode: '',
+        deviceType: '',
+        wellCode: '',
+        modelId: '',
+        installDate: '',
+        concenCode: ''
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增啊啊啊啊啊啊',
+        detail: '详情'
+      }, // 表头显示标题
+      deviceTypeList: null, // 设备类型列表
+      deviceModelList: null, // 设备型号列表
+      showDeviceType: true, // 是否显示设备类型选项
+      showModelType: true, // 是否显示型号选项
+      rules: {
+        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
+        devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
+        installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      isEditMode: false, // 编辑模式
+      isDetailMode: false // 详情模式
+    }
+  },
+  watch: {
+    'deviceForm.deviceType': function(val, oldval) {
+      this.fetchDeviceModel(val)
+    }
+  },
+  mounted() {
+    this.fetchDeviceType()
+    // this.fetchDeviceModel()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+        this.isDetailMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = false
+      } else {
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = true
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        id: '',
+        deviceName: '',
+        devcode: '',
+        deviceType: '',
+        wellCode: '',
+        modelId: '',
+        installDate: '',
+        concenCode: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDevice(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDevice(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 获取设备型号
+    fetchDeviceType() {
+      getDeviceType().then(response => {
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
+        }
+      })
+    },
+    typeChanged() {
+      this.deviceForm.modelId = ''
+    },
+    // 获取设备型号
+    fetchDeviceModel(val) {
+      getDeviceModel(val).then(response => {
+        this.deviceModelList = response.data
+        if (this.deviceModelList.length <= 1) {
+          this.showModelType = false
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
new file mode 100644
index 0000000..8559872
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -0,0 +1,429 @@
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <!-- <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号/井编号" clearable />
+          </el-form-item> -->
+          <el-form-item v-if="showDeviceType" class="selectForm-container-item">
+            <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.isValid" placeholder="是否启用" clearable>
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item v-if="isAdmin" class="selectForm-container-item">
+            <el-select v-model="listQuery.isOnline" placeholder="在线情况" clearable>
+              <el-option
+                v-for="item in onlineStates"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item> -->
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+            搜索
+          </el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/device/batchExport')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template v-if="hasPerm('/device/batchImport')" :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/device/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/device/delete')" class="edit_btn" size="small" @click="del">
+            删除
+          </el-button>
+          <el-button v-if="hasPerm('/device/add')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column v-if="hasPerm('/device/delete')" align="center" type="selection" width="55" />
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
+              {{ scope.row[column.value] }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="datalist(scope.row)">
+              历史数据
+            </el-button>
+            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+            <el-button type="text" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+
+    <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
+
+    <detail-device v-show="detailShow" ref="detaildevice" />
+
+    <info-well v-show="wellShow" ref="wellInfo" />
+  </div>
+</template>
+
+<script>
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
+import detailDevice from '@/views/deviceManage/detailDevice'
+import { getDeviceList, getDeviceType, delDevice, batchImportDevice, batchExportDevice } from '@/api/device/device'
+import DownloadTemplate from '@/components/DownloadTemplate'
+import InfoWell from '@/views/wellManage/infoWell'
+import { isAdministrator, notContainConcentrator } from '@/utils/permission'
+
+export default {
+  name: 'ListDevice',
+  components: { DownloadTemplate, editDevice, detailDevice, InfoWell },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc',
+        isValid: ''
+      }, // 筛选条件
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      columns: [
+        {
+          text: '设备编号',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '描述',
+          value: 'typeDescription',
+          align: 'center'
+        },
+        {
+          text: '是否启用',
+          value: 'valid',
+          align: 'center'
+        },
+        {
+          text: '监控内容',
+          value: 'watchType',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 设备类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      fileList: [],
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      deptShowTop: false, // 是否显示顶级
+      onlineStates: [
+        { value: '1', name: '在线' },
+        { value: '0', name: '离线' }
+      ], // 在线情况
+      wellShow: false
+    }
+  },
+  computed: {
+    isAdmin() {
+      return isAdministrator()
+    }
+  },
+  mounted() {
+    this.fetchDeviceType()// 获取设备列表
+    if (!notContainConcentrator()) {
+      this.columns.splice(-1, 1)
+    }
+    // 如果参数中有井编号，则将查询条件填入，否则正常
+    if (this.$route.query && this.$route.query.wellCode && this.$route.query.wellCode !== '') {
+      this.listQuery.keywords = this.$route.query.wellCode
+      this.fetchData(true)
+    } else {
+      this.fetchData()// 获取数据
+    }
+  },
+  methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑设备信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row)
+    },
+    detail(row) {
+      this.$refs.editdevice.initDialog('detail', true, row)
+    },
+    // 删除设备
+    del() {
+      if (this.checkSelection()) {
+        const deviceIds = []
+        this.multipleSelection.forEach(function(value, index) {
+          deviceIds.push(value.id)
+        })
+        // wellNames = wellNames.slice(0, wellNames.length - 1)
+        this.$confirm(
+          '确定要删除所选设备吗？',
+          '确认操作',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          delDevice(deviceIds).then(response => {
+            if (response.code === 200) {
+              this.$message.success('删除成功')
+              this.fetchData()
+            }
+          })
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 批量导入集中器
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportDevice(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportDevice(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `设备列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取集中器数据
+    fetchData(isNowPage = true) {
+      // this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getDeviceList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    // 获取设备类型
+    fetchDeviceType() {
+      getDeviceType(this.listQuery).then(response => {
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
+        }
+        if (this.deviceTypeList.length <= 1) {
+          this.showDeviceType = false
+        }
+      })
+    },
+    datalist(row) {
+      const params = { devcode: row.devcode, deviceType: row.deviceType }
+      this.$router.push({ name: 'DataManage', query: params })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..b22e406
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,272 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
+      <el-row :gutter="20">
+        <!--<el-col :span="12">-->
+        <!--<el-form-item label="设备名称" prop="deviceName">-->
+        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="安装日期" prop="installDate">
+            <el-date-picker
+              v-model.trim="deviceForm.installDate"
+              :disabled="isDetailMode"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备型号" prop="modelId">
+            <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
+              <el-option
+                v-for="item in deviceModelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="井编号" prop="wellCode">
+            <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-show="!(isDetailMode&&deviceForm.concenCode=='')" label="集中器编号" prop="concenCode">
+            <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDevice, updateDevice, getDeviceType, getDeviceModel } from '@/api/device/device'
+
+export default {
+  name: 'EditDevice',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceForm: {
+        id: '',
+        deviceName: '',
+        devcode: '',
+        deviceType: '',
+        wellCode: '',
+        modelId: '',
+        installDate: '',
+        concenCode: ''
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增啊啊啊啊啊啊',
+        detail: '详情'
+      }, // 表头显示标题
+      deviceTypeList: null, // 设备类型列表
+      deviceModelList: null, // 设备型号列表
+      showDeviceType: true, // 是否显示设备类型选项
+      showModelType: true, // 是否显示型号选项
+      rules: {
+        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
+        devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
+        installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      isEditMode: false, // 编辑模式
+      isDetailMode: false // 详情模式
+    }
+  },
+  watch: {
+    'deviceForm.deviceType': function(val, oldval) {
+      this.fetchDeviceModel(val)
+    }
+  },
+  mounted() {
+    this.fetchDeviceType()
+    // this.fetchDeviceModel()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+        this.isDetailMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = false
+      } else {
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = true
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        id: '',
+        deviceName: '',
+        devcode: '',
+        deviceType: '',
+        wellCode: '',
+        modelId: '',
+        installDate: '',
+        concenCode: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDevice(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDevice(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 获取设备型号
+    fetchDeviceType() {
+      getDeviceType().then(response => {
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
+        }
+      })
+    },
+    typeChanged() {
+      this.deviceForm.modelId = ''
+    },
+    // 获取设备型号
+    fetchDeviceModel(val) {
+      getDeviceModel(val).then(response => {
+        this.deviceModelList = response.data
+        if (this.deviceModelList.length <= 1) {
+          this.showModelType = false
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
new file mode 100644
index 0000000..eed7ed8
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -0,0 +1,429 @@
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <!-- <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号/井编号" clearable />
+          </el-form-item> -->
+          <el-form-item v-if="showDeviceType" class="selectForm-container-item">
+            <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.isValid" placeholder="是否启用" clearable>
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item v-if="isAdmin" class="selectForm-container-item">
+            <el-select v-model="listQuery.isOnline" placeholder="在线情况" clearable>
+              <el-option
+                v-for="item in onlineStates"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item> -->
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+            搜索
+          </el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/device/batchExport')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template v-if="hasPerm('/device/batchImport')" :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/device/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/device/delete')" class="edit_btn" size="small" @click="del">
+            删除
+          </el-button>
+          <el-button v-if="hasPerm('/device/add')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column v-if="hasPerm('/device/delete')" align="center" type="selection" width="55" />
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
+              {{ scope.row[column.value] }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="datalist(scope.row)">
+              历史数据
+            </el-button>
+            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+            <el-button type="text" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+
+    <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
+
+    <detail-device v-show="detailShow" ref="detaildevice" />
+
+    <info-well v-show="wellShow" ref="wellInfo" />
+  </div>
+</template>
+
+<script>
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
+import detailDevice from '@/views/deviceManage/detailDevice'
+import { getDeviceList, getDeviceType, delDevice, batchImportDevice, batchExportDevice } from '@/api/device/device'
+import DownloadTemplate from '@/components/DownloadTemplate'
+import InfoWell from '@/views/wellManage/infoWell'
+import { isAdministrator, notContainConcentrator } from '@/utils/permission'
+
+export default {
+  name: 'ListDevice',
+  components: { DownloadTemplate, editDevice, detailDevice, InfoWell },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc',
+        isValid: ''
+      }, // 筛选条件
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      columns: [
+        {
+          text: '设备编号',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '类型名称',
+          value: 'modelName',
+          align: 'center'
+        },
+        {
+          text: '设备类型主键',
+          value: 'deviceType',
+          align: 'center'
+        },
+        {
+          text: '设备类型名称',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '通信方式',
+          value: 'communication',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 设备类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      fileList: [],
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      deptShowTop: false, // 是否显示顶级
+      onlineStates: [
+        { value: '1', name: '在线' },
+        { value: '0', name: '离线' }
+      ], // 在线情况
+      wellShow: false
+    }
+  },
+  computed: {
+    isAdmin() {
+      return isAdministrator()
+    }
+  },
+  mounted() {
+    this.fetchDeviceType()// 获取设备列表
+    if (!notContainConcentrator()) {
+      this.columns.splice(-1, 1)
+    }
+    // 如果参数中有井编号，则将查询条件填入，否则正常
+    if (this.$route.query && this.$route.query.wellCode && this.$route.query.wellCode !== '') {
+      this.listQuery.keywords = this.$route.query.wellCode
+      this.fetchData(true)
+    } else {
+      this.fetchData()// 获取数据
+    }
+  },
+  methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑设备信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row)
+    },
+    detail(row) {
+      this.$refs.editdevice.initDialog('detail', true, row)
+    },
+    // 删除设备
+    del() {
+      if (this.checkSelection()) {
+        const deviceIds = []
+        this.multipleSelection.forEach(function(value, index) {
+          deviceIds.push(value.id)
+        })
+        // wellNames = wellNames.slice(0, wellNames.length - 1)
+        this.$confirm(
+          '确定要删除所选设备吗？',
+          '确认操作',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          delDevice(deviceIds).then(response => {
+            if (response.code === 200) {
+              this.$message.success('删除成功')
+              this.fetchData()
+            }
+          })
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 批量导入集中器
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportDevice(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportDevice(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `设备列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取集中器数据
+    fetchData(isNowPage = true) {
+      // this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getDeviceList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    // 获取设备类型
+    fetchDeviceType() {
+      getDeviceType(this.listQuery).then(response => {
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
+        }
+        if (this.deviceTypeList.length <= 1) {
+          this.showDeviceType = false
+        }
+      })
+    },
+    datalist(row) {
+      const params = { devcode: row.devcode, deviceType: row.deviceType }
+      this.$router.push({ name: 'DataManage', query: params })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..b22e406
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,272 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
+      <el-row :gutter="20">
+        <!--<el-col :span="12">-->
+        <!--<el-form-item label="设备名称" prop="deviceName">-->
+        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="安装日期" prop="installDate">
+            <el-date-picker
+              v-model.trim="deviceForm.installDate"
+              :disabled="isDetailMode"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备型号" prop="modelId">
+            <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
+              <el-option
+                v-for="item in deviceModelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="井编号" prop="wellCode">
+            <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-show="!(isDetailMode&&deviceForm.concenCode=='')" label="集中器编号" prop="concenCode">
+            <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDevice, updateDevice, getDeviceType, getDeviceModel } from '@/api/device/device'
+
+export default {
+  name: 'EditDevice',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceForm: {
+        id: '',
+        deviceName: '',
+        devcode: '',
+        deviceType: '',
+        wellCode: '',
+        modelId: '',
+        installDate: '',
+        concenCode: ''
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增啊啊啊啊啊啊',
+        detail: '详情'
+      }, // 表头显示标题
+      deviceTypeList: null, // 设备类型列表
+      deviceModelList: null, // 设备型号列表
+      showDeviceType: true, // 是否显示设备类型选项
+      showModelType: true, // 是否显示型号选项
+      rules: {
+        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
+        devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
+        installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      isEditMode: false, // 编辑模式
+      isDetailMode: false // 详情模式
+    }
+  },
+  watch: {
+    'deviceForm.deviceType': function(val, oldval) {
+      this.fetchDeviceModel(val)
+    }
+  },
+  mounted() {
+    this.fetchDeviceType()
+    // this.fetchDeviceModel()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+        this.isDetailMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = false
+      } else {
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = true
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        id: '',
+        deviceName: '',
+        devcode: '',
+        deviceType: '',
+        wellCode: '',
+        modelId: '',
+        installDate: '',
+        concenCode: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDevice(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDevice(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 获取设备型号
+    fetchDeviceType() {
+      getDeviceType().then(response => {
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
+        }
+      })
+    },
+    typeChanged() {
+      this.deviceForm.modelId = ''
+    },
+    // 获取设备型号
+    fetchDeviceModel(val) {
+      getDeviceModel(val).then(response => {
+        this.deviceModelList = response.data
+        if (this.deviceModelList.length <= 1) {
+          this.showModelType = false
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 37f5ff2..6399039 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -84,16 +84,20 @@
   'menus': [
     { 'code': 'data', 'icon': 'icon-data', 'id': '1138702379389775873', 'ismenu': '1', 'levels': 1, 'name': '数据管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/data' },
     { 'code': 'sys_config', 'icon': 'icon-sysconfig', 'id': '1184010804933668866', 'ismenu': '1', 'levels': 1, 'name': '系统配置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/sysconfig' },
-    { 'code': 'nbdevice', 'icon': '', 'id': '1138694597554958338', 'ismenu': '1', 'levels': 1, 'name': '电信NB注册', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/nbdevice/list' },
     { 'code': 'overview', 'icon': 'icon-overview', 'id': '1138701347507105794', 'ismenu': '1', 'levels': 1, 'name': '窨井状态总览', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/overview/wellList' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138692702442582017', 'ismenu': '1', 'levels': 1, 'name': '集中器管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/concentrator/list' },
     { 'code': 'well', 'icon': 'icon-well', 'id': '1138377674778685442', 'ismenu': '1', 'levels': 1, 'name': '窨井管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/well' },
     { 'code': 'dashboard', 'icon': '', 'id': '1275011720930205698', 'ismenu': '0', 'levels': 1, 'name': '首页', 'num': 0, 'parentId': '0', 'resourceType': '04', 'url': '/dashboard' },
     { 'code': 'alarm', 'icon': 'icon-alarm', 'id': '1138696443757555713', 'ismenu': '1', 'levels': 1, 'name': '告警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/alarm' },
     { 'code': 'alarmrule', 'icon': '', 'id': '1138697759749795842', 'ismenu': '1', 'levels': 1, 'name': '告警规则设置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/alarmRule/list' },
     { 'code': 'job', 'icon': '', 'id': '1138699051712868353', 'ismenu': '1', 'levels': 1, 'name': '告警工单', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/job/list' },
     { 'code': 'device', 'icon': 'icon-device', 'id': '1138378119630761985', 'ismenu': '1', 'levels': 1, 'name': '设备管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device' },
+    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138692702442582017', 'ismenu': '1', 'levels': 1, 'name': '集中器管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/concentrator/list' },
+    { 'code': 'device_list', 'icon': '', 'id': '1138678001323175937', 'ismenu': '1', 'levels': 11, 'name': '设备列表', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '03', 'url': '/device/list' },
     { 'code': 'device_config', 'icon': '', 'id': '1138690889324654593', 'ismenu': '1', 'levels': 1, 'name': '设备配置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/config' },
+    { 'code': 'nbdevice', 'icon': '', 'id': '1138694597554958338', 'ismenu': '1', 'levels': 1, 'name': '电信NB注册', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/nbdevice/list' },
+    { 'code': 'device_type', 'icon': '', 'id': '1138694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备类型管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/type' },
+    { 'code': 'device_model', 'icon': '', 'id': '1128694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备型号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/model' },
+    { 'code': 'device_model', 'icon': '', 'id': '1128694597554958338', 'ismenu': '1', 'levels': 1, 'name': '设备SIM卡号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/imei' },
     { 'code': 'system', 'icon': 'icon-setting', 'id': '105', 'ismenu': '1', 'levels': 1, 'name': '系统管理', 'num': 4, 'parentId': '0', 'resourceType': '03', 'url': '/system' },
     { 'code': 'well_add', 'icon': '', 'id': '1138614981481963521', 'ismenu': '1', 'levels': 2, 'name': '新增窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/add' },
     { 'code': 'noisedataList', 'icon': '', 'id': '1301828354294067202', 'ismenu': '0', 'levels': 2, 'name': '噪声记录仪', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/noisedata/list' },
@@ -181,7 +185,6 @@
     { 'code': 'alarm_now', 'icon': '', 'id': '1138696791851233281', 'ismenu': '1', 'levels': 11, 'name': '当前告警', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '03', 'url': '/alarm/now' },
     { 'code': 'alarm_content_type', 'icon': '', 'id': '1138697337723121665', 'ismenu': '0', 'levels': 11, 'name': '获取告警内容', 'num': 0, 'parentId': '1138696443757555713', 'resourceType': '04', 'url': '/alarm/contentType' },
     { 'code': 'alarmrule_update', 'icon': '', 'id': '1138698760955326466', 'ismenu': '0', 'levels': 11, 'name': '编辑告警规则', 'num': 0, 'parentId': '1138697759749795842', 'resourceType': '04', 'url': '/alarmRule/update' },
-    { 'code': 'device_list', 'icon': '', 'id': '1138678001323175937', 'ismenu': '1', 'levels': 11, 'name': '设备列表', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '03', 'url': '/device/list' },
     { 'code': 'device_add', 'icon': '', 'id': '1138686212658917378', 'ismenu': '0', 'levels': 11, 'name': '新增设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/add' },
     { 'code': 'device_delete', 'icon': '', 'id': '1138689666945085441', 'ismenu': '0', 'levels': 11, 'name': '删除设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/delete' },
     { 'code': 'device_export', 'icon': '', 'id': '1138690037587341314', 'ismenu': '0', 'levels': 11, 'name': '批量导出设备', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '04', 'url': '/device/batchExport' },
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 8f7d2ac..12bdcf2 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -139,6 +139,24 @@
         name: 'NbDevice',
         component: () => import('@/views/nbDevice/listNbDevice'),
         meta: { title: 'NB注册', icon: 'icon-config', permission: ['/nbdevice/list'] }
+      },
+      {
+        path: '/deviceType',
+        name: 'DeviceType',
+        component: () => import('@/views/deviceManage/deviceType/deviceType'),
+        meta: { title: '设备类型管理', icon: 'icon-config', permission: ['/device/type'] }
+      },
+      {
+        path: '/deviceModel',
+        name: 'DeviceModel',
+        component: () => import('@/views/deviceManage/deviceModel/deviceModel'),
+        meta: { title: '设备型号管理', icon: 'icon-config', permission: ['/device/model'] }
+      },
+      {
+        path: '/deviceImei',
+        name: 'DeviceImei',
+        component: () => import('@/views/deviceManage/deviceImei/deviceImei'),
+        meta: { title: '设备SIM卡号管理', icon: 'icon-config', permission: ['/device/imei'] }
       }
     ]
   },
diff --git a/src/utils/request.js b/src/utils/request.js
index 02dcee1..9ce2ab2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -39,19 +39,20 @@
     } else if (res.code !== 200) {
       // 50008:非法的token; 50012:其他客户端登录了;  50014:Token 过期了;
       if (res.code === 401 || res.code === 50012 || res.code === 50014) {
-        MessageBox.confirm(
-          '你已被登出，可以取消继续留在该页面，或者重新登录',
-          '确定登出',
-          {
-            confirmButtonText: '重新登录',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
-          store.dispatch('FedLogOut').then(() => {
-            location.reload() // 为了重新实例化vue-router对象 避免bug
-          })
-        })
+        // 开发完页面以后下面的这个注释需要打开
+        // MessageBox.confirm(
+        //   '你已被登出，可以取消继续留在该页面，或者重新登录',
+        //   '确定登出',
+        //   {
+        //     confirmButtonText: '重新登录',
+        //     cancelButtonText: '取消',
+        //     type: 'warning'
+        //   }
+        // ).then(() => {
+        //   store.dispatch('FedLogOut').then(() => {
+        //     location.reload() // 为了重新实例化vue-router对象 避免bug
+        //   })
+        // })
       } else {
         Message({
           showClose: true,
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..b22e406
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,272 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
+      <el-row :gutter="20">
+        <!--<el-col :span="12">-->
+        <!--<el-form-item label="设备名称" prop="deviceName">-->
+        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="安装日期" prop="installDate">
+            <el-date-picker
+              v-model.trim="deviceForm.installDate"
+              :disabled="isDetailMode"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备型号" prop="modelId">
+            <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
+              <el-option
+                v-for="item in deviceModelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="井编号" prop="wellCode">
+            <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-show="!(isDetailMode&&deviceForm.concenCode=='')" label="集中器编号" prop="concenCode">
+            <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDevice, updateDevice, getDeviceType, getDeviceModel } from '@/api/device/device'
+
+export default {
+  name: 'EditDevice',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceForm: {
+        id: '',
+        deviceName: '',
+        devcode: '',
+        deviceType: '',
+        wellCode: '',
+        modelId: '',
+        installDate: '',
+        concenCode: ''
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增啊啊啊啊啊啊',
+        detail: '详情'
+      }, // 表头显示标题
+      deviceTypeList: null, // 设备类型列表
+      deviceModelList: null, // 设备型号列表
+      showDeviceType: true, // 是否显示设备类型选项
+      showModelType: true, // 是否显示型号选项
+      rules: {
+        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
+        devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
+        installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      isEditMode: false, // 编辑模式
+      isDetailMode: false // 详情模式
+    }
+  },
+  watch: {
+    'deviceForm.deviceType': function(val, oldval) {
+      this.fetchDeviceModel(val)
+    }
+  },
+  mounted() {
+    this.fetchDeviceType()
+    // this.fetchDeviceModel()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+        this.isDetailMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = false
+      } else {
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = true
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        id: '',
+        deviceName: '',
+        devcode: '',
+        deviceType: '',
+        wellCode: '',
+        modelId: '',
+        installDate: '',
+        concenCode: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDevice(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDevice(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 获取设备型号
+    fetchDeviceType() {
+      getDeviceType().then(response => {
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
+        }
+      })
+    },
+    typeChanged() {
+      this.deviceForm.modelId = ''
+    },
+    // 获取设备型号
+    fetchDeviceModel(val) {
+      getDeviceModel(val).then(response => {
+        this.deviceModelList = response.data
+        if (this.deviceModelList.length <= 1) {
+          this.showModelType = false
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
new file mode 100644
index 0000000..8559872
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -0,0 +1,429 @@
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <!-- <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号/井编号" clearable />
+          </el-form-item> -->
+          <el-form-item v-if="showDeviceType" class="selectForm-container-item">
+            <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.isValid" placeholder="是否启用" clearable>
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item v-if="isAdmin" class="selectForm-container-item">
+            <el-select v-model="listQuery.isOnline" placeholder="在线情况" clearable>
+              <el-option
+                v-for="item in onlineStates"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item> -->
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+            搜索
+          </el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/device/batchExport')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template v-if="hasPerm('/device/batchImport')" :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/device/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/device/delete')" class="edit_btn" size="small" @click="del">
+            删除
+          </el-button>
+          <el-button v-if="hasPerm('/device/add')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column v-if="hasPerm('/device/delete')" align="center" type="selection" width="55" />
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
+              {{ scope.row[column.value] }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="datalist(scope.row)">
+              历史数据
+            </el-button>
+            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+            <el-button type="text" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+
+    <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
+
+    <detail-device v-show="detailShow" ref="detaildevice" />
+
+    <info-well v-show="wellShow" ref="wellInfo" />
+  </div>
+</template>
+
+<script>
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
+import detailDevice from '@/views/deviceManage/detailDevice'
+import { getDeviceList, getDeviceType, delDevice, batchImportDevice, batchExportDevice } from '@/api/device/device'
+import DownloadTemplate from '@/components/DownloadTemplate'
+import InfoWell from '@/views/wellManage/infoWell'
+import { isAdministrator, notContainConcentrator } from '@/utils/permission'
+
+export default {
+  name: 'ListDevice',
+  components: { DownloadTemplate, editDevice, detailDevice, InfoWell },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc',
+        isValid: ''
+      }, // 筛选条件
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      columns: [
+        {
+          text: '设备编号',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '描述',
+          value: 'typeDescription',
+          align: 'center'
+        },
+        {
+          text: '是否启用',
+          value: 'valid',
+          align: 'center'
+        },
+        {
+          text: '监控内容',
+          value: 'watchType',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 设备类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      fileList: [],
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      deptShowTop: false, // 是否显示顶级
+      onlineStates: [
+        { value: '1', name: '在线' },
+        { value: '0', name: '离线' }
+      ], // 在线情况
+      wellShow: false
+    }
+  },
+  computed: {
+    isAdmin() {
+      return isAdministrator()
+    }
+  },
+  mounted() {
+    this.fetchDeviceType()// 获取设备列表
+    if (!notContainConcentrator()) {
+      this.columns.splice(-1, 1)
+    }
+    // 如果参数中有井编号，则将查询条件填入，否则正常
+    if (this.$route.query && this.$route.query.wellCode && this.$route.query.wellCode !== '') {
+      this.listQuery.keywords = this.$route.query.wellCode
+      this.fetchData(true)
+    } else {
+      this.fetchData()// 获取数据
+    }
+  },
+  methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑设备信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row)
+    },
+    detail(row) {
+      this.$refs.editdevice.initDialog('detail', true, row)
+    },
+    // 删除设备
+    del() {
+      if (this.checkSelection()) {
+        const deviceIds = []
+        this.multipleSelection.forEach(function(value, index) {
+          deviceIds.push(value.id)
+        })
+        // wellNames = wellNames.slice(0, wellNames.length - 1)
+        this.$confirm(
+          '确定要删除所选设备吗？',
+          '确认操作',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          delDevice(deviceIds).then(response => {
+            if (response.code === 200) {
+              this.$message.success('删除成功')
+              this.fetchData()
+            }
+          })
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 批量导入集中器
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportDevice(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportDevice(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `设备列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取集中器数据
+    fetchData(isNowPage = true) {
+      // this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getDeviceList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    // 获取设备类型
+    fetchDeviceType() {
+      getDeviceType(this.listQuery).then(response => {
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
+        }
+        if (this.deviceTypeList.length <= 1) {
+          this.showDeviceType = false
+        }
+      })
+    },
+    datalist(row) {
+      const params = { devcode: row.devcode, deviceType: row.deviceType }
+      this.$router.push({ name: 'DataManage', query: params })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..b22e406
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,272 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
+      <el-row :gutter="20">
+        <!--<el-col :span="12">-->
+        <!--<el-form-item label="设备名称" prop="deviceName">-->
+        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="安装日期" prop="installDate">
+            <el-date-picker
+              v-model.trim="deviceForm.installDate"
+              :disabled="isDetailMode"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备型号" prop="modelId">
+            <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
+              <el-option
+                v-for="item in deviceModelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="井编号" prop="wellCode">
+            <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-show="!(isDetailMode&&deviceForm.concenCode=='')" label="集中器编号" prop="concenCode">
+            <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDevice, updateDevice, getDeviceType, getDeviceModel } from '@/api/device/device'
+
+export default {
+  name: 'EditDevice',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceForm: {
+        id: '',
+        deviceName: '',
+        devcode: '',
+        deviceType: '',
+        wellCode: '',
+        modelId: '',
+        installDate: '',
+        concenCode: ''
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增啊啊啊啊啊啊',
+        detail: '详情'
+      }, // 表头显示标题
+      deviceTypeList: null, // 设备类型列表
+      deviceModelList: null, // 设备型号列表
+      showDeviceType: true, // 是否显示设备类型选项
+      showModelType: true, // 是否显示型号选项
+      rules: {
+        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
+        devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
+        installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      isEditMode: false, // 编辑模式
+      isDetailMode: false // 详情模式
+    }
+  },
+  watch: {
+    'deviceForm.deviceType': function(val, oldval) {
+      this.fetchDeviceModel(val)
+    }
+  },
+  mounted() {
+    this.fetchDeviceType()
+    // this.fetchDeviceModel()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+        this.isDetailMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = false
+      } else {
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = true
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        id: '',
+        deviceName: '',
+        devcode: '',
+        deviceType: '',
+        wellCode: '',
+        modelId: '',
+        installDate: '',
+        concenCode: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDevice(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDevice(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 获取设备型号
+    fetchDeviceType() {
+      getDeviceType().then(response => {
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
+        }
+      })
+    },
+    typeChanged() {
+      this.deviceForm.modelId = ''
+    },
+    // 获取设备型号
+    fetchDeviceModel(val) {
+      getDeviceModel(val).then(response => {
+        this.deviceModelList = response.data
+        if (this.deviceModelList.length <= 1) {
+          this.showModelType = false
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
new file mode 100644
index 0000000..eed7ed8
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -0,0 +1,429 @@
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <!-- <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号/井编号" clearable />
+          </el-form-item> -->
+          <el-form-item v-if="showDeviceType" class="selectForm-container-item">
+            <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.isValid" placeholder="是否启用" clearable>
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item v-if="isAdmin" class="selectForm-container-item">
+            <el-select v-model="listQuery.isOnline" placeholder="在线情况" clearable>
+              <el-option
+                v-for="item in onlineStates"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item> -->
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+            搜索
+          </el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/device/batchExport')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template v-if="hasPerm('/device/batchImport')" :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/device/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/device/delete')" class="edit_btn" size="small" @click="del">
+            删除
+          </el-button>
+          <el-button v-if="hasPerm('/device/add')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column v-if="hasPerm('/device/delete')" align="center" type="selection" width="55" />
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
+              {{ scope.row[column.value] }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="datalist(scope.row)">
+              历史数据
+            </el-button>
+            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+            <el-button type="text" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+
+    <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
+
+    <detail-device v-show="detailShow" ref="detaildevice" />
+
+    <info-well v-show="wellShow" ref="wellInfo" />
+  </div>
+</template>
+
+<script>
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
+import detailDevice from '@/views/deviceManage/detailDevice'
+import { getDeviceList, getDeviceType, delDevice, batchImportDevice, batchExportDevice } from '@/api/device/device'
+import DownloadTemplate from '@/components/DownloadTemplate'
+import InfoWell from '@/views/wellManage/infoWell'
+import { isAdministrator, notContainConcentrator } from '@/utils/permission'
+
+export default {
+  name: 'ListDevice',
+  components: { DownloadTemplate, editDevice, detailDevice, InfoWell },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc',
+        isValid: ''
+      }, // 筛选条件
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      columns: [
+        {
+          text: '设备编号',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '类型名称',
+          value: 'modelName',
+          align: 'center'
+        },
+        {
+          text: '设备类型主键',
+          value: 'deviceType',
+          align: 'center'
+        },
+        {
+          text: '设备类型名称',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '通信方式',
+          value: 'communication',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 设备类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      fileList: [],
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      deptShowTop: false, // 是否显示顶级
+      onlineStates: [
+        { value: '1', name: '在线' },
+        { value: '0', name: '离线' }
+      ], // 在线情况
+      wellShow: false
+    }
+  },
+  computed: {
+    isAdmin() {
+      return isAdministrator()
+    }
+  },
+  mounted() {
+    this.fetchDeviceType()// 获取设备列表
+    if (!notContainConcentrator()) {
+      this.columns.splice(-1, 1)
+    }
+    // 如果参数中有井编号，则将查询条件填入，否则正常
+    if (this.$route.query && this.$route.query.wellCode && this.$route.query.wellCode !== '') {
+      this.listQuery.keywords = this.$route.query.wellCode
+      this.fetchData(true)
+    } else {
+      this.fetchData()// 获取数据
+    }
+  },
+  methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑设备信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row)
+    },
+    detail(row) {
+      this.$refs.editdevice.initDialog('detail', true, row)
+    },
+    // 删除设备
+    del() {
+      if (this.checkSelection()) {
+        const deviceIds = []
+        this.multipleSelection.forEach(function(value, index) {
+          deviceIds.push(value.id)
+        })
+        // wellNames = wellNames.slice(0, wellNames.length - 1)
+        this.$confirm(
+          '确定要删除所选设备吗？',
+          '确认操作',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          delDevice(deviceIds).then(response => {
+            if (response.code === 200) {
+              this.$message.success('删除成功')
+              this.fetchData()
+            }
+          })
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 批量导入集中器
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportDevice(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportDevice(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `设备列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取集中器数据
+    fetchData(isNowPage = true) {
+      // this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getDeviceList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    // 获取设备类型
+    fetchDeviceType() {
+      getDeviceType(this.listQuery).then(response => {
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
+        }
+        if (this.deviceTypeList.length <= 1) {
+          this.showDeviceType = false
+        }
+      })
+    },
+    datalist(row) {
+      const params = { devcode: row.devcode, deviceType: row.deviceType }
+      this.$router.push({ name: 'DataManage', query: params })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..b22e406
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,272 @@
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
+      <el-row :gutter="20">
+        <!--<el-col :span="12">-->
+        <!--<el-form-item label="设备名称" prop="deviceName">-->
+        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="安装日期" prop="installDate">
+            <el-date-picker
+              v-model.trim="deviceForm.installDate"
+              :disabled="isDetailMode"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备型号" prop="modelId">
+            <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
+              <el-option
+                v-for="item in deviceModelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="井编号" prop="wellCode">
+            <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-show="!(isDetailMode&&deviceForm.concenCode=='')" label="集中器编号" prop="concenCode">
+            <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="cancel">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDevice, updateDevice, getDeviceType, getDeviceModel } from '@/api/device/device'
+
+export default {
+  name: 'EditDevice',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceForm: {
+        id: '',
+        deviceName: '',
+        devcode: '',
+        deviceType: '',
+        wellCode: '',
+        modelId: '',
+        installDate: '',
+        concenCode: ''
+      }, // 表单
+      textMap: {
+        update: '编辑',
+        create: '新增啊啊啊啊啊啊',
+        detail: '详情'
+      }, // 表头显示标题
+      deviceTypeList: null, // 设备类型列表
+      deviceModelList: null, // 设备型号列表
+      showDeviceType: true, // 是否显示设备类型选项
+      showModelType: true, // 是否显示型号选项
+      rules: {
+        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
+        devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
+        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
+        installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      isEditMode: false, // 编辑模式
+      isDetailMode: false // 详情模式
+    }
+  },
+  watch: {
+    'deviceForm.deviceType': function(val, oldval) {
+      this.fetchDeviceModel(val)
+    }
+  },
+  mounted() {
+    this.fetchDeviceType()
+    // this.fetchDeviceModel()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+      if (dialogStatus === 'create') { // 如果是新增，清除验证
+        this.resetForm()
+        this.isEditMode = false
+        this.isDetailMode = false
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = false
+      } else {
+        this.deviceForm = {
+          id: row.id,
+          deviceName: row.deviceName,
+          devcode: row.devcode,
+          deviceType: row.deviceType,
+          modelId: row.modelId,
+          wellCode: row.wellCode,
+          concenCode: row.concenCode,
+          installDate: row.installDate
+        }
+        if (row.deviceType !== '') {
+          this.fetchDeviceModel(row.deviceType)
+        }
+        this.isEditMode = true
+        this.isDetailMode = true
+      }
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        id: '',
+        deviceName: '',
+        devcode: '',
+        deviceType: '',
+        wellCode: '',
+        modelId: '',
+        installDate: '',
+        concenCode: ''
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDevice(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild')
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDevice(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 获取设备型号
+    fetchDeviceType() {
+      getDeviceType().then(response => {
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
+        }
+      })
+    },
+    typeChanged() {
+      this.deviceForm.modelId = ''
+    },
+    // 获取设备型号
+    fetchDeviceModel(val) {
+      getDeviceModel(val).then(response => {
+        this.deviceModelList = response.data
+        if (this.deviceModelList.length <= 1) {
+          this.showModelType = false
+        }
+      })
+    },
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
new file mode 100644
index 0000000..a3cd08a
--- /dev/null
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -0,0 +1,429 @@
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <!-- <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号/井编号" clearable />
+          </el-form-item> -->
+          <el-form-item v-if="showDeviceType" class="selectForm-container-item">
+            <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.isValid" placeholder="是否启用" clearable>
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item v-if="isAdmin" class="selectForm-container-item">
+            <el-select v-model="listQuery.isOnline" placeholder="在线情况" clearable>
+              <el-option
+                v-for="item in onlineStates"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item> -->
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+            搜索
+          </el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/device/batchExport')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+          <download-template v-if="hasPerm('/device/batchImport')" :filename="filename" />
+          <el-upload
+            v-if="hasPerm('/device/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+          <el-button v-if="hasPerm('/device/delete')" class="edit_btn" size="small" @click="del">
+            删除
+          </el-button>
+          <el-button v-if="hasPerm('/device/add')" class="edit_btn" size="small" @click="add">
+            新增
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column v-if="hasPerm('/device/delete')" align="center" type="selection" width="55" />
+        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
+            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
+              {{ scope.row[column.value] }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="datalist(scope.row)">
+              历史数据
+            </el-button>
+            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+            <el-button type="text" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+
+    <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
+
+    <detail-device v-show="detailShow" ref="detaildevice" />
+
+    <info-well v-show="wellShow" ref="wellInfo" />
+  </div>
+</template>
+
+<script>
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
+import detailDevice from '@/views/deviceManage/detailDevice'
+import { getDeviceList, getDeviceType, delDevice, batchImportDevice, batchExportDevice } from '@/api/device/device'
+import DownloadTemplate from '@/components/DownloadTemplate'
+import InfoWell from '@/views/wellManage/infoWell'
+import { isAdministrator, notContainConcentrator } from '@/utils/permission'
+
+export default {
+  name: 'ListDevice',
+  components: { DownloadTemplate, editDevice, detailDevice, InfoWell },
+  data() {
+    return {
+      listQuery: {
+        keywords: '',
+        deviceType: '',
+        isOnline: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id',
+        order: 'asc',
+        isValid: ''
+      }, // 筛选条件
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      columns: [
+        {
+          text: '设备编号',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'typeName',
+          align: 'center'
+        },
+        {
+          text: '描述',
+          value: 'typeDescription',
+          align: 'center'
+        },
+        {
+          text: '是否启用',
+          value: 'valid',
+          align: 'center'
+        },
+        {
+          text: '监控内容',
+          value: 'watchType',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 设备类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示权属单位下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      fileList: [],
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      filename: 'device_template.xlsx',
+      deptShowTop: false, // 是否显示顶级
+      onlineStates: [
+        { value: '1', name: '在线' },
+        { value: '0', name: '离线' }
+      ], // 在线情况
+      wellShow: false
+    }
+  },
+  computed: {
+    isAdmin() {
+      return isAdministrator()
+    }
+  },
+  mounted() {
+    this.fetchDeviceType()// 获取设备列表
+    if (!notContainConcentrator()) {
+      this.columns.splice(-1, 1)
+    }
+    // 如果参数中有井编号，则将查询条件填入，否则正常
+    if (this.$route.query && this.$route.query.wellCode && this.$route.query.wellCode !== '') {
+      this.listQuery.keywords = this.$route.query.wellCode
+      this.fetchData(true)
+    } else {
+      this.fetchData()// 获取数据
+    }
+  },
+  methods: {
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('create', this.dialogFormVisible)
+    },
+    // 编辑设备信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row)
+    },
+    detail(row) {
+      this.$refs.editdevice.initDialog('detail', true, row)
+    },
+    // 删除设备
+    del() {
+      if (this.checkSelection()) {
+        const deviceIds = []
+        this.multipleSelection.forEach(function(value, index) {
+          deviceIds.push(value.id)
+        })
+        // wellNames = wellNames.slice(0, wellNames.length - 1)
+        this.$confirm(
+          '确定要删除所选设备吗？',
+          '确认操作',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          delDevice(deviceIds).then(response => {
+            if (response.code === 200) {
+              this.$message.success('删除成功')
+              this.fetchData()
+            }
+          })
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 批量导入集中器
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportDevice(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportDevice(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `设备列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取集中器数据
+    fetchData(isNowPage = true) {
+      // this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getDeviceList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    // 获取设备类型
+    fetchDeviceType() {
+      getDeviceType(this.listQuery).then(response => {
+        this.deviceTypeList = []
+        // 过滤掉该单位不支持的设备类型
+        const deviceTypes = this.$store.getters.deviceTypes
+        for (const deviceType of response.data) {
+          if (deviceTypes.indexOf(deviceType.value) !== -1) {
+            this.deviceTypeList.push(deviceType)
+          }
+        }
+        if (this.deviceTypeList.length <= 1) {
+          this.showDeviceType = false
+        }
+      })
+    },
+    datalist(row) {
+      const params = { devcode: row.devcode, deviceType: row.deviceType }
+      this.$router.push({ name: 'DataManage', query: params })
+    },
+    showWellDetail(row) {
+      this.wellShow = true
+      this.$refs.wellInfo.initDialog(row.wellId)
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>