diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/system/tenant/components/dialogSysTenant.vue b/src/views/system/tenant/components/dialogSysTenant.vue
deleted file mode 100644
index 0b2d1c1..0000000
--- a/src/views/system/tenant/components/dialogSysTenant.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系人电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="历史保存天数" prop="clearDay">
-            <el-input
-              v-model="deviceForm.clearDay"
-              placeholder="请输入历史数据保存天数"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
-          <el-form-item label="组织名称" prop="deptName">
-            <el-select
-              v-model="deviceForm.deptName"
-              placeholder="请选择关联组织名称"
-              clearable
-            >
-              <el-option
-                v-for="item in deptNameList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
-export default {
-  name: 'DialogSysTenant',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情',
-        makeDep: '项目绑定组织'
-      },
-      // 组织关系列表
-      deptNameList: [
-        {
-          name: '组织名称一',
-          value: '0'
-        },
-        {
-          name: '组织名称二',
-          value: '1'
-        },
-        {
-          name: '组织名称三',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      },
-      // 表单校验规则
-      rules: {
-        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
-        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
-        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
-        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
-        this.deviceForm = {
-          tenantCode: row.tenantCode,
-          tenantName: row.tenantName,
-          linkPerson: row.linkPerson,
-          tel: row.tel,
-          clearDay: row.clearDay,
-          deptName: row.deptName
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      } else if (this.dialogStatus === 'makeDep') {
-        this.makeDept()
-      }
-    },
-    // 绑定组织关系
-    makeDept() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          deptTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('绑定成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addTenantSys(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/system/tenant/components/dialogSysTenant.vue b/src/views/system/tenant/components/dialogSysTenant.vue
deleted file mode 100644
index 0b2d1c1..0000000
--- a/src/views/system/tenant/components/dialogSysTenant.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系人电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="历史保存天数" prop="clearDay">
-            <el-input
-              v-model="deviceForm.clearDay"
-              placeholder="请输入历史数据保存天数"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
-          <el-form-item label="组织名称" prop="deptName">
-            <el-select
-              v-model="deviceForm.deptName"
-              placeholder="请选择关联组织名称"
-              clearable
-            >
-              <el-option
-                v-for="item in deptNameList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
-export default {
-  name: 'DialogSysTenant',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情',
-        makeDep: '项目绑定组织'
-      },
-      // 组织关系列表
-      deptNameList: [
-        {
-          name: '组织名称一',
-          value: '0'
-        },
-        {
-          name: '组织名称二',
-          value: '1'
-        },
-        {
-          name: '组织名称三',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      },
-      // 表单校验规则
-      rules: {
-        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
-        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
-        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
-        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
-        this.deviceForm = {
-          tenantCode: row.tenantCode,
-          tenantName: row.tenantName,
-          linkPerson: row.linkPerson,
-          tel: row.tel,
-          clearDay: row.clearDay,
-          deptName: row.deptName
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      } else if (this.dialogStatus === 'makeDep') {
-        this.makeDept()
-      }
-    },
-    // 绑定组织关系
-    makeDept() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          deptTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('绑定成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addTenantSys(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
new file mode 100644
index 0000000..13e311c
--- /dev/null
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -0,0 +1,273 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系人电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearDay">
+            <el-input
+              v-model="deviceForm.clearDay"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <el-select
+              v-model="deviceForm.deptName"
+              placeholder="请选择关联组织名称"
+              clearable
+            >
+              <el-option
+                v-for="item in deptNameList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
+export default {
+  name: 'EditSysTenant',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情',
+        makeDep: '项目绑定组织'
+      },
+      // 组织关系列表
+      deptNameList: [
+        {
+          name: '组织名称一',
+          value: '0'
+        },
+        {
+          name: '组织名称二',
+          value: '1'
+        },
+        {
+          name: '组织名称三',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      },
+      // 表单校验规则
+      rules: {
+        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
+        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
+        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
+        this.deviceForm = {
+          tenantCode: row.tenantCode,
+          tenantName: row.tenantName,
+          linkPerson: row.linkPerson,
+          tel: row.tel,
+          clearDay: row.clearDay,
+          deptName: row.deptName
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      } else if (this.dialogStatus === 'makeDep') {
+        this.makeDept()
+      }
+    },
+    // 绑定组织关系
+    makeDept() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          deptTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addTenantSys(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/system/tenant/components/dialogSysTenant.vue b/src/views/system/tenant/components/dialogSysTenant.vue
deleted file mode 100644
index 0b2d1c1..0000000
--- a/src/views/system/tenant/components/dialogSysTenant.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系人电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="历史保存天数" prop="clearDay">
-            <el-input
-              v-model="deviceForm.clearDay"
-              placeholder="请输入历史数据保存天数"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
-          <el-form-item label="组织名称" prop="deptName">
-            <el-select
-              v-model="deviceForm.deptName"
-              placeholder="请选择关联组织名称"
-              clearable
-            >
-              <el-option
-                v-for="item in deptNameList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
-export default {
-  name: 'DialogSysTenant',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情',
-        makeDep: '项目绑定组织'
-      },
-      // 组织关系列表
-      deptNameList: [
-        {
-          name: '组织名称一',
-          value: '0'
-        },
-        {
-          name: '组织名称二',
-          value: '1'
-        },
-        {
-          name: '组织名称三',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      },
-      // 表单校验规则
-      rules: {
-        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
-        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
-        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
-        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
-        this.deviceForm = {
-          tenantCode: row.tenantCode,
-          tenantName: row.tenantName,
-          linkPerson: row.linkPerson,
-          tel: row.tel,
-          clearDay: row.clearDay,
-          deptName: row.deptName
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      } else if (this.dialogStatus === 'makeDep') {
-        this.makeDept()
-      }
-    },
-    // 绑定组织关系
-    makeDept() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          deptTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('绑定成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addTenantSys(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
new file mode 100644
index 0000000..13e311c
--- /dev/null
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -0,0 +1,273 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系人电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearDay">
+            <el-input
+              v-model="deviceForm.clearDay"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <el-select
+              v-model="deviceForm.deptName"
+              placeholder="请选择关联组织名称"
+              clearable
+            >
+              <el-option
+                v-for="item in deptNameList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
+export default {
+  name: 'EditSysTenant',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情',
+        makeDep: '项目绑定组织'
+      },
+      // 组织关系列表
+      deptNameList: [
+        {
+          name: '组织名称一',
+          value: '0'
+        },
+        {
+          name: '组织名称二',
+          value: '1'
+        },
+        {
+          name: '组织名称三',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      },
+      // 表单校验规则
+      rules: {
+        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
+        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
+        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
+        this.deviceForm = {
+          tenantCode: row.tenantCode,
+          tenantName: row.tenantName,
+          linkPerson: row.linkPerson,
+          tel: row.tel,
+          clearDay: row.clearDay,
+          deptName: row.deptName
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      } else if (this.dialogStatus === 'makeDep') {
+        this.makeDept()
+      }
+    },
+    // 绑定组织关系
+    makeDept() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          deptTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addTenantSys(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
new file mode 100644
index 0000000..408328c
--- /dev/null
+++ b/src/views/system/tenant/tenantList.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="140" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/system/tenant/components/editTenant'
+import { tenantSysList, delTenantSys } from '@/api/system/tenant'
+
+export default {
+  name: 'TenantList',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '项目编码',
+          value: 'tenantCode',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '项目联系人',
+          value: 'linkPerson',
+          align: 'center'
+        },
+        {
+          text: '联系人电话',
+          value: 'tel',
+          align: 'center'
+        },
+        {
+          text: '历史数据保存天数',
+          value: 'clearDay',
+          align: 'center'
+        },
+        {
+          text: '关联组织',
+          value: 'deptId',
+          align: 'center'
+        },
+        {
+          text: '关联组织名称',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      tenantSysList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delTenantSys(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    },
+    // 绑定组织
+    makeDep(row) {
+      this.$refs.editAlarmContent.initDialog('makeDep', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/system/tenant/components/dialogSysTenant.vue b/src/views/system/tenant/components/dialogSysTenant.vue
deleted file mode 100644
index 0b2d1c1..0000000
--- a/src/views/system/tenant/components/dialogSysTenant.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系人电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="历史保存天数" prop="clearDay">
-            <el-input
-              v-model="deviceForm.clearDay"
-              placeholder="请输入历史数据保存天数"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
-          <el-form-item label="组织名称" prop="deptName">
-            <el-select
-              v-model="deviceForm.deptName"
-              placeholder="请选择关联组织名称"
-              clearable
-            >
-              <el-option
-                v-for="item in deptNameList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
-export default {
-  name: 'DialogSysTenant',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情',
-        makeDep: '项目绑定组织'
-      },
-      // 组织关系列表
-      deptNameList: [
-        {
-          name: '组织名称一',
-          value: '0'
-        },
-        {
-          name: '组织名称二',
-          value: '1'
-        },
-        {
-          name: '组织名称三',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      },
-      // 表单校验规则
-      rules: {
-        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
-        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
-        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
-        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
-        this.deviceForm = {
-          tenantCode: row.tenantCode,
-          tenantName: row.tenantName,
-          linkPerson: row.linkPerson,
-          tel: row.tel,
-          clearDay: row.clearDay,
-          deptName: row.deptName
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      } else if (this.dialogStatus === 'makeDep') {
-        this.makeDept()
-      }
-    },
-    // 绑定组织关系
-    makeDept() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          deptTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('绑定成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addTenantSys(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
new file mode 100644
index 0000000..13e311c
--- /dev/null
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -0,0 +1,273 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系人电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearDay">
+            <el-input
+              v-model="deviceForm.clearDay"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <el-select
+              v-model="deviceForm.deptName"
+              placeholder="请选择关联组织名称"
+              clearable
+            >
+              <el-option
+                v-for="item in deptNameList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
+export default {
+  name: 'EditSysTenant',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情',
+        makeDep: '项目绑定组织'
+      },
+      // 组织关系列表
+      deptNameList: [
+        {
+          name: '组织名称一',
+          value: '0'
+        },
+        {
+          name: '组织名称二',
+          value: '1'
+        },
+        {
+          name: '组织名称三',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      },
+      // 表单校验规则
+      rules: {
+        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
+        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
+        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
+        this.deviceForm = {
+          tenantCode: row.tenantCode,
+          tenantName: row.tenantName,
+          linkPerson: row.linkPerson,
+          tel: row.tel,
+          clearDay: row.clearDay,
+          deptName: row.deptName
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      } else if (this.dialogStatus === 'makeDep') {
+        this.makeDept()
+      }
+    },
+    // 绑定组织关系
+    makeDept() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          deptTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addTenantSys(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
new file mode 100644
index 0000000..408328c
--- /dev/null
+++ b/src/views/system/tenant/tenantList.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="140" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/system/tenant/components/editTenant'
+import { tenantSysList, delTenantSys } from '@/api/system/tenant'
+
+export default {
+  name: 'TenantList',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '项目编码',
+          value: 'tenantCode',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '项目联系人',
+          value: 'linkPerson',
+          align: 'center'
+        },
+        {
+          text: '联系人电话',
+          value: 'tel',
+          align: 'center'
+        },
+        {
+          text: '历史数据保存天数',
+          value: 'clearDay',
+          align: 'center'
+        },
+        {
+          text: '关联组织',
+          value: 'deptId',
+          align: 'center'
+        },
+        {
+          text: '关联组织名称',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      tenantSysList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delTenantSys(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    },
+    // 绑定组织
+    makeDep(row) {
+      this.$refs.editAlarmContent.initDialog('makeDep', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantSystList.vue b/src/views/system/tenant/tenantSystList.vue
deleted file mode 100644
index 61149b2..0000000
--- a/src/views/system/tenant/tenantSystList.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="140" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" size="small" @click="makeDep(scope.row)">
-              组织
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/system/tenant/components/dialogSysTenant'
-import { tenantSysList, delTenantSys } from '@/api/system/tenant'
-
-export default {
-  name: 'TenantSystList',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '项目编码',
-          value: 'tenantCode',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '项目联系人',
-          value: 'linkPerson',
-          align: 'center'
-        },
-        {
-          text: '联系人电话',
-          value: 'tel',
-          align: 'center'
-        },
-        {
-          text: '历史数据保存天数',
-          value: 'clearDay',
-          align: 'center'
-        },
-        {
-          text: '关联组织',
-          value: 'deptId',
-          align: 'center'
-        },
-        {
-          text: '关联组织名称',
-          value: 'deptName',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      tenantSysList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delTenantSys(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    },
-    // 绑定组织
-    makeDep(row) {
-      this.$refs.dialogAlarmContent.initDialog('makeDep', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/system/tenant/components/dialogSysTenant.vue b/src/views/system/tenant/components/dialogSysTenant.vue
deleted file mode 100644
index 0b2d1c1..0000000
--- a/src/views/system/tenant/components/dialogSysTenant.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系人电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="历史保存天数" prop="clearDay">
-            <el-input
-              v-model="deviceForm.clearDay"
-              placeholder="请输入历史数据保存天数"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
-          <el-form-item label="组织名称" prop="deptName">
-            <el-select
-              v-model="deviceForm.deptName"
-              placeholder="请选择关联组织名称"
-              clearable
-            >
-              <el-option
-                v-for="item in deptNameList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
-export default {
-  name: 'DialogSysTenant',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情',
-        makeDep: '项目绑定组织'
-      },
-      // 组织关系列表
-      deptNameList: [
-        {
-          name: '组织名称一',
-          value: '0'
-        },
-        {
-          name: '组织名称二',
-          value: '1'
-        },
-        {
-          name: '组织名称三',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      },
-      // 表单校验规则
-      rules: {
-        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
-        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
-        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
-        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
-        this.deviceForm = {
-          tenantCode: row.tenantCode,
-          tenantName: row.tenantName,
-          linkPerson: row.linkPerson,
-          tel: row.tel,
-          clearDay: row.clearDay,
-          deptName: row.deptName
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      } else if (this.dialogStatus === 'makeDep') {
-        this.makeDept()
-      }
-    },
-    // 绑定组织关系
-    makeDept() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          deptTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('绑定成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addTenantSys(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
new file mode 100644
index 0000000..13e311c
--- /dev/null
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -0,0 +1,273 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系人电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearDay">
+            <el-input
+              v-model="deviceForm.clearDay"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <el-select
+              v-model="deviceForm.deptName"
+              placeholder="请选择关联组织名称"
+              clearable
+            >
+              <el-option
+                v-for="item in deptNameList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
+export default {
+  name: 'EditSysTenant',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情',
+        makeDep: '项目绑定组织'
+      },
+      // 组织关系列表
+      deptNameList: [
+        {
+          name: '组织名称一',
+          value: '0'
+        },
+        {
+          name: '组织名称二',
+          value: '1'
+        },
+        {
+          name: '组织名称三',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      },
+      // 表单校验规则
+      rules: {
+        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
+        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
+        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
+        this.deviceForm = {
+          tenantCode: row.tenantCode,
+          tenantName: row.tenantName,
+          linkPerson: row.linkPerson,
+          tel: row.tel,
+          clearDay: row.clearDay,
+          deptName: row.deptName
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      } else if (this.dialogStatus === 'makeDep') {
+        this.makeDept()
+      }
+    },
+    // 绑定组织关系
+    makeDept() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          deptTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addTenantSys(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
new file mode 100644
index 0000000..408328c
--- /dev/null
+++ b/src/views/system/tenant/tenantList.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="140" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/system/tenant/components/editTenant'
+import { tenantSysList, delTenantSys } from '@/api/system/tenant'
+
+export default {
+  name: 'TenantList',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '项目编码',
+          value: 'tenantCode',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '项目联系人',
+          value: 'linkPerson',
+          align: 'center'
+        },
+        {
+          text: '联系人电话',
+          value: 'tel',
+          align: 'center'
+        },
+        {
+          text: '历史数据保存天数',
+          value: 'clearDay',
+          align: 'center'
+        },
+        {
+          text: '关联组织',
+          value: 'deptId',
+          align: 'center'
+        },
+        {
+          text: '关联组织名称',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      tenantSysList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delTenantSys(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    },
+    // 绑定组织
+    makeDep(row) {
+      this.$refs.editAlarmContent.initDialog('makeDep', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantSystList.vue b/src/views/system/tenant/tenantSystList.vue
deleted file mode 100644
index 61149b2..0000000
--- a/src/views/system/tenant/tenantSystList.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="140" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" size="small" @click="makeDep(scope.row)">
-              组织
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/system/tenant/components/dialogSysTenant'
-import { tenantSysList, delTenantSys } from '@/api/system/tenant'
-
-export default {
-  name: 'TenantSystList',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '项目编码',
-          value: 'tenantCode',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '项目联系人',
-          value: 'linkPerson',
-          align: 'center'
-        },
-        {
-          text: '联系人电话',
-          value: 'tel',
-          align: 'center'
-        },
-        {
-          text: '历史数据保存天数',
-          value: 'clearDay',
-          align: 'center'
-        },
-        {
-          text: '关联组织',
-          value: 'deptId',
-          align: 'center'
-        },
-        {
-          text: '关联组织名称',
-          value: 'deptName',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      tenantSysList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delTenantSys(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    },
-    // 绑定组织
-    makeDep(row) {
-      this.$refs.dialogAlarmContent.initDialog('makeDep', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
deleted file mode 100644
index 0ea149c..0000000
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
-              clearable
-              placeholder="请输入告警内容"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警类型" prop="alarmType">
-            <el-select
-              v-model="deviceForm.alarmType"
-              placeholder="告警类型"
-              clearable
-            >
-              <el-option
-                v-for="item in alarmTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
-export default {
-  name: 'DialogAlarmContent',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
-        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        console.log(row)
-        this.deviceForm = {
-          alarmType: row.alarmType,
-          alarmContent: row.alarmContent,
-          devcode: row.id,
-          deviceType: row.deviceType.split(',')
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/system/tenant/components/dialogSysTenant.vue b/src/views/system/tenant/components/dialogSysTenant.vue
deleted file mode 100644
index 0b2d1c1..0000000
--- a/src/views/system/tenant/components/dialogSysTenant.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系人电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="历史保存天数" prop="clearDay">
-            <el-input
-              v-model="deviceForm.clearDay"
-              placeholder="请输入历史数据保存天数"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
-          <el-form-item label="组织名称" prop="deptName">
-            <el-select
-              v-model="deviceForm.deptName"
-              placeholder="请选择关联组织名称"
-              clearable
-            >
-              <el-option
-                v-for="item in deptNameList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
-export default {
-  name: 'DialogSysTenant',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情',
-        makeDep: '项目绑定组织'
-      },
-      // 组织关系列表
-      deptNameList: [
-        {
-          name: '组织名称一',
-          value: '0'
-        },
-        {
-          name: '组织名称二',
-          value: '1'
-        },
-        {
-          name: '组织名称三',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      },
-      // 表单校验规则
-      rules: {
-        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
-        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
-        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
-        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
-        this.deviceForm = {
-          tenantCode: row.tenantCode,
-          tenantName: row.tenantName,
-          linkPerson: row.linkPerson,
-          tel: row.tel,
-          clearDay: row.clearDay,
-          deptName: row.deptName
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      } else if (this.dialogStatus === 'makeDep') {
-        this.makeDept()
-      }
-    },
-    // 绑定组织关系
-    makeDept() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          deptTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('绑定成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addTenantSys(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
new file mode 100644
index 0000000..13e311c
--- /dev/null
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -0,0 +1,273 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系人电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearDay">
+            <el-input
+              v-model="deviceForm.clearDay"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <el-select
+              v-model="deviceForm.deptName"
+              placeholder="请选择关联组织名称"
+              clearable
+            >
+              <el-option
+                v-for="item in deptNameList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
+export default {
+  name: 'EditSysTenant',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情',
+        makeDep: '项目绑定组织'
+      },
+      // 组织关系列表
+      deptNameList: [
+        {
+          name: '组织名称一',
+          value: '0'
+        },
+        {
+          name: '组织名称二',
+          value: '1'
+        },
+        {
+          name: '组织名称三',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      },
+      // 表单校验规则
+      rules: {
+        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
+        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
+        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
+        this.deviceForm = {
+          tenantCode: row.tenantCode,
+          tenantName: row.tenantName,
+          linkPerson: row.linkPerson,
+          tel: row.tel,
+          clearDay: row.clearDay,
+          deptName: row.deptName
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      } else if (this.dialogStatus === 'makeDep') {
+        this.makeDept()
+      }
+    },
+    // 绑定组织关系
+    makeDept() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          deptTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addTenantSys(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
new file mode 100644
index 0000000..408328c
--- /dev/null
+++ b/src/views/system/tenant/tenantList.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="140" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/system/tenant/components/editTenant'
+import { tenantSysList, delTenantSys } from '@/api/system/tenant'
+
+export default {
+  name: 'TenantList',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '项目编码',
+          value: 'tenantCode',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '项目联系人',
+          value: 'linkPerson',
+          align: 'center'
+        },
+        {
+          text: '联系人电话',
+          value: 'tel',
+          align: 'center'
+        },
+        {
+          text: '历史数据保存天数',
+          value: 'clearDay',
+          align: 'center'
+        },
+        {
+          text: '关联组织',
+          value: 'deptId',
+          align: 'center'
+        },
+        {
+          text: '关联组织名称',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      tenantSysList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delTenantSys(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    },
+    // 绑定组织
+    makeDep(row) {
+      this.$refs.editAlarmContent.initDialog('makeDep', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantSystList.vue b/src/views/system/tenant/tenantSystList.vue
deleted file mode 100644
index 61149b2..0000000
--- a/src/views/system/tenant/tenantSystList.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="140" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" size="small" @click="makeDep(scope.row)">
-              组织
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/system/tenant/components/dialogSysTenant'
-import { tenantSysList, delTenantSys } from '@/api/system/tenant'
-
-export default {
-  name: 'TenantSystList',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '项目编码',
-          value: 'tenantCode',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '项目联系人',
-          value: 'linkPerson',
-          align: 'center'
-        },
-        {
-          text: '联系人电话',
-          value: 'tel',
-          align: 'center'
-        },
-        {
-          text: '历史数据保存天数',
-          value: 'clearDay',
-          align: 'center'
-        },
-        {
-          text: '关联组织',
-          value: 'deptId',
-          align: 'center'
-        },
-        {
-          text: '关联组织名称',
-          value: 'deptName',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      tenantSysList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delTenantSys(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    },
-    // 绑定组织
-    makeDep(row) {
-      this.$refs.dialogAlarmContent.initDialog('makeDep', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
deleted file mode 100644
index 0ea149c..0000000
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
-              clearable
-              placeholder="请输入告警内容"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警类型" prop="alarmType">
-            <el-select
-              v-model="deviceForm.alarmType"
-              placeholder="告警类型"
-              clearable
-            >
-              <el-option
-                v-for="item in alarmTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
-export default {
-  name: 'DialogAlarmContent',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
-        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        console.log(row)
-        this.deviceForm = {
-          alarmType: row.alarmType,
-          alarmContent: row.alarmContent,
-          devcode: row.id,
-          deviceType: row.deviceType.split(',')
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/editAlarmContent.vue b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
new file mode 100644
index 0000000..96e56f2
--- /dev/null
+++ b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
+              clearable
+              placeholder="请输入告警内容"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警类型" prop="alarmType">
+            <el-select
+              v-model="deviceForm.alarmType"
+              placeholder="告警类型"
+              clearable
+            >
+              <el-option
+                v-for="item in alarmTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              clearable
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
+export default {
+  name: 'EditAlarmContent',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
+        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        console.log(row)
+        this.deviceForm = {
+          alarmType: row.alarmType,
+          alarmContent: row.alarmContent,
+          devcode: row.id,
+          deviceType: row.deviceType.split(',')
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/system/tenant/components/dialogSysTenant.vue b/src/views/system/tenant/components/dialogSysTenant.vue
deleted file mode 100644
index 0b2d1c1..0000000
--- a/src/views/system/tenant/components/dialogSysTenant.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系人电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="历史保存天数" prop="clearDay">
-            <el-input
-              v-model="deviceForm.clearDay"
-              placeholder="请输入历史数据保存天数"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
-          <el-form-item label="组织名称" prop="deptName">
-            <el-select
-              v-model="deviceForm.deptName"
-              placeholder="请选择关联组织名称"
-              clearable
-            >
-              <el-option
-                v-for="item in deptNameList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
-export default {
-  name: 'DialogSysTenant',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情',
-        makeDep: '项目绑定组织'
-      },
-      // 组织关系列表
-      deptNameList: [
-        {
-          name: '组织名称一',
-          value: '0'
-        },
-        {
-          name: '组织名称二',
-          value: '1'
-        },
-        {
-          name: '组织名称三',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      },
-      // 表单校验规则
-      rules: {
-        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
-        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
-        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
-        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
-        this.deviceForm = {
-          tenantCode: row.tenantCode,
-          tenantName: row.tenantName,
-          linkPerson: row.linkPerson,
-          tel: row.tel,
-          clearDay: row.clearDay,
-          deptName: row.deptName
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      } else if (this.dialogStatus === 'makeDep') {
-        this.makeDept()
-      }
-    },
-    // 绑定组织关系
-    makeDept() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          deptTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('绑定成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addTenantSys(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
new file mode 100644
index 0000000..13e311c
--- /dev/null
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -0,0 +1,273 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系人电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearDay">
+            <el-input
+              v-model="deviceForm.clearDay"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <el-select
+              v-model="deviceForm.deptName"
+              placeholder="请选择关联组织名称"
+              clearable
+            >
+              <el-option
+                v-for="item in deptNameList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
+export default {
+  name: 'EditSysTenant',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情',
+        makeDep: '项目绑定组织'
+      },
+      // 组织关系列表
+      deptNameList: [
+        {
+          name: '组织名称一',
+          value: '0'
+        },
+        {
+          name: '组织名称二',
+          value: '1'
+        },
+        {
+          name: '组织名称三',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      },
+      // 表单校验规则
+      rules: {
+        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
+        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
+        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
+        this.deviceForm = {
+          tenantCode: row.tenantCode,
+          tenantName: row.tenantName,
+          linkPerson: row.linkPerson,
+          tel: row.tel,
+          clearDay: row.clearDay,
+          deptName: row.deptName
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      } else if (this.dialogStatus === 'makeDep') {
+        this.makeDept()
+      }
+    },
+    // 绑定组织关系
+    makeDept() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          deptTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addTenantSys(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
new file mode 100644
index 0000000..408328c
--- /dev/null
+++ b/src/views/system/tenant/tenantList.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="140" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/system/tenant/components/editTenant'
+import { tenantSysList, delTenantSys } from '@/api/system/tenant'
+
+export default {
+  name: 'TenantList',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '项目编码',
+          value: 'tenantCode',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '项目联系人',
+          value: 'linkPerson',
+          align: 'center'
+        },
+        {
+          text: '联系人电话',
+          value: 'tel',
+          align: 'center'
+        },
+        {
+          text: '历史数据保存天数',
+          value: 'clearDay',
+          align: 'center'
+        },
+        {
+          text: '关联组织',
+          value: 'deptId',
+          align: 'center'
+        },
+        {
+          text: '关联组织名称',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      tenantSysList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delTenantSys(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    },
+    // 绑定组织
+    makeDep(row) {
+      this.$refs.editAlarmContent.initDialog('makeDep', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantSystList.vue b/src/views/system/tenant/tenantSystList.vue
deleted file mode 100644
index 61149b2..0000000
--- a/src/views/system/tenant/tenantSystList.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="140" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" size="small" @click="makeDep(scope.row)">
-              组织
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/system/tenant/components/dialogSysTenant'
-import { tenantSysList, delTenantSys } from '@/api/system/tenant'
-
-export default {
-  name: 'TenantSystList',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '项目编码',
-          value: 'tenantCode',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '项目联系人',
-          value: 'linkPerson',
-          align: 'center'
-        },
-        {
-          text: '联系人电话',
-          value: 'tel',
-          align: 'center'
-        },
-        {
-          text: '历史数据保存天数',
-          value: 'clearDay',
-          align: 'center'
-        },
-        {
-          text: '关联组织',
-          value: 'deptId',
-          align: 'center'
-        },
-        {
-          text: '关联组织名称',
-          value: 'deptName',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      tenantSysList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delTenantSys(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    },
-    // 绑定组织
-    makeDep(row) {
-      this.$refs.dialogAlarmContent.initDialog('makeDep', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
deleted file mode 100644
index 0ea149c..0000000
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
-              clearable
-              placeholder="请输入告警内容"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警类型" prop="alarmType">
-            <el-select
-              v-model="deviceForm.alarmType"
-              placeholder="告警类型"
-              clearable
-            >
-              <el-option
-                v-for="item in alarmTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
-export default {
-  name: 'DialogAlarmContent',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
-        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        console.log(row)
-        this.deviceForm = {
-          alarmType: row.alarmType,
-          alarmContent: row.alarmContent,
-          devcode: row.id,
-          deviceType: row.deviceType.split(',')
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/editAlarmContent.vue b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
new file mode 100644
index 0000000..96e56f2
--- /dev/null
+++ b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
+              clearable
+              placeholder="请输入告警内容"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警类型" prop="alarmType">
+            <el-select
+              v-model="deviceForm.alarmType"
+              placeholder="告警类型"
+              clearable
+            >
+              <el-option
+                v-for="item in alarmTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              clearable
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
+export default {
+  name: 'EditAlarmContent',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
+        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        console.log(row)
+        this.deviceForm = {
+          alarmType: row.alarmType,
+          alarmContent: row.alarmContent,
+          devcode: row.id,
+          deviceType: row.deviceType.split(',')
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index f203f26..b7d9dab 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -73,17 +73,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import dialogAlarmContent from '@/views/systemConfig/alarmContent/components/dialogAlarmContent'
+import editAlarmContent from '@/views/systemConfig/alarmContent/components/editAlarmContent'
 import { getDevice, alarmContentList, delAlarmContent } from '@/api/systemConfig/alarmContent'
 
 export default {
   name: 'ListContent',
-  components: { dialogAlarmContent },
+  components: { editAlarmContent },
   data() {
     return {
       // 查询条件
@@ -183,11 +183,11 @@
     },
     // 新增
     add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
+      this.$refs.editAlarmContent.initDialog('create')
     },
     // 修改
     edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
+      this.$refs.editAlarmContent.initDialog('update', row)
     }
   }
 }

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/system/tenant/components/dialogSysTenant.vue b/src/views/system/tenant/components/dialogSysTenant.vue
deleted file mode 100644
index 0b2d1c1..0000000
--- a/src/views/system/tenant/components/dialogSysTenant.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系人电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="历史保存天数" prop="clearDay">
-            <el-input
-              v-model="deviceForm.clearDay"
-              placeholder="请输入历史数据保存天数"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
-          <el-form-item label="组织名称" prop="deptName">
-            <el-select
-              v-model="deviceForm.deptName"
-              placeholder="请选择关联组织名称"
-              clearable
-            >
-              <el-option
-                v-for="item in deptNameList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
-export default {
-  name: 'DialogSysTenant',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情',
-        makeDep: '项目绑定组织'
-      },
-      // 组织关系列表
-      deptNameList: [
-        {
-          name: '组织名称一',
-          value: '0'
-        },
-        {
-          name: '组织名称二',
-          value: '1'
-        },
-        {
-          name: '组织名称三',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      },
-      // 表单校验规则
-      rules: {
-        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
-        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
-        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
-        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
-        this.deviceForm = {
-          tenantCode: row.tenantCode,
-          tenantName: row.tenantName,
-          linkPerson: row.linkPerson,
-          tel: row.tel,
-          clearDay: row.clearDay,
-          deptName: row.deptName
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      } else if (this.dialogStatus === 'makeDep') {
-        this.makeDept()
-      }
-    },
-    // 绑定组织关系
-    makeDept() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          deptTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('绑定成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addTenantSys(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
new file mode 100644
index 0000000..13e311c
--- /dev/null
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -0,0 +1,273 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系人电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearDay">
+            <el-input
+              v-model="deviceForm.clearDay"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <el-select
+              v-model="deviceForm.deptName"
+              placeholder="请选择关联组织名称"
+              clearable
+            >
+              <el-option
+                v-for="item in deptNameList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
+export default {
+  name: 'EditSysTenant',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情',
+        makeDep: '项目绑定组织'
+      },
+      // 组织关系列表
+      deptNameList: [
+        {
+          name: '组织名称一',
+          value: '0'
+        },
+        {
+          name: '组织名称二',
+          value: '1'
+        },
+        {
+          name: '组织名称三',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      },
+      // 表单校验规则
+      rules: {
+        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
+        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
+        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
+        this.deviceForm = {
+          tenantCode: row.tenantCode,
+          tenantName: row.tenantName,
+          linkPerson: row.linkPerson,
+          tel: row.tel,
+          clearDay: row.clearDay,
+          deptName: row.deptName
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      } else if (this.dialogStatus === 'makeDep') {
+        this.makeDept()
+      }
+    },
+    // 绑定组织关系
+    makeDept() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          deptTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addTenantSys(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
new file mode 100644
index 0000000..408328c
--- /dev/null
+++ b/src/views/system/tenant/tenantList.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="140" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/system/tenant/components/editTenant'
+import { tenantSysList, delTenantSys } from '@/api/system/tenant'
+
+export default {
+  name: 'TenantList',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '项目编码',
+          value: 'tenantCode',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '项目联系人',
+          value: 'linkPerson',
+          align: 'center'
+        },
+        {
+          text: '联系人电话',
+          value: 'tel',
+          align: 'center'
+        },
+        {
+          text: '历史数据保存天数',
+          value: 'clearDay',
+          align: 'center'
+        },
+        {
+          text: '关联组织',
+          value: 'deptId',
+          align: 'center'
+        },
+        {
+          text: '关联组织名称',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      tenantSysList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delTenantSys(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    },
+    // 绑定组织
+    makeDep(row) {
+      this.$refs.editAlarmContent.initDialog('makeDep', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantSystList.vue b/src/views/system/tenant/tenantSystList.vue
deleted file mode 100644
index 61149b2..0000000
--- a/src/views/system/tenant/tenantSystList.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="140" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" size="small" @click="makeDep(scope.row)">
-              组织
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/system/tenant/components/dialogSysTenant'
-import { tenantSysList, delTenantSys } from '@/api/system/tenant'
-
-export default {
-  name: 'TenantSystList',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '项目编码',
-          value: 'tenantCode',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '项目联系人',
-          value: 'linkPerson',
-          align: 'center'
-        },
-        {
-          text: '联系人电话',
-          value: 'tel',
-          align: 'center'
-        },
-        {
-          text: '历史数据保存天数',
-          value: 'clearDay',
-          align: 'center'
-        },
-        {
-          text: '关联组织',
-          value: 'deptId',
-          align: 'center'
-        },
-        {
-          text: '关联组织名称',
-          value: 'deptName',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      tenantSysList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delTenantSys(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    },
-    // 绑定组织
-    makeDep(row) {
-      this.$refs.dialogAlarmContent.initDialog('makeDep', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
deleted file mode 100644
index 0ea149c..0000000
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
-              clearable
-              placeholder="请输入告警内容"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警类型" prop="alarmType">
-            <el-select
-              v-model="deviceForm.alarmType"
-              placeholder="告警类型"
-              clearable
-            >
-              <el-option
-                v-for="item in alarmTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
-export default {
-  name: 'DialogAlarmContent',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
-        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        console.log(row)
-        this.deviceForm = {
-          alarmType: row.alarmType,
-          alarmContent: row.alarmContent,
-          devcode: row.id,
-          deviceType: row.deviceType.split(',')
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/editAlarmContent.vue b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
new file mode 100644
index 0000000..96e56f2
--- /dev/null
+++ b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
+              clearable
+              placeholder="请输入告警内容"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警类型" prop="alarmType">
+            <el-select
+              v-model="deviceForm.alarmType"
+              placeholder="告警类型"
+              clearable
+            >
+              <el-option
+                v-for="item in alarmTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              clearable
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
+export default {
+  name: 'EditAlarmContent',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
+        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        console.log(row)
+        this.deviceForm = {
+          alarmType: row.alarmType,
+          alarmContent: row.alarmContent,
+          devcode: row.id,
+          deviceType: row.deviceType.split(',')
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index f203f26..b7d9dab 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -73,17 +73,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import dialogAlarmContent from '@/views/systemConfig/alarmContent/components/dialogAlarmContent'
+import editAlarmContent from '@/views/systemConfig/alarmContent/components/editAlarmContent'
 import { getDevice, alarmContentList, delAlarmContent } from '@/api/systemConfig/alarmContent'
 
 export default {
   name: 'ListContent',
-  components: { dialogAlarmContent },
+  components: { editAlarmContent },
   data() {
     return {
       // 查询条件
@@ -183,11 +183,11 @@
     },
     // 新增
     add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
+      this.$refs.editAlarmContent.initDialog('create')
     },
     // 修改
     edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
+      this.$refs.editAlarmContent.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
deleted file mode 100644
index bfb0c1d..0000000
--- a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.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-col>
-        <el-col :span="12">
-          <el-form-item label="监测指标" prop="name">
-            <el-input
-              v-model="deviceForm.name"
-              clearable
-              placeholder="请输入监测指标名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="开启报警" prop="openAlarm">
-            <el-select
-              v-model="deviceForm.openAlarm"
-              placeholder="请选择是否开启报警"
-              clearable
-            >
-              <el-option
-                v-for="item in openAlarmList"
-                :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="openJob">
-            <el-select
-              v-model="deviceForm.openJob"
-              placeholder="请选择是否开启工单"
-              clearable
-            >
-              <el-option
-                v-for="item in openJobList"
-                :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="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入告警上限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入告警下限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="level">
-            <el-select
-              v-model="deviceForm.level"
-              placeholder="请选择报警等级"
-              clearable
-            >
-              <el-option
-                v-for="item in levelList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
-export default {
-  name: 'DialogAlarmLevel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: '', // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否开启报警
-      openAlarmList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 是否开启工单
-      openJobList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 报警等级
-      levelList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        },
-        {
-          name: '三级报警',
-          value: '3'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: '',
-        name: '',
-        openAlarm: '',
-        openJob: '',
-        level: '',
-        lowValue: '',
-        highValue: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
-        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
-        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
-        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
-        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmLevel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/system/tenant/components/dialogSysTenant.vue b/src/views/system/tenant/components/dialogSysTenant.vue
deleted file mode 100644
index 0b2d1c1..0000000
--- a/src/views/system/tenant/components/dialogSysTenant.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系人电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="历史保存天数" prop="clearDay">
-            <el-input
-              v-model="deviceForm.clearDay"
-              placeholder="请输入历史数据保存天数"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
-          <el-form-item label="组织名称" prop="deptName">
-            <el-select
-              v-model="deviceForm.deptName"
-              placeholder="请选择关联组织名称"
-              clearable
-            >
-              <el-option
-                v-for="item in deptNameList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
-export default {
-  name: 'DialogSysTenant',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情',
-        makeDep: '项目绑定组织'
-      },
-      // 组织关系列表
-      deptNameList: [
-        {
-          name: '组织名称一',
-          value: '0'
-        },
-        {
-          name: '组织名称二',
-          value: '1'
-        },
-        {
-          name: '组织名称三',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      },
-      // 表单校验规则
-      rules: {
-        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
-        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
-        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
-        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
-        this.deviceForm = {
-          tenantCode: row.tenantCode,
-          tenantName: row.tenantName,
-          linkPerson: row.linkPerson,
-          tel: row.tel,
-          clearDay: row.clearDay,
-          deptName: row.deptName
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      } else if (this.dialogStatus === 'makeDep') {
-        this.makeDept()
-      }
-    },
-    // 绑定组织关系
-    makeDept() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          deptTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('绑定成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addTenantSys(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
new file mode 100644
index 0000000..13e311c
--- /dev/null
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -0,0 +1,273 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系人电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearDay">
+            <el-input
+              v-model="deviceForm.clearDay"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <el-select
+              v-model="deviceForm.deptName"
+              placeholder="请选择关联组织名称"
+              clearable
+            >
+              <el-option
+                v-for="item in deptNameList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
+export default {
+  name: 'EditSysTenant',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情',
+        makeDep: '项目绑定组织'
+      },
+      // 组织关系列表
+      deptNameList: [
+        {
+          name: '组织名称一',
+          value: '0'
+        },
+        {
+          name: '组织名称二',
+          value: '1'
+        },
+        {
+          name: '组织名称三',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      },
+      // 表单校验规则
+      rules: {
+        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
+        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
+        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
+        this.deviceForm = {
+          tenantCode: row.tenantCode,
+          tenantName: row.tenantName,
+          linkPerson: row.linkPerson,
+          tel: row.tel,
+          clearDay: row.clearDay,
+          deptName: row.deptName
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      } else if (this.dialogStatus === 'makeDep') {
+        this.makeDept()
+      }
+    },
+    // 绑定组织关系
+    makeDept() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          deptTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addTenantSys(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
new file mode 100644
index 0000000..408328c
--- /dev/null
+++ b/src/views/system/tenant/tenantList.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="140" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/system/tenant/components/editTenant'
+import { tenantSysList, delTenantSys } from '@/api/system/tenant'
+
+export default {
+  name: 'TenantList',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '项目编码',
+          value: 'tenantCode',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '项目联系人',
+          value: 'linkPerson',
+          align: 'center'
+        },
+        {
+          text: '联系人电话',
+          value: 'tel',
+          align: 'center'
+        },
+        {
+          text: '历史数据保存天数',
+          value: 'clearDay',
+          align: 'center'
+        },
+        {
+          text: '关联组织',
+          value: 'deptId',
+          align: 'center'
+        },
+        {
+          text: '关联组织名称',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      tenantSysList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delTenantSys(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    },
+    // 绑定组织
+    makeDep(row) {
+      this.$refs.editAlarmContent.initDialog('makeDep', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantSystList.vue b/src/views/system/tenant/tenantSystList.vue
deleted file mode 100644
index 61149b2..0000000
--- a/src/views/system/tenant/tenantSystList.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="140" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" size="small" @click="makeDep(scope.row)">
-              组织
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/system/tenant/components/dialogSysTenant'
-import { tenantSysList, delTenantSys } from '@/api/system/tenant'
-
-export default {
-  name: 'TenantSystList',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '项目编码',
-          value: 'tenantCode',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '项目联系人',
-          value: 'linkPerson',
-          align: 'center'
-        },
-        {
-          text: '联系人电话',
-          value: 'tel',
-          align: 'center'
-        },
-        {
-          text: '历史数据保存天数',
-          value: 'clearDay',
-          align: 'center'
-        },
-        {
-          text: '关联组织',
-          value: 'deptId',
-          align: 'center'
-        },
-        {
-          text: '关联组织名称',
-          value: 'deptName',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      tenantSysList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delTenantSys(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    },
-    // 绑定组织
-    makeDep(row) {
-      this.$refs.dialogAlarmContent.initDialog('makeDep', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
deleted file mode 100644
index 0ea149c..0000000
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
-              clearable
-              placeholder="请输入告警内容"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警类型" prop="alarmType">
-            <el-select
-              v-model="deviceForm.alarmType"
-              placeholder="告警类型"
-              clearable
-            >
-              <el-option
-                v-for="item in alarmTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
-export default {
-  name: 'DialogAlarmContent',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
-        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        console.log(row)
-        this.deviceForm = {
-          alarmType: row.alarmType,
-          alarmContent: row.alarmContent,
-          devcode: row.id,
-          deviceType: row.deviceType.split(',')
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/editAlarmContent.vue b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
new file mode 100644
index 0000000..96e56f2
--- /dev/null
+++ b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
+              clearable
+              placeholder="请输入告警内容"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警类型" prop="alarmType">
+            <el-select
+              v-model="deviceForm.alarmType"
+              placeholder="告警类型"
+              clearable
+            >
+              <el-option
+                v-for="item in alarmTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              clearable
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
+export default {
+  name: 'EditAlarmContent',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
+        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        console.log(row)
+        this.deviceForm = {
+          alarmType: row.alarmType,
+          alarmContent: row.alarmContent,
+          devcode: row.id,
+          deviceType: row.deviceType.split(',')
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index f203f26..b7d9dab 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -73,17 +73,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import dialogAlarmContent from '@/views/systemConfig/alarmContent/components/dialogAlarmContent'
+import editAlarmContent from '@/views/systemConfig/alarmContent/components/editAlarmContent'
 import { getDevice, alarmContentList, delAlarmContent } from '@/api/systemConfig/alarmContent'
 
 export default {
   name: 'ListContent',
-  components: { dialogAlarmContent },
+  components: { editAlarmContent },
   data() {
     return {
       // 查询条件
@@ -183,11 +183,11 @@
     },
     // 新增
     add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
+      this.$refs.editAlarmContent.initDialog('create')
     },
     // 修改
     edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
+      this.$refs.editAlarmContent.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
deleted file mode 100644
index bfb0c1d..0000000
--- a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.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-col>
-        <el-col :span="12">
-          <el-form-item label="监测指标" prop="name">
-            <el-input
-              v-model="deviceForm.name"
-              clearable
-              placeholder="请输入监测指标名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="开启报警" prop="openAlarm">
-            <el-select
-              v-model="deviceForm.openAlarm"
-              placeholder="请选择是否开启报警"
-              clearable
-            >
-              <el-option
-                v-for="item in openAlarmList"
-                :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="openJob">
-            <el-select
-              v-model="deviceForm.openJob"
-              placeholder="请选择是否开启工单"
-              clearable
-            >
-              <el-option
-                v-for="item in openJobList"
-                :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="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入告警上限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入告警下限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="level">
-            <el-select
-              v-model="deviceForm.level"
-              placeholder="请选择报警等级"
-              clearable
-            >
-              <el-option
-                v-for="item in levelList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
-export default {
-  name: 'DialogAlarmLevel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: '', // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否开启报警
-      openAlarmList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 是否开启工单
-      openJobList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 报警等级
-      levelList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        },
-        {
-          name: '三级报警',
-          value: '3'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: '',
-        name: '',
-        openAlarm: '',
-        openJob: '',
-        level: '',
-        lowValue: '',
-        highValue: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
-        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
-        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
-        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
-        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmLevel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
new file mode 100644
index 0000000..4db04c2
--- /dev/null
+++ b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
@@ -0,0 +1,281 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.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-col>
+        <el-col :span="12">
+          <el-form-item label="监测指标" prop="name">
+            <el-input
+              v-model="deviceForm.name"
+              clearable
+              placeholder="请输入监测指标名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="开启报警" prop="openAlarm">
+            <el-select
+              v-model="deviceForm.openAlarm"
+              placeholder="请选择是否开启报警"
+              clearable
+            >
+              <el-option
+                v-for="item in openAlarmList"
+                :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="openJob">
+            <el-select
+              v-model="deviceForm.openJob"
+              placeholder="请选择是否开启工单"
+              clearable
+            >
+              <el-option
+                v-for="item in openJobList"
+                :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="highValue">
+            <el-input
+              v-model="deviceForm.highValue"
+              placeholder="请输入告警上限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警下限" prop="lowValue">
+            <el-input
+              v-model="deviceForm.lowValue"
+              placeholder="请输入告警下限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警等级" prop="level">
+            <el-select
+              v-model="deviceForm.level"
+              placeholder="请选择报警等级"
+              clearable
+            >
+              <el-option
+                v-for="item in levelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
+export default {
+  name: 'EditAlarmLevel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: '', // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否开启报警
+      openAlarmList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 是否开启工单
+      openJobList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 报警等级
+      levelList: [
+        {
+          name: '一级报警',
+          value: '1'
+        },
+        {
+          name: '二级报警',
+          value: '2'
+        },
+        {
+          name: '三级报警',
+          value: '3'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: '',
+        name: '',
+        openAlarm: '',
+        openJob: '',
+        level: '',
+        lowValue: '',
+        highValue: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
+        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
+        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
+        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
+        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
+        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmLevel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/system/tenant/components/dialogSysTenant.vue b/src/views/system/tenant/components/dialogSysTenant.vue
deleted file mode 100644
index 0b2d1c1..0000000
--- a/src/views/system/tenant/components/dialogSysTenant.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系人电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="历史保存天数" prop="clearDay">
-            <el-input
-              v-model="deviceForm.clearDay"
-              placeholder="请输入历史数据保存天数"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
-          <el-form-item label="组织名称" prop="deptName">
-            <el-select
-              v-model="deviceForm.deptName"
-              placeholder="请选择关联组织名称"
-              clearable
-            >
-              <el-option
-                v-for="item in deptNameList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
-export default {
-  name: 'DialogSysTenant',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情',
-        makeDep: '项目绑定组织'
-      },
-      // 组织关系列表
-      deptNameList: [
-        {
-          name: '组织名称一',
-          value: '0'
-        },
-        {
-          name: '组织名称二',
-          value: '1'
-        },
-        {
-          name: '组织名称三',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      },
-      // 表单校验规则
-      rules: {
-        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
-        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
-        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
-        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
-        this.deviceForm = {
-          tenantCode: row.tenantCode,
-          tenantName: row.tenantName,
-          linkPerson: row.linkPerson,
-          tel: row.tel,
-          clearDay: row.clearDay,
-          deptName: row.deptName
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      } else if (this.dialogStatus === 'makeDep') {
-        this.makeDept()
-      }
-    },
-    // 绑定组织关系
-    makeDept() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          deptTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('绑定成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addTenantSys(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
new file mode 100644
index 0000000..13e311c
--- /dev/null
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -0,0 +1,273 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系人电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearDay">
+            <el-input
+              v-model="deviceForm.clearDay"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <el-select
+              v-model="deviceForm.deptName"
+              placeholder="请选择关联组织名称"
+              clearable
+            >
+              <el-option
+                v-for="item in deptNameList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
+export default {
+  name: 'EditSysTenant',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情',
+        makeDep: '项目绑定组织'
+      },
+      // 组织关系列表
+      deptNameList: [
+        {
+          name: '组织名称一',
+          value: '0'
+        },
+        {
+          name: '组织名称二',
+          value: '1'
+        },
+        {
+          name: '组织名称三',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      },
+      // 表单校验规则
+      rules: {
+        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
+        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
+        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
+        this.deviceForm = {
+          tenantCode: row.tenantCode,
+          tenantName: row.tenantName,
+          linkPerson: row.linkPerson,
+          tel: row.tel,
+          clearDay: row.clearDay,
+          deptName: row.deptName
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      } else if (this.dialogStatus === 'makeDep') {
+        this.makeDept()
+      }
+    },
+    // 绑定组织关系
+    makeDept() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          deptTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addTenantSys(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
new file mode 100644
index 0000000..408328c
--- /dev/null
+++ b/src/views/system/tenant/tenantList.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="140" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/system/tenant/components/editTenant'
+import { tenantSysList, delTenantSys } from '@/api/system/tenant'
+
+export default {
+  name: 'TenantList',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '项目编码',
+          value: 'tenantCode',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '项目联系人',
+          value: 'linkPerson',
+          align: 'center'
+        },
+        {
+          text: '联系人电话',
+          value: 'tel',
+          align: 'center'
+        },
+        {
+          text: '历史数据保存天数',
+          value: 'clearDay',
+          align: 'center'
+        },
+        {
+          text: '关联组织',
+          value: 'deptId',
+          align: 'center'
+        },
+        {
+          text: '关联组织名称',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      tenantSysList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delTenantSys(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    },
+    // 绑定组织
+    makeDep(row) {
+      this.$refs.editAlarmContent.initDialog('makeDep', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantSystList.vue b/src/views/system/tenant/tenantSystList.vue
deleted file mode 100644
index 61149b2..0000000
--- a/src/views/system/tenant/tenantSystList.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="140" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" size="small" @click="makeDep(scope.row)">
-              组织
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/system/tenant/components/dialogSysTenant'
-import { tenantSysList, delTenantSys } from '@/api/system/tenant'
-
-export default {
-  name: 'TenantSystList',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '项目编码',
-          value: 'tenantCode',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '项目联系人',
-          value: 'linkPerson',
-          align: 'center'
-        },
-        {
-          text: '联系人电话',
-          value: 'tel',
-          align: 'center'
-        },
-        {
-          text: '历史数据保存天数',
-          value: 'clearDay',
-          align: 'center'
-        },
-        {
-          text: '关联组织',
-          value: 'deptId',
-          align: 'center'
-        },
-        {
-          text: '关联组织名称',
-          value: 'deptName',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      tenantSysList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delTenantSys(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    },
-    // 绑定组织
-    makeDep(row) {
-      this.$refs.dialogAlarmContent.initDialog('makeDep', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
deleted file mode 100644
index 0ea149c..0000000
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
-              clearable
-              placeholder="请输入告警内容"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警类型" prop="alarmType">
-            <el-select
-              v-model="deviceForm.alarmType"
-              placeholder="告警类型"
-              clearable
-            >
-              <el-option
-                v-for="item in alarmTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
-export default {
-  name: 'DialogAlarmContent',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
-        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        console.log(row)
-        this.deviceForm = {
-          alarmType: row.alarmType,
-          alarmContent: row.alarmContent,
-          devcode: row.id,
-          deviceType: row.deviceType.split(',')
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/editAlarmContent.vue b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
new file mode 100644
index 0000000..96e56f2
--- /dev/null
+++ b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
+              clearable
+              placeholder="请输入告警内容"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警类型" prop="alarmType">
+            <el-select
+              v-model="deviceForm.alarmType"
+              placeholder="告警类型"
+              clearable
+            >
+              <el-option
+                v-for="item in alarmTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              clearable
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
+export default {
+  name: 'EditAlarmContent',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
+        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        console.log(row)
+        this.deviceForm = {
+          alarmType: row.alarmType,
+          alarmContent: row.alarmContent,
+          devcode: row.id,
+          deviceType: row.deviceType.split(',')
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index f203f26..b7d9dab 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -73,17 +73,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import dialogAlarmContent from '@/views/systemConfig/alarmContent/components/dialogAlarmContent'
+import editAlarmContent from '@/views/systemConfig/alarmContent/components/editAlarmContent'
 import { getDevice, alarmContentList, delAlarmContent } from '@/api/systemConfig/alarmContent'
 
 export default {
   name: 'ListContent',
-  components: { dialogAlarmContent },
+  components: { editAlarmContent },
   data() {
     return {
       // 查询条件
@@ -183,11 +183,11 @@
     },
     // 新增
     add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
+      this.$refs.editAlarmContent.initDialog('create')
     },
     // 修改
     edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
+      this.$refs.editAlarmContent.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
deleted file mode 100644
index bfb0c1d..0000000
--- a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.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-col>
-        <el-col :span="12">
-          <el-form-item label="监测指标" prop="name">
-            <el-input
-              v-model="deviceForm.name"
-              clearable
-              placeholder="请输入监测指标名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="开启报警" prop="openAlarm">
-            <el-select
-              v-model="deviceForm.openAlarm"
-              placeholder="请选择是否开启报警"
-              clearable
-            >
-              <el-option
-                v-for="item in openAlarmList"
-                :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="openJob">
-            <el-select
-              v-model="deviceForm.openJob"
-              placeholder="请选择是否开启工单"
-              clearable
-            >
-              <el-option
-                v-for="item in openJobList"
-                :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="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入告警上限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入告警下限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="level">
-            <el-select
-              v-model="deviceForm.level"
-              placeholder="请选择报警等级"
-              clearable
-            >
-              <el-option
-                v-for="item in levelList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
-export default {
-  name: 'DialogAlarmLevel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: '', // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否开启报警
-      openAlarmList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 是否开启工单
-      openJobList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 报警等级
-      levelList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        },
-        {
-          name: '三级报警',
-          value: '3'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: '',
-        name: '',
-        openAlarm: '',
-        openJob: '',
-        level: '',
-        lowValue: '',
-        highValue: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
-        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
-        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
-        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
-        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmLevel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
new file mode 100644
index 0000000..4db04c2
--- /dev/null
+++ b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
@@ -0,0 +1,281 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.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-col>
+        <el-col :span="12">
+          <el-form-item label="监测指标" prop="name">
+            <el-input
+              v-model="deviceForm.name"
+              clearable
+              placeholder="请输入监测指标名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="开启报警" prop="openAlarm">
+            <el-select
+              v-model="deviceForm.openAlarm"
+              placeholder="请选择是否开启报警"
+              clearable
+            >
+              <el-option
+                v-for="item in openAlarmList"
+                :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="openJob">
+            <el-select
+              v-model="deviceForm.openJob"
+              placeholder="请选择是否开启工单"
+              clearable
+            >
+              <el-option
+                v-for="item in openJobList"
+                :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="highValue">
+            <el-input
+              v-model="deviceForm.highValue"
+              placeholder="请输入告警上限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警下限" prop="lowValue">
+            <el-input
+              v-model="deviceForm.lowValue"
+              placeholder="请输入告警下限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警等级" prop="level">
+            <el-select
+              v-model="deviceForm.level"
+              placeholder="请选择报警等级"
+              clearable
+            >
+              <el-option
+                v-for="item in levelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
+export default {
+  name: 'EditAlarmLevel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: '', // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否开启报警
+      openAlarmList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 是否开启工单
+      openJobList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 报警等级
+      levelList: [
+        {
+          name: '一级报警',
+          value: '1'
+        },
+        {
+          name: '二级报警',
+          value: '2'
+        },
+        {
+          name: '三级报警',
+          value: '3'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: '',
+        name: '',
+        openAlarm: '',
+        openJob: '',
+        level: '',
+        lowValue: '',
+        highValue: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
+        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
+        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
+        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
+        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
+        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmLevel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 193f00f..708efea 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -73,11 +73,11 @@
 import EditH2sLevel from './components/editH2sLevel'
 import EditHumiLevel from './components/editHumiLevel'
 import EditO2Level from './components/editO2Level'
-import dialogAlarmLevel from './components/dialogAlarmLevel'
+import editAlarmLevel from './components/editAlarmLevel'
 
 export default {
   name: 'ListLevel',
-  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, dialogAlarmLevel },
+  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, editAlarmLevel },
   data() {
     return {
       selectedTenant: {
@@ -181,7 +181,7 @@
     },
     // 新增
     add() {
-      this.cmpName = 'dialog-alarm-level'
+      this.cmpName = 'edit-alarm-level'
       setTimeout(() => {
         this.$refs.editdialog.initDialog('create')
       }, 100)

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/system/tenant/components/dialogSysTenant.vue b/src/views/system/tenant/components/dialogSysTenant.vue
deleted file mode 100644
index 0b2d1c1..0000000
--- a/src/views/system/tenant/components/dialogSysTenant.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系人电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="历史保存天数" prop="clearDay">
-            <el-input
-              v-model="deviceForm.clearDay"
-              placeholder="请输入历史数据保存天数"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
-          <el-form-item label="组织名称" prop="deptName">
-            <el-select
-              v-model="deviceForm.deptName"
-              placeholder="请选择关联组织名称"
-              clearable
-            >
-              <el-option
-                v-for="item in deptNameList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
-export default {
-  name: 'DialogSysTenant',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情',
-        makeDep: '项目绑定组织'
-      },
-      // 组织关系列表
-      deptNameList: [
-        {
-          name: '组织名称一',
-          value: '0'
-        },
-        {
-          name: '组织名称二',
-          value: '1'
-        },
-        {
-          name: '组织名称三',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      },
-      // 表单校验规则
-      rules: {
-        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
-        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
-        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
-        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
-        this.deviceForm = {
-          tenantCode: row.tenantCode,
-          tenantName: row.tenantName,
-          linkPerson: row.linkPerson,
-          tel: row.tel,
-          clearDay: row.clearDay,
-          deptName: row.deptName
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      } else if (this.dialogStatus === 'makeDep') {
-        this.makeDept()
-      }
-    },
-    // 绑定组织关系
-    makeDept() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          deptTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('绑定成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addTenantSys(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
new file mode 100644
index 0000000..13e311c
--- /dev/null
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -0,0 +1,273 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系人电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearDay">
+            <el-input
+              v-model="deviceForm.clearDay"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <el-select
+              v-model="deviceForm.deptName"
+              placeholder="请选择关联组织名称"
+              clearable
+            >
+              <el-option
+                v-for="item in deptNameList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
+export default {
+  name: 'EditSysTenant',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情',
+        makeDep: '项目绑定组织'
+      },
+      // 组织关系列表
+      deptNameList: [
+        {
+          name: '组织名称一',
+          value: '0'
+        },
+        {
+          name: '组织名称二',
+          value: '1'
+        },
+        {
+          name: '组织名称三',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      },
+      // 表单校验规则
+      rules: {
+        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
+        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
+        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
+        this.deviceForm = {
+          tenantCode: row.tenantCode,
+          tenantName: row.tenantName,
+          linkPerson: row.linkPerson,
+          tel: row.tel,
+          clearDay: row.clearDay,
+          deptName: row.deptName
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      } else if (this.dialogStatus === 'makeDep') {
+        this.makeDept()
+      }
+    },
+    // 绑定组织关系
+    makeDept() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          deptTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addTenantSys(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
new file mode 100644
index 0000000..408328c
--- /dev/null
+++ b/src/views/system/tenant/tenantList.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="140" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/system/tenant/components/editTenant'
+import { tenantSysList, delTenantSys } from '@/api/system/tenant'
+
+export default {
+  name: 'TenantList',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '项目编码',
+          value: 'tenantCode',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '项目联系人',
+          value: 'linkPerson',
+          align: 'center'
+        },
+        {
+          text: '联系人电话',
+          value: 'tel',
+          align: 'center'
+        },
+        {
+          text: '历史数据保存天数',
+          value: 'clearDay',
+          align: 'center'
+        },
+        {
+          text: '关联组织',
+          value: 'deptId',
+          align: 'center'
+        },
+        {
+          text: '关联组织名称',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      tenantSysList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delTenantSys(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    },
+    // 绑定组织
+    makeDep(row) {
+      this.$refs.editAlarmContent.initDialog('makeDep', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantSystList.vue b/src/views/system/tenant/tenantSystList.vue
deleted file mode 100644
index 61149b2..0000000
--- a/src/views/system/tenant/tenantSystList.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="140" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" size="small" @click="makeDep(scope.row)">
-              组织
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/system/tenant/components/dialogSysTenant'
-import { tenantSysList, delTenantSys } from '@/api/system/tenant'
-
-export default {
-  name: 'TenantSystList',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '项目编码',
-          value: 'tenantCode',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '项目联系人',
-          value: 'linkPerson',
-          align: 'center'
-        },
-        {
-          text: '联系人电话',
-          value: 'tel',
-          align: 'center'
-        },
-        {
-          text: '历史数据保存天数',
-          value: 'clearDay',
-          align: 'center'
-        },
-        {
-          text: '关联组织',
-          value: 'deptId',
-          align: 'center'
-        },
-        {
-          text: '关联组织名称',
-          value: 'deptName',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      tenantSysList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delTenantSys(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    },
-    // 绑定组织
-    makeDep(row) {
-      this.$refs.dialogAlarmContent.initDialog('makeDep', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
deleted file mode 100644
index 0ea149c..0000000
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
-              clearable
-              placeholder="请输入告警内容"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警类型" prop="alarmType">
-            <el-select
-              v-model="deviceForm.alarmType"
-              placeholder="告警类型"
-              clearable
-            >
-              <el-option
-                v-for="item in alarmTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
-export default {
-  name: 'DialogAlarmContent',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
-        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        console.log(row)
-        this.deviceForm = {
-          alarmType: row.alarmType,
-          alarmContent: row.alarmContent,
-          devcode: row.id,
-          deviceType: row.deviceType.split(',')
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/editAlarmContent.vue b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
new file mode 100644
index 0000000..96e56f2
--- /dev/null
+++ b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
+              clearable
+              placeholder="请输入告警内容"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警类型" prop="alarmType">
+            <el-select
+              v-model="deviceForm.alarmType"
+              placeholder="告警类型"
+              clearable
+            >
+              <el-option
+                v-for="item in alarmTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              clearable
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
+export default {
+  name: 'EditAlarmContent',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
+        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        console.log(row)
+        this.deviceForm = {
+          alarmType: row.alarmType,
+          alarmContent: row.alarmContent,
+          devcode: row.id,
+          deviceType: row.deviceType.split(',')
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index f203f26..b7d9dab 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -73,17 +73,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import dialogAlarmContent from '@/views/systemConfig/alarmContent/components/dialogAlarmContent'
+import editAlarmContent from '@/views/systemConfig/alarmContent/components/editAlarmContent'
 import { getDevice, alarmContentList, delAlarmContent } from '@/api/systemConfig/alarmContent'
 
 export default {
   name: 'ListContent',
-  components: { dialogAlarmContent },
+  components: { editAlarmContent },
   data() {
     return {
       // 查询条件
@@ -183,11 +183,11 @@
     },
     // 新增
     add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
+      this.$refs.editAlarmContent.initDialog('create')
     },
     // 修改
     edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
+      this.$refs.editAlarmContent.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
deleted file mode 100644
index bfb0c1d..0000000
--- a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.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-col>
-        <el-col :span="12">
-          <el-form-item label="监测指标" prop="name">
-            <el-input
-              v-model="deviceForm.name"
-              clearable
-              placeholder="请输入监测指标名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="开启报警" prop="openAlarm">
-            <el-select
-              v-model="deviceForm.openAlarm"
-              placeholder="请选择是否开启报警"
-              clearable
-            >
-              <el-option
-                v-for="item in openAlarmList"
-                :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="openJob">
-            <el-select
-              v-model="deviceForm.openJob"
-              placeholder="请选择是否开启工单"
-              clearable
-            >
-              <el-option
-                v-for="item in openJobList"
-                :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="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入告警上限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入告警下限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="level">
-            <el-select
-              v-model="deviceForm.level"
-              placeholder="请选择报警等级"
-              clearable
-            >
-              <el-option
-                v-for="item in levelList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
-export default {
-  name: 'DialogAlarmLevel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: '', // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否开启报警
-      openAlarmList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 是否开启工单
-      openJobList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 报警等级
-      levelList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        },
-        {
-          name: '三级报警',
-          value: '3'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: '',
-        name: '',
-        openAlarm: '',
-        openJob: '',
-        level: '',
-        lowValue: '',
-        highValue: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
-        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
-        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
-        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
-        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmLevel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
new file mode 100644
index 0000000..4db04c2
--- /dev/null
+++ b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
@@ -0,0 +1,281 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.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-col>
+        <el-col :span="12">
+          <el-form-item label="监测指标" prop="name">
+            <el-input
+              v-model="deviceForm.name"
+              clearable
+              placeholder="请输入监测指标名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="开启报警" prop="openAlarm">
+            <el-select
+              v-model="deviceForm.openAlarm"
+              placeholder="请选择是否开启报警"
+              clearable
+            >
+              <el-option
+                v-for="item in openAlarmList"
+                :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="openJob">
+            <el-select
+              v-model="deviceForm.openJob"
+              placeholder="请选择是否开启工单"
+              clearable
+            >
+              <el-option
+                v-for="item in openJobList"
+                :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="highValue">
+            <el-input
+              v-model="deviceForm.highValue"
+              placeholder="请输入告警上限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警下限" prop="lowValue">
+            <el-input
+              v-model="deviceForm.lowValue"
+              placeholder="请输入告警下限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警等级" prop="level">
+            <el-select
+              v-model="deviceForm.level"
+              placeholder="请选择报警等级"
+              clearable
+            >
+              <el-option
+                v-for="item in levelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
+export default {
+  name: 'EditAlarmLevel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: '', // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否开启报警
+      openAlarmList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 是否开启工单
+      openJobList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 报警等级
+      levelList: [
+        {
+          name: '一级报警',
+          value: '1'
+        },
+        {
+          name: '二级报警',
+          value: '2'
+        },
+        {
+          name: '三级报警',
+          value: '3'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: '',
+        name: '',
+        openAlarm: '',
+        openJob: '',
+        level: '',
+        lowValue: '',
+        highValue: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
+        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
+        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
+        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
+        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
+        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmLevel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 193f00f..708efea 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -73,11 +73,11 @@
 import EditH2sLevel from './components/editH2sLevel'
 import EditHumiLevel from './components/editHumiLevel'
 import EditO2Level from './components/editO2Level'
-import dialogAlarmLevel from './components/dialogAlarmLevel'
+import editAlarmLevel from './components/editAlarmLevel'
 
 export default {
   name: 'ListLevel',
-  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, dialogAlarmLevel },
+  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, editAlarmLevel },
   data() {
     return {
       selectedTenant: {
@@ -181,7 +181,7 @@
     },
     // 新增
     add() {
-      this.cmpName = 'dialog-alarm-level'
+      this.cmpName = 'edit-alarm-level'
       setTimeout(() => {
         this.$refs.editdialog.initDialog('create')
       }, 100)
diff --git a/src/views/systemConfig/deptPermission/components/dialogListDept.vue b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
deleted file mode 100644
index 5d75707..0000000
--- a/src/views/systemConfig/deptPermission/components/dialogListDept.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <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="wellType">
-            <el-select
-              v-model="deviceForm.wellType"
-              clearable
-              placeholder="请选择支持井类型"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in wellTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="lng">
-            <el-input
-              v-model="deviceForm.lng"
-              clearable
-              placeholder="请输入经度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="纬度" prop="lat">
-            <el-input
-              v-model="deviceForm.lat"
-              clearable
-              placeholder="请输入纬度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="组织id" prop="deptid">
-            <el-input
-              v-model="deviceForm.deptid"
-              clearable
-              disabled
-              placeholder="请输入组织id"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
-export default {
-  name: 'DialogListDept',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 支持井类型
-      wellTypeList: [
-        {
-          label: '井类型一',
-          value: '1'
-        },
-        {
-          label: '井类型二',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      },
-      // 表单校验规则
-      rules: {
-        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
-        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDept(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDept(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/system/tenant/components/dialogSysTenant.vue b/src/views/system/tenant/components/dialogSysTenant.vue
deleted file mode 100644
index 0b2d1c1..0000000
--- a/src/views/system/tenant/components/dialogSysTenant.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系人电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="历史保存天数" prop="clearDay">
-            <el-input
-              v-model="deviceForm.clearDay"
-              placeholder="请输入历史数据保存天数"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
-          <el-form-item label="组织名称" prop="deptName">
-            <el-select
-              v-model="deviceForm.deptName"
-              placeholder="请选择关联组织名称"
-              clearable
-            >
-              <el-option
-                v-for="item in deptNameList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
-export default {
-  name: 'DialogSysTenant',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情',
-        makeDep: '项目绑定组织'
-      },
-      // 组织关系列表
-      deptNameList: [
-        {
-          name: '组织名称一',
-          value: '0'
-        },
-        {
-          name: '组织名称二',
-          value: '1'
-        },
-        {
-          name: '组织名称三',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      },
-      // 表单校验规则
-      rules: {
-        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
-        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
-        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
-        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
-        this.deviceForm = {
-          tenantCode: row.tenantCode,
-          tenantName: row.tenantName,
-          linkPerson: row.linkPerson,
-          tel: row.tel,
-          clearDay: row.clearDay,
-          deptName: row.deptName
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      } else if (this.dialogStatus === 'makeDep') {
-        this.makeDept()
-      }
-    },
-    // 绑定组织关系
-    makeDept() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          deptTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('绑定成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addTenantSys(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
new file mode 100644
index 0000000..13e311c
--- /dev/null
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -0,0 +1,273 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系人电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearDay">
+            <el-input
+              v-model="deviceForm.clearDay"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <el-select
+              v-model="deviceForm.deptName"
+              placeholder="请选择关联组织名称"
+              clearable
+            >
+              <el-option
+                v-for="item in deptNameList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
+export default {
+  name: 'EditSysTenant',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情',
+        makeDep: '项目绑定组织'
+      },
+      // 组织关系列表
+      deptNameList: [
+        {
+          name: '组织名称一',
+          value: '0'
+        },
+        {
+          name: '组织名称二',
+          value: '1'
+        },
+        {
+          name: '组织名称三',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      },
+      // 表单校验规则
+      rules: {
+        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
+        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
+        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
+        this.deviceForm = {
+          tenantCode: row.tenantCode,
+          tenantName: row.tenantName,
+          linkPerson: row.linkPerson,
+          tel: row.tel,
+          clearDay: row.clearDay,
+          deptName: row.deptName
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      } else if (this.dialogStatus === 'makeDep') {
+        this.makeDept()
+      }
+    },
+    // 绑定组织关系
+    makeDept() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          deptTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addTenantSys(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
new file mode 100644
index 0000000..408328c
--- /dev/null
+++ b/src/views/system/tenant/tenantList.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="140" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/system/tenant/components/editTenant'
+import { tenantSysList, delTenantSys } from '@/api/system/tenant'
+
+export default {
+  name: 'TenantList',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '项目编码',
+          value: 'tenantCode',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '项目联系人',
+          value: 'linkPerson',
+          align: 'center'
+        },
+        {
+          text: '联系人电话',
+          value: 'tel',
+          align: 'center'
+        },
+        {
+          text: '历史数据保存天数',
+          value: 'clearDay',
+          align: 'center'
+        },
+        {
+          text: '关联组织',
+          value: 'deptId',
+          align: 'center'
+        },
+        {
+          text: '关联组织名称',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      tenantSysList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delTenantSys(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    },
+    // 绑定组织
+    makeDep(row) {
+      this.$refs.editAlarmContent.initDialog('makeDep', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantSystList.vue b/src/views/system/tenant/tenantSystList.vue
deleted file mode 100644
index 61149b2..0000000
--- a/src/views/system/tenant/tenantSystList.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="140" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" size="small" @click="makeDep(scope.row)">
-              组织
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/system/tenant/components/dialogSysTenant'
-import { tenantSysList, delTenantSys } from '@/api/system/tenant'
-
-export default {
-  name: 'TenantSystList',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '项目编码',
-          value: 'tenantCode',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '项目联系人',
-          value: 'linkPerson',
-          align: 'center'
-        },
-        {
-          text: '联系人电话',
-          value: 'tel',
-          align: 'center'
-        },
-        {
-          text: '历史数据保存天数',
-          value: 'clearDay',
-          align: 'center'
-        },
-        {
-          text: '关联组织',
-          value: 'deptId',
-          align: 'center'
-        },
-        {
-          text: '关联组织名称',
-          value: 'deptName',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      tenantSysList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delTenantSys(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    },
-    // 绑定组织
-    makeDep(row) {
-      this.$refs.dialogAlarmContent.initDialog('makeDep', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
deleted file mode 100644
index 0ea149c..0000000
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
-              clearable
-              placeholder="请输入告警内容"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警类型" prop="alarmType">
-            <el-select
-              v-model="deviceForm.alarmType"
-              placeholder="告警类型"
-              clearable
-            >
-              <el-option
-                v-for="item in alarmTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
-export default {
-  name: 'DialogAlarmContent',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
-        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        console.log(row)
-        this.deviceForm = {
-          alarmType: row.alarmType,
-          alarmContent: row.alarmContent,
-          devcode: row.id,
-          deviceType: row.deviceType.split(',')
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/editAlarmContent.vue b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
new file mode 100644
index 0000000..96e56f2
--- /dev/null
+++ b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
+              clearable
+              placeholder="请输入告警内容"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警类型" prop="alarmType">
+            <el-select
+              v-model="deviceForm.alarmType"
+              placeholder="告警类型"
+              clearable
+            >
+              <el-option
+                v-for="item in alarmTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              clearable
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
+export default {
+  name: 'EditAlarmContent',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
+        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        console.log(row)
+        this.deviceForm = {
+          alarmType: row.alarmType,
+          alarmContent: row.alarmContent,
+          devcode: row.id,
+          deviceType: row.deviceType.split(',')
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index f203f26..b7d9dab 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -73,17 +73,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import dialogAlarmContent from '@/views/systemConfig/alarmContent/components/dialogAlarmContent'
+import editAlarmContent from '@/views/systemConfig/alarmContent/components/editAlarmContent'
 import { getDevice, alarmContentList, delAlarmContent } from '@/api/systemConfig/alarmContent'
 
 export default {
   name: 'ListContent',
-  components: { dialogAlarmContent },
+  components: { editAlarmContent },
   data() {
     return {
       // 查询条件
@@ -183,11 +183,11 @@
     },
     // 新增
     add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
+      this.$refs.editAlarmContent.initDialog('create')
     },
     // 修改
     edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
+      this.$refs.editAlarmContent.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
deleted file mode 100644
index bfb0c1d..0000000
--- a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.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-col>
-        <el-col :span="12">
-          <el-form-item label="监测指标" prop="name">
-            <el-input
-              v-model="deviceForm.name"
-              clearable
-              placeholder="请输入监测指标名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="开启报警" prop="openAlarm">
-            <el-select
-              v-model="deviceForm.openAlarm"
-              placeholder="请选择是否开启报警"
-              clearable
-            >
-              <el-option
-                v-for="item in openAlarmList"
-                :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="openJob">
-            <el-select
-              v-model="deviceForm.openJob"
-              placeholder="请选择是否开启工单"
-              clearable
-            >
-              <el-option
-                v-for="item in openJobList"
-                :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="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入告警上限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入告警下限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="level">
-            <el-select
-              v-model="deviceForm.level"
-              placeholder="请选择报警等级"
-              clearable
-            >
-              <el-option
-                v-for="item in levelList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
-export default {
-  name: 'DialogAlarmLevel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: '', // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否开启报警
-      openAlarmList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 是否开启工单
-      openJobList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 报警等级
-      levelList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        },
-        {
-          name: '三级报警',
-          value: '3'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: '',
-        name: '',
-        openAlarm: '',
-        openJob: '',
-        level: '',
-        lowValue: '',
-        highValue: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
-        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
-        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
-        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
-        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmLevel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
new file mode 100644
index 0000000..4db04c2
--- /dev/null
+++ b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
@@ -0,0 +1,281 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.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-col>
+        <el-col :span="12">
+          <el-form-item label="监测指标" prop="name">
+            <el-input
+              v-model="deviceForm.name"
+              clearable
+              placeholder="请输入监测指标名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="开启报警" prop="openAlarm">
+            <el-select
+              v-model="deviceForm.openAlarm"
+              placeholder="请选择是否开启报警"
+              clearable
+            >
+              <el-option
+                v-for="item in openAlarmList"
+                :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="openJob">
+            <el-select
+              v-model="deviceForm.openJob"
+              placeholder="请选择是否开启工单"
+              clearable
+            >
+              <el-option
+                v-for="item in openJobList"
+                :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="highValue">
+            <el-input
+              v-model="deviceForm.highValue"
+              placeholder="请输入告警上限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警下限" prop="lowValue">
+            <el-input
+              v-model="deviceForm.lowValue"
+              placeholder="请输入告警下限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警等级" prop="level">
+            <el-select
+              v-model="deviceForm.level"
+              placeholder="请选择报警等级"
+              clearable
+            >
+              <el-option
+                v-for="item in levelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
+export default {
+  name: 'EditAlarmLevel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: '', // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否开启报警
+      openAlarmList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 是否开启工单
+      openJobList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 报警等级
+      levelList: [
+        {
+          name: '一级报警',
+          value: '1'
+        },
+        {
+          name: '二级报警',
+          value: '2'
+        },
+        {
+          name: '三级报警',
+          value: '3'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: '',
+        name: '',
+        openAlarm: '',
+        openJob: '',
+        level: '',
+        lowValue: '',
+        highValue: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
+        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
+        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
+        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
+        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
+        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmLevel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 193f00f..708efea 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -73,11 +73,11 @@
 import EditH2sLevel from './components/editH2sLevel'
 import EditHumiLevel from './components/editHumiLevel'
 import EditO2Level from './components/editO2Level'
-import dialogAlarmLevel from './components/dialogAlarmLevel'
+import editAlarmLevel from './components/editAlarmLevel'
 
 export default {
   name: 'ListLevel',
-  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, dialogAlarmLevel },
+  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, editAlarmLevel },
   data() {
     return {
       selectedTenant: {
@@ -181,7 +181,7 @@
     },
     // 新增
     add() {
-      this.cmpName = 'dialog-alarm-level'
+      this.cmpName = 'edit-alarm-level'
       setTimeout(() => {
         this.$refs.editdialog.initDialog('create')
       }, 100)
diff --git a/src/views/systemConfig/deptPermission/components/dialogListDept.vue b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
deleted file mode 100644
index 5d75707..0000000
--- a/src/views/systemConfig/deptPermission/components/dialogListDept.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <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="wellType">
-            <el-select
-              v-model="deviceForm.wellType"
-              clearable
-              placeholder="请选择支持井类型"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in wellTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="lng">
-            <el-input
-              v-model="deviceForm.lng"
-              clearable
-              placeholder="请输入经度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="纬度" prop="lat">
-            <el-input
-              v-model="deviceForm.lat"
-              clearable
-              placeholder="请输入纬度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="组织id" prop="deptid">
-            <el-input
-              v-model="deviceForm.deptid"
-              clearable
-              disabled
-              placeholder="请输入组织id"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
-export default {
-  name: 'DialogListDept',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 支持井类型
-      wellTypeList: [
-        {
-          label: '井类型一',
-          value: '1'
-        },
-        {
-          label: '井类型二',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      },
-      // 表单校验规则
-      rules: {
-        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
-        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDept(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDept(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
new file mode 100644
index 0000000..429076f
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <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="wellType">
+            <el-select
+              v-model="deviceForm.wellType"
+              clearable
+              placeholder="请选择支持井类型"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in wellTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="lng">
+            <el-input
+              v-model="deviceForm.lng"
+              clearable
+              placeholder="请输入经度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="纬度" prop="lat">
+            <el-input
+              v-model="deviceForm.lat"
+              clearable
+              placeholder="请输入纬度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="组织id" prop="deptid">
+            <el-input
+              v-model="deviceForm.deptid"
+              clearable
+              disabled
+              placeholder="请输入组织id"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
+export default {
+  name: 'EditDeptPermission',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 支持井类型
+      wellTypeList: [
+        {
+          label: '井类型一',
+          value: '1'
+        },
+        {
+          label: '井类型二',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      },
+      // 表单校验规则
+      rules: {
+        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
+        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDept(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDept(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/system/tenant/components/dialogSysTenant.vue b/src/views/system/tenant/components/dialogSysTenant.vue
deleted file mode 100644
index 0b2d1c1..0000000
--- a/src/views/system/tenant/components/dialogSysTenant.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系人电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="历史保存天数" prop="clearDay">
-            <el-input
-              v-model="deviceForm.clearDay"
-              placeholder="请输入历史数据保存天数"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
-          <el-form-item label="组织名称" prop="deptName">
-            <el-select
-              v-model="deviceForm.deptName"
-              placeholder="请选择关联组织名称"
-              clearable
-            >
-              <el-option
-                v-for="item in deptNameList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
-export default {
-  name: 'DialogSysTenant',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情',
-        makeDep: '项目绑定组织'
-      },
-      // 组织关系列表
-      deptNameList: [
-        {
-          name: '组织名称一',
-          value: '0'
-        },
-        {
-          name: '组织名称二',
-          value: '1'
-        },
-        {
-          name: '组织名称三',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      },
-      // 表单校验规则
-      rules: {
-        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
-        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
-        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
-        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
-        this.deviceForm = {
-          tenantCode: row.tenantCode,
-          tenantName: row.tenantName,
-          linkPerson: row.linkPerson,
-          tel: row.tel,
-          clearDay: row.clearDay,
-          deptName: row.deptName
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      } else if (this.dialogStatus === 'makeDep') {
-        this.makeDept()
-      }
-    },
-    // 绑定组织关系
-    makeDept() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          deptTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('绑定成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addTenantSys(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
new file mode 100644
index 0000000..13e311c
--- /dev/null
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -0,0 +1,273 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系人电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearDay">
+            <el-input
+              v-model="deviceForm.clearDay"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <el-select
+              v-model="deviceForm.deptName"
+              placeholder="请选择关联组织名称"
+              clearable
+            >
+              <el-option
+                v-for="item in deptNameList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
+export default {
+  name: 'EditSysTenant',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情',
+        makeDep: '项目绑定组织'
+      },
+      // 组织关系列表
+      deptNameList: [
+        {
+          name: '组织名称一',
+          value: '0'
+        },
+        {
+          name: '组织名称二',
+          value: '1'
+        },
+        {
+          name: '组织名称三',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      },
+      // 表单校验规则
+      rules: {
+        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
+        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
+        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
+        this.deviceForm = {
+          tenantCode: row.tenantCode,
+          tenantName: row.tenantName,
+          linkPerson: row.linkPerson,
+          tel: row.tel,
+          clearDay: row.clearDay,
+          deptName: row.deptName
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      } else if (this.dialogStatus === 'makeDep') {
+        this.makeDept()
+      }
+    },
+    // 绑定组织关系
+    makeDept() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          deptTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addTenantSys(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
new file mode 100644
index 0000000..408328c
--- /dev/null
+++ b/src/views/system/tenant/tenantList.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="140" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/system/tenant/components/editTenant'
+import { tenantSysList, delTenantSys } from '@/api/system/tenant'
+
+export default {
+  name: 'TenantList',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '项目编码',
+          value: 'tenantCode',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '项目联系人',
+          value: 'linkPerson',
+          align: 'center'
+        },
+        {
+          text: '联系人电话',
+          value: 'tel',
+          align: 'center'
+        },
+        {
+          text: '历史数据保存天数',
+          value: 'clearDay',
+          align: 'center'
+        },
+        {
+          text: '关联组织',
+          value: 'deptId',
+          align: 'center'
+        },
+        {
+          text: '关联组织名称',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      tenantSysList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delTenantSys(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    },
+    // 绑定组织
+    makeDep(row) {
+      this.$refs.editAlarmContent.initDialog('makeDep', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantSystList.vue b/src/views/system/tenant/tenantSystList.vue
deleted file mode 100644
index 61149b2..0000000
--- a/src/views/system/tenant/tenantSystList.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="140" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" size="small" @click="makeDep(scope.row)">
-              组织
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/system/tenant/components/dialogSysTenant'
-import { tenantSysList, delTenantSys } from '@/api/system/tenant'
-
-export default {
-  name: 'TenantSystList',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '项目编码',
-          value: 'tenantCode',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '项目联系人',
-          value: 'linkPerson',
-          align: 'center'
-        },
-        {
-          text: '联系人电话',
-          value: 'tel',
-          align: 'center'
-        },
-        {
-          text: '历史数据保存天数',
-          value: 'clearDay',
-          align: 'center'
-        },
-        {
-          text: '关联组织',
-          value: 'deptId',
-          align: 'center'
-        },
-        {
-          text: '关联组织名称',
-          value: 'deptName',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      tenantSysList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delTenantSys(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    },
-    // 绑定组织
-    makeDep(row) {
-      this.$refs.dialogAlarmContent.initDialog('makeDep', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
deleted file mode 100644
index 0ea149c..0000000
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
-              clearable
-              placeholder="请输入告警内容"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警类型" prop="alarmType">
-            <el-select
-              v-model="deviceForm.alarmType"
-              placeholder="告警类型"
-              clearable
-            >
-              <el-option
-                v-for="item in alarmTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
-export default {
-  name: 'DialogAlarmContent',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
-        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        console.log(row)
-        this.deviceForm = {
-          alarmType: row.alarmType,
-          alarmContent: row.alarmContent,
-          devcode: row.id,
-          deviceType: row.deviceType.split(',')
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/editAlarmContent.vue b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
new file mode 100644
index 0000000..96e56f2
--- /dev/null
+++ b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
+              clearable
+              placeholder="请输入告警内容"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警类型" prop="alarmType">
+            <el-select
+              v-model="deviceForm.alarmType"
+              placeholder="告警类型"
+              clearable
+            >
+              <el-option
+                v-for="item in alarmTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              clearable
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
+export default {
+  name: 'EditAlarmContent',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
+        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        console.log(row)
+        this.deviceForm = {
+          alarmType: row.alarmType,
+          alarmContent: row.alarmContent,
+          devcode: row.id,
+          deviceType: row.deviceType.split(',')
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index f203f26..b7d9dab 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -73,17 +73,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import dialogAlarmContent from '@/views/systemConfig/alarmContent/components/dialogAlarmContent'
+import editAlarmContent from '@/views/systemConfig/alarmContent/components/editAlarmContent'
 import { getDevice, alarmContentList, delAlarmContent } from '@/api/systemConfig/alarmContent'
 
 export default {
   name: 'ListContent',
-  components: { dialogAlarmContent },
+  components: { editAlarmContent },
   data() {
     return {
       // 查询条件
@@ -183,11 +183,11 @@
     },
     // 新增
     add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
+      this.$refs.editAlarmContent.initDialog('create')
     },
     // 修改
     edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
+      this.$refs.editAlarmContent.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
deleted file mode 100644
index bfb0c1d..0000000
--- a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.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-col>
-        <el-col :span="12">
-          <el-form-item label="监测指标" prop="name">
-            <el-input
-              v-model="deviceForm.name"
-              clearable
-              placeholder="请输入监测指标名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="开启报警" prop="openAlarm">
-            <el-select
-              v-model="deviceForm.openAlarm"
-              placeholder="请选择是否开启报警"
-              clearable
-            >
-              <el-option
-                v-for="item in openAlarmList"
-                :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="openJob">
-            <el-select
-              v-model="deviceForm.openJob"
-              placeholder="请选择是否开启工单"
-              clearable
-            >
-              <el-option
-                v-for="item in openJobList"
-                :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="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入告警上限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入告警下限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="level">
-            <el-select
-              v-model="deviceForm.level"
-              placeholder="请选择报警等级"
-              clearable
-            >
-              <el-option
-                v-for="item in levelList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
-export default {
-  name: 'DialogAlarmLevel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: '', // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否开启报警
-      openAlarmList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 是否开启工单
-      openJobList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 报警等级
-      levelList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        },
-        {
-          name: '三级报警',
-          value: '3'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: '',
-        name: '',
-        openAlarm: '',
-        openJob: '',
-        level: '',
-        lowValue: '',
-        highValue: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
-        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
-        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
-        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
-        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmLevel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
new file mode 100644
index 0000000..4db04c2
--- /dev/null
+++ b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
@@ -0,0 +1,281 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.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-col>
+        <el-col :span="12">
+          <el-form-item label="监测指标" prop="name">
+            <el-input
+              v-model="deviceForm.name"
+              clearable
+              placeholder="请输入监测指标名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="开启报警" prop="openAlarm">
+            <el-select
+              v-model="deviceForm.openAlarm"
+              placeholder="请选择是否开启报警"
+              clearable
+            >
+              <el-option
+                v-for="item in openAlarmList"
+                :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="openJob">
+            <el-select
+              v-model="deviceForm.openJob"
+              placeholder="请选择是否开启工单"
+              clearable
+            >
+              <el-option
+                v-for="item in openJobList"
+                :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="highValue">
+            <el-input
+              v-model="deviceForm.highValue"
+              placeholder="请输入告警上限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警下限" prop="lowValue">
+            <el-input
+              v-model="deviceForm.lowValue"
+              placeholder="请输入告警下限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警等级" prop="level">
+            <el-select
+              v-model="deviceForm.level"
+              placeholder="请选择报警等级"
+              clearable
+            >
+              <el-option
+                v-for="item in levelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
+export default {
+  name: 'EditAlarmLevel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: '', // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否开启报警
+      openAlarmList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 是否开启工单
+      openJobList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 报警等级
+      levelList: [
+        {
+          name: '一级报警',
+          value: '1'
+        },
+        {
+          name: '二级报警',
+          value: '2'
+        },
+        {
+          name: '三级报警',
+          value: '3'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: '',
+        name: '',
+        openAlarm: '',
+        openJob: '',
+        level: '',
+        lowValue: '',
+        highValue: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
+        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
+        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
+        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
+        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
+        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmLevel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 193f00f..708efea 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -73,11 +73,11 @@
 import EditH2sLevel from './components/editH2sLevel'
 import EditHumiLevel from './components/editHumiLevel'
 import EditO2Level from './components/editO2Level'
-import dialogAlarmLevel from './components/dialogAlarmLevel'
+import editAlarmLevel from './components/editAlarmLevel'
 
 export default {
   name: 'ListLevel',
-  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, dialogAlarmLevel },
+  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, editAlarmLevel },
   data() {
     return {
       selectedTenant: {
@@ -181,7 +181,7 @@
     },
     // 新增
     add() {
-      this.cmpName = 'dialog-alarm-level'
+      this.cmpName = 'edit-alarm-level'
       setTimeout(() => {
         this.$refs.editdialog.initDialog('create')
       }, 100)
diff --git a/src/views/systemConfig/deptPermission/components/dialogListDept.vue b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
deleted file mode 100644
index 5d75707..0000000
--- a/src/views/systemConfig/deptPermission/components/dialogListDept.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <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="wellType">
-            <el-select
-              v-model="deviceForm.wellType"
-              clearable
-              placeholder="请选择支持井类型"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in wellTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="lng">
-            <el-input
-              v-model="deviceForm.lng"
-              clearable
-              placeholder="请输入经度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="纬度" prop="lat">
-            <el-input
-              v-model="deviceForm.lat"
-              clearable
-              placeholder="请输入纬度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="组织id" prop="deptid">
-            <el-input
-              v-model="deviceForm.deptid"
-              clearable
-              disabled
-              placeholder="请输入组织id"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
-export default {
-  name: 'DialogListDept',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 支持井类型
-      wellTypeList: [
-        {
-          label: '井类型一',
-          value: '1'
-        },
-        {
-          label: '井类型二',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      },
-      // 表单校验规则
-      rules: {
-        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
-        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDept(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDept(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
new file mode 100644
index 0000000..429076f
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <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="wellType">
+            <el-select
+              v-model="deviceForm.wellType"
+              clearable
+              placeholder="请选择支持井类型"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in wellTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="lng">
+            <el-input
+              v-model="deviceForm.lng"
+              clearable
+              placeholder="请输入经度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="纬度" prop="lat">
+            <el-input
+              v-model="deviceForm.lat"
+              clearable
+              placeholder="请输入纬度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="组织id" prop="deptid">
+            <el-input
+              v-model="deviceForm.deptid"
+              clearable
+              disabled
+              placeholder="请输入组织id"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
+export default {
+  name: 'EditDeptPermission',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 支持井类型
+      wellTypeList: [
+        {
+          label: '井类型一',
+          value: '1'
+        },
+        {
+          label: '井类型二',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      },
+      // 表单校验规则
+      rules: {
+        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
+        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDept(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDept(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
new file mode 100644
index 0000000..4305f54
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-select
+          v-model="listQuery.deptid"
+          placeholder="组织id"
+          clearable
+        >
+          <el-option
+            v-for="item in deptidList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="120" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-list-dept ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editListDept from '@/views/systemConfig/deptPermission/components/editDeptPermission'
+import { deptList, delDept } from '@/api/systemConfig/deptPermission'
+
+export default {
+  name: 'DeptPermission',
+  components: { editListDept },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        deptid: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      deptidList: [
+        {
+          label: '3213213',
+          value: '0'
+        },
+        {
+          label: '9873213',
+          value: '1'
+        }
+      ],
+      columns: [
+        {
+          text: '组织名称',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '支持井类型',
+          value: 'wellType',
+          align: 'center'
+        },
+        {
+          text: '支持设备类型',
+          value: 'deviceType',
+          align: 'center'
+        },
+        {
+          text: '地图默认中心经度',
+          value: 'lng',
+          align: 'center'
+        },
+        {
+          text: '地图默认中心纬度',
+          value: 'lat',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      deptList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDept(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/system/tenant/components/dialogSysTenant.vue b/src/views/system/tenant/components/dialogSysTenant.vue
deleted file mode 100644
index 0b2d1c1..0000000
--- a/src/views/system/tenant/components/dialogSysTenant.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系人电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="历史保存天数" prop="clearDay">
-            <el-input
-              v-model="deviceForm.clearDay"
-              placeholder="请输入历史数据保存天数"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
-          <el-form-item label="组织名称" prop="deptName">
-            <el-select
-              v-model="deviceForm.deptName"
-              placeholder="请选择关联组织名称"
-              clearable
-            >
-              <el-option
-                v-for="item in deptNameList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
-export default {
-  name: 'DialogSysTenant',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情',
-        makeDep: '项目绑定组织'
-      },
-      // 组织关系列表
-      deptNameList: [
-        {
-          name: '组织名称一',
-          value: '0'
-        },
-        {
-          name: '组织名称二',
-          value: '1'
-        },
-        {
-          name: '组织名称三',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      },
-      // 表单校验规则
-      rules: {
-        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
-        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
-        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
-        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
-        this.deviceForm = {
-          tenantCode: row.tenantCode,
-          tenantName: row.tenantName,
-          linkPerson: row.linkPerson,
-          tel: row.tel,
-          clearDay: row.clearDay,
-          deptName: row.deptName
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      } else if (this.dialogStatus === 'makeDep') {
-        this.makeDept()
-      }
-    },
-    // 绑定组织关系
-    makeDept() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          deptTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('绑定成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addTenantSys(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
new file mode 100644
index 0000000..13e311c
--- /dev/null
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -0,0 +1,273 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系人电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearDay">
+            <el-input
+              v-model="deviceForm.clearDay"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <el-select
+              v-model="deviceForm.deptName"
+              placeholder="请选择关联组织名称"
+              clearable
+            >
+              <el-option
+                v-for="item in deptNameList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
+export default {
+  name: 'EditSysTenant',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情',
+        makeDep: '项目绑定组织'
+      },
+      // 组织关系列表
+      deptNameList: [
+        {
+          name: '组织名称一',
+          value: '0'
+        },
+        {
+          name: '组织名称二',
+          value: '1'
+        },
+        {
+          name: '组织名称三',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      },
+      // 表单校验规则
+      rules: {
+        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
+        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
+        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
+        this.deviceForm = {
+          tenantCode: row.tenantCode,
+          tenantName: row.tenantName,
+          linkPerson: row.linkPerson,
+          tel: row.tel,
+          clearDay: row.clearDay,
+          deptName: row.deptName
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      } else if (this.dialogStatus === 'makeDep') {
+        this.makeDept()
+      }
+    },
+    // 绑定组织关系
+    makeDept() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          deptTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addTenantSys(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
new file mode 100644
index 0000000..408328c
--- /dev/null
+++ b/src/views/system/tenant/tenantList.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="140" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/system/tenant/components/editTenant'
+import { tenantSysList, delTenantSys } from '@/api/system/tenant'
+
+export default {
+  name: 'TenantList',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '项目编码',
+          value: 'tenantCode',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '项目联系人',
+          value: 'linkPerson',
+          align: 'center'
+        },
+        {
+          text: '联系人电话',
+          value: 'tel',
+          align: 'center'
+        },
+        {
+          text: '历史数据保存天数',
+          value: 'clearDay',
+          align: 'center'
+        },
+        {
+          text: '关联组织',
+          value: 'deptId',
+          align: 'center'
+        },
+        {
+          text: '关联组织名称',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      tenantSysList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delTenantSys(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    },
+    // 绑定组织
+    makeDep(row) {
+      this.$refs.editAlarmContent.initDialog('makeDep', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantSystList.vue b/src/views/system/tenant/tenantSystList.vue
deleted file mode 100644
index 61149b2..0000000
--- a/src/views/system/tenant/tenantSystList.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="140" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" size="small" @click="makeDep(scope.row)">
-              组织
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/system/tenant/components/dialogSysTenant'
-import { tenantSysList, delTenantSys } from '@/api/system/tenant'
-
-export default {
-  name: 'TenantSystList',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '项目编码',
-          value: 'tenantCode',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '项目联系人',
-          value: 'linkPerson',
-          align: 'center'
-        },
-        {
-          text: '联系人电话',
-          value: 'tel',
-          align: 'center'
-        },
-        {
-          text: '历史数据保存天数',
-          value: 'clearDay',
-          align: 'center'
-        },
-        {
-          text: '关联组织',
-          value: 'deptId',
-          align: 'center'
-        },
-        {
-          text: '关联组织名称',
-          value: 'deptName',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      tenantSysList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delTenantSys(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    },
-    // 绑定组织
-    makeDep(row) {
-      this.$refs.dialogAlarmContent.initDialog('makeDep', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
deleted file mode 100644
index 0ea149c..0000000
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
-              clearable
-              placeholder="请输入告警内容"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警类型" prop="alarmType">
-            <el-select
-              v-model="deviceForm.alarmType"
-              placeholder="告警类型"
-              clearable
-            >
-              <el-option
-                v-for="item in alarmTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
-export default {
-  name: 'DialogAlarmContent',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
-        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        console.log(row)
-        this.deviceForm = {
-          alarmType: row.alarmType,
-          alarmContent: row.alarmContent,
-          devcode: row.id,
-          deviceType: row.deviceType.split(',')
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/editAlarmContent.vue b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
new file mode 100644
index 0000000..96e56f2
--- /dev/null
+++ b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
+              clearable
+              placeholder="请输入告警内容"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警类型" prop="alarmType">
+            <el-select
+              v-model="deviceForm.alarmType"
+              placeholder="告警类型"
+              clearable
+            >
+              <el-option
+                v-for="item in alarmTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              clearable
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
+export default {
+  name: 'EditAlarmContent',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
+        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        console.log(row)
+        this.deviceForm = {
+          alarmType: row.alarmType,
+          alarmContent: row.alarmContent,
+          devcode: row.id,
+          deviceType: row.deviceType.split(',')
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index f203f26..b7d9dab 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -73,17 +73,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import dialogAlarmContent from '@/views/systemConfig/alarmContent/components/dialogAlarmContent'
+import editAlarmContent from '@/views/systemConfig/alarmContent/components/editAlarmContent'
 import { getDevice, alarmContentList, delAlarmContent } from '@/api/systemConfig/alarmContent'
 
 export default {
   name: 'ListContent',
-  components: { dialogAlarmContent },
+  components: { editAlarmContent },
   data() {
     return {
       // 查询条件
@@ -183,11 +183,11 @@
     },
     // 新增
     add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
+      this.$refs.editAlarmContent.initDialog('create')
     },
     // 修改
     edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
+      this.$refs.editAlarmContent.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
deleted file mode 100644
index bfb0c1d..0000000
--- a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.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-col>
-        <el-col :span="12">
-          <el-form-item label="监测指标" prop="name">
-            <el-input
-              v-model="deviceForm.name"
-              clearable
-              placeholder="请输入监测指标名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="开启报警" prop="openAlarm">
-            <el-select
-              v-model="deviceForm.openAlarm"
-              placeholder="请选择是否开启报警"
-              clearable
-            >
-              <el-option
-                v-for="item in openAlarmList"
-                :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="openJob">
-            <el-select
-              v-model="deviceForm.openJob"
-              placeholder="请选择是否开启工单"
-              clearable
-            >
-              <el-option
-                v-for="item in openJobList"
-                :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="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入告警上限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入告警下限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="level">
-            <el-select
-              v-model="deviceForm.level"
-              placeholder="请选择报警等级"
-              clearable
-            >
-              <el-option
-                v-for="item in levelList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
-export default {
-  name: 'DialogAlarmLevel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: '', // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否开启报警
-      openAlarmList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 是否开启工单
-      openJobList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 报警等级
-      levelList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        },
-        {
-          name: '三级报警',
-          value: '3'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: '',
-        name: '',
-        openAlarm: '',
-        openJob: '',
-        level: '',
-        lowValue: '',
-        highValue: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
-        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
-        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
-        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
-        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmLevel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
new file mode 100644
index 0000000..4db04c2
--- /dev/null
+++ b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
@@ -0,0 +1,281 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.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-col>
+        <el-col :span="12">
+          <el-form-item label="监测指标" prop="name">
+            <el-input
+              v-model="deviceForm.name"
+              clearable
+              placeholder="请输入监测指标名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="开启报警" prop="openAlarm">
+            <el-select
+              v-model="deviceForm.openAlarm"
+              placeholder="请选择是否开启报警"
+              clearable
+            >
+              <el-option
+                v-for="item in openAlarmList"
+                :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="openJob">
+            <el-select
+              v-model="deviceForm.openJob"
+              placeholder="请选择是否开启工单"
+              clearable
+            >
+              <el-option
+                v-for="item in openJobList"
+                :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="highValue">
+            <el-input
+              v-model="deviceForm.highValue"
+              placeholder="请输入告警上限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警下限" prop="lowValue">
+            <el-input
+              v-model="deviceForm.lowValue"
+              placeholder="请输入告警下限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警等级" prop="level">
+            <el-select
+              v-model="deviceForm.level"
+              placeholder="请选择报警等级"
+              clearable
+            >
+              <el-option
+                v-for="item in levelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
+export default {
+  name: 'EditAlarmLevel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: '', // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否开启报警
+      openAlarmList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 是否开启工单
+      openJobList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 报警等级
+      levelList: [
+        {
+          name: '一级报警',
+          value: '1'
+        },
+        {
+          name: '二级报警',
+          value: '2'
+        },
+        {
+          name: '三级报警',
+          value: '3'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: '',
+        name: '',
+        openAlarm: '',
+        openJob: '',
+        level: '',
+        lowValue: '',
+        highValue: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
+        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
+        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
+        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
+        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
+        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmLevel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 193f00f..708efea 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -73,11 +73,11 @@
 import EditH2sLevel from './components/editH2sLevel'
 import EditHumiLevel from './components/editHumiLevel'
 import EditO2Level from './components/editO2Level'
-import dialogAlarmLevel from './components/dialogAlarmLevel'
+import editAlarmLevel from './components/editAlarmLevel'
 
 export default {
   name: 'ListLevel',
-  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, dialogAlarmLevel },
+  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, editAlarmLevel },
   data() {
     return {
       selectedTenant: {
@@ -181,7 +181,7 @@
     },
     // 新增
     add() {
-      this.cmpName = 'dialog-alarm-level'
+      this.cmpName = 'edit-alarm-level'
       setTimeout(() => {
         this.$refs.editdialog.initDialog('create')
       }, 100)
diff --git a/src/views/systemConfig/deptPermission/components/dialogListDept.vue b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
deleted file mode 100644
index 5d75707..0000000
--- a/src/views/systemConfig/deptPermission/components/dialogListDept.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <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="wellType">
-            <el-select
-              v-model="deviceForm.wellType"
-              clearable
-              placeholder="请选择支持井类型"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in wellTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="lng">
-            <el-input
-              v-model="deviceForm.lng"
-              clearable
-              placeholder="请输入经度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="纬度" prop="lat">
-            <el-input
-              v-model="deviceForm.lat"
-              clearable
-              placeholder="请输入纬度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="组织id" prop="deptid">
-            <el-input
-              v-model="deviceForm.deptid"
-              clearable
-              disabled
-              placeholder="请输入组织id"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
-export default {
-  name: 'DialogListDept',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 支持井类型
-      wellTypeList: [
-        {
-          label: '井类型一',
-          value: '1'
-        },
-        {
-          label: '井类型二',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      },
-      // 表单校验规则
-      rules: {
-        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
-        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDept(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDept(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
new file mode 100644
index 0000000..429076f
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <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="wellType">
+            <el-select
+              v-model="deviceForm.wellType"
+              clearable
+              placeholder="请选择支持井类型"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in wellTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="lng">
+            <el-input
+              v-model="deviceForm.lng"
+              clearable
+              placeholder="请输入经度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="纬度" prop="lat">
+            <el-input
+              v-model="deviceForm.lat"
+              clearable
+              placeholder="请输入纬度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="组织id" prop="deptid">
+            <el-input
+              v-model="deviceForm.deptid"
+              clearable
+              disabled
+              placeholder="请输入组织id"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
+export default {
+  name: 'EditDeptPermission',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 支持井类型
+      wellTypeList: [
+        {
+          label: '井类型一',
+          value: '1'
+        },
+        {
+          label: '井类型二',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      },
+      // 表单校验规则
+      rules: {
+        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
+        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDept(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDept(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
new file mode 100644
index 0000000..4305f54
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-select
+          v-model="listQuery.deptid"
+          placeholder="组织id"
+          clearable
+        >
+          <el-option
+            v-for="item in deptidList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="120" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-list-dept ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editListDept from '@/views/systemConfig/deptPermission/components/editDeptPermission'
+import { deptList, delDept } from '@/api/systemConfig/deptPermission'
+
+export default {
+  name: 'DeptPermission',
+  components: { editListDept },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        deptid: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      deptidList: [
+        {
+          label: '3213213',
+          value: '0'
+        },
+        {
+          label: '9873213',
+          value: '1'
+        }
+      ],
+      columns: [
+        {
+          text: '组织名称',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '支持井类型',
+          value: 'wellType',
+          align: 'center'
+        },
+        {
+          text: '支持设备类型',
+          value: 'deviceType',
+          align: 'center'
+        },
+        {
+          text: '地图默认中心经度',
+          value: 'lng',
+          align: 'center'
+        },
+        {
+          text: '地图默认中心纬度',
+          value: 'lat',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      deptList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDept(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/listDept.vue b/src/views/systemConfig/deptPermission/listDept.vue
deleted file mode 100644
index 738c5b1..0000000
--- a/src/views/systemConfig/deptPermission/listDept.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-select
-          v-model="listQuery.deptid"
-          placeholder="组织id"
-          clearable
-        >
-          <el-option
-            v-for="item in deptidList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="120" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-list-dept ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogListDept from '@/views/systemConfig/deptPermission/components/dialogListDept'
-import { deptList, delDept } from '@/api/systemConfig/deptPermission'
-
-export default {
-  name: 'ListDept',
-  components: { dialogListDept },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        deptid: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      deptidList: [
-        {
-          label: '3213213',
-          value: '0'
-        },
-        {
-          label: '9873213',
-          value: '1'
-        }
-      ],
-      columns: [
-        {
-          text: '组织名称',
-          value: 'deptName',
-          align: 'center'
-        },
-        {
-          text: '支持井类型',
-          value: 'wellType',
-          align: 'center'
-        },
-        {
-          text: '支持设备类型',
-          value: 'deviceType',
-          align: 'center'
-        },
-        {
-          text: '地图默认中心经度',
-          value: 'lng',
-          align: 'center'
-        },
-        {
-          text: '地图默认中心纬度',
-          value: 'lat',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      deptList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/system/tenant/components/dialogSysTenant.vue b/src/views/system/tenant/components/dialogSysTenant.vue
deleted file mode 100644
index 0b2d1c1..0000000
--- a/src/views/system/tenant/components/dialogSysTenant.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系人电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="历史保存天数" prop="clearDay">
-            <el-input
-              v-model="deviceForm.clearDay"
-              placeholder="请输入历史数据保存天数"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
-          <el-form-item label="组织名称" prop="deptName">
-            <el-select
-              v-model="deviceForm.deptName"
-              placeholder="请选择关联组织名称"
-              clearable
-            >
-              <el-option
-                v-for="item in deptNameList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
-export default {
-  name: 'DialogSysTenant',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情',
-        makeDep: '项目绑定组织'
-      },
-      // 组织关系列表
-      deptNameList: [
-        {
-          name: '组织名称一',
-          value: '0'
-        },
-        {
-          name: '组织名称二',
-          value: '1'
-        },
-        {
-          name: '组织名称三',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      },
-      // 表单校验规则
-      rules: {
-        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
-        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
-        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
-        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
-        this.deviceForm = {
-          tenantCode: row.tenantCode,
-          tenantName: row.tenantName,
-          linkPerson: row.linkPerson,
-          tel: row.tel,
-          clearDay: row.clearDay,
-          deptName: row.deptName
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      } else if (this.dialogStatus === 'makeDep') {
-        this.makeDept()
-      }
-    },
-    // 绑定组织关系
-    makeDept() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          deptTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('绑定成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addTenantSys(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
new file mode 100644
index 0000000..13e311c
--- /dev/null
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -0,0 +1,273 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系人电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearDay">
+            <el-input
+              v-model="deviceForm.clearDay"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <el-select
+              v-model="deviceForm.deptName"
+              placeholder="请选择关联组织名称"
+              clearable
+            >
+              <el-option
+                v-for="item in deptNameList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
+export default {
+  name: 'EditSysTenant',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情',
+        makeDep: '项目绑定组织'
+      },
+      // 组织关系列表
+      deptNameList: [
+        {
+          name: '组织名称一',
+          value: '0'
+        },
+        {
+          name: '组织名称二',
+          value: '1'
+        },
+        {
+          name: '组织名称三',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      },
+      // 表单校验规则
+      rules: {
+        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
+        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
+        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
+        this.deviceForm = {
+          tenantCode: row.tenantCode,
+          tenantName: row.tenantName,
+          linkPerson: row.linkPerson,
+          tel: row.tel,
+          clearDay: row.clearDay,
+          deptName: row.deptName
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      } else if (this.dialogStatus === 'makeDep') {
+        this.makeDept()
+      }
+    },
+    // 绑定组织关系
+    makeDept() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          deptTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addTenantSys(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
new file mode 100644
index 0000000..408328c
--- /dev/null
+++ b/src/views/system/tenant/tenantList.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="140" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/system/tenant/components/editTenant'
+import { tenantSysList, delTenantSys } from '@/api/system/tenant'
+
+export default {
+  name: 'TenantList',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '项目编码',
+          value: 'tenantCode',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '项目联系人',
+          value: 'linkPerson',
+          align: 'center'
+        },
+        {
+          text: '联系人电话',
+          value: 'tel',
+          align: 'center'
+        },
+        {
+          text: '历史数据保存天数',
+          value: 'clearDay',
+          align: 'center'
+        },
+        {
+          text: '关联组织',
+          value: 'deptId',
+          align: 'center'
+        },
+        {
+          text: '关联组织名称',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      tenantSysList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delTenantSys(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    },
+    // 绑定组织
+    makeDep(row) {
+      this.$refs.editAlarmContent.initDialog('makeDep', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantSystList.vue b/src/views/system/tenant/tenantSystList.vue
deleted file mode 100644
index 61149b2..0000000
--- a/src/views/system/tenant/tenantSystList.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="140" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" size="small" @click="makeDep(scope.row)">
-              组织
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/system/tenant/components/dialogSysTenant'
-import { tenantSysList, delTenantSys } from '@/api/system/tenant'
-
-export default {
-  name: 'TenantSystList',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '项目编码',
-          value: 'tenantCode',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '项目联系人',
-          value: 'linkPerson',
-          align: 'center'
-        },
-        {
-          text: '联系人电话',
-          value: 'tel',
-          align: 'center'
-        },
-        {
-          text: '历史数据保存天数',
-          value: 'clearDay',
-          align: 'center'
-        },
-        {
-          text: '关联组织',
-          value: 'deptId',
-          align: 'center'
-        },
-        {
-          text: '关联组织名称',
-          value: 'deptName',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      tenantSysList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delTenantSys(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    },
-    // 绑定组织
-    makeDep(row) {
-      this.$refs.dialogAlarmContent.initDialog('makeDep', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
deleted file mode 100644
index 0ea149c..0000000
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
-              clearable
-              placeholder="请输入告警内容"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警类型" prop="alarmType">
-            <el-select
-              v-model="deviceForm.alarmType"
-              placeholder="告警类型"
-              clearable
-            >
-              <el-option
-                v-for="item in alarmTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
-export default {
-  name: 'DialogAlarmContent',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
-        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        console.log(row)
-        this.deviceForm = {
-          alarmType: row.alarmType,
-          alarmContent: row.alarmContent,
-          devcode: row.id,
-          deviceType: row.deviceType.split(',')
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/editAlarmContent.vue b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
new file mode 100644
index 0000000..96e56f2
--- /dev/null
+++ b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
+              clearable
+              placeholder="请输入告警内容"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警类型" prop="alarmType">
+            <el-select
+              v-model="deviceForm.alarmType"
+              placeholder="告警类型"
+              clearable
+            >
+              <el-option
+                v-for="item in alarmTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              clearable
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
+export default {
+  name: 'EditAlarmContent',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
+        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        console.log(row)
+        this.deviceForm = {
+          alarmType: row.alarmType,
+          alarmContent: row.alarmContent,
+          devcode: row.id,
+          deviceType: row.deviceType.split(',')
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index f203f26..b7d9dab 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -73,17 +73,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import dialogAlarmContent from '@/views/systemConfig/alarmContent/components/dialogAlarmContent'
+import editAlarmContent from '@/views/systemConfig/alarmContent/components/editAlarmContent'
 import { getDevice, alarmContentList, delAlarmContent } from '@/api/systemConfig/alarmContent'
 
 export default {
   name: 'ListContent',
-  components: { dialogAlarmContent },
+  components: { editAlarmContent },
   data() {
     return {
       // 查询条件
@@ -183,11 +183,11 @@
     },
     // 新增
     add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
+      this.$refs.editAlarmContent.initDialog('create')
     },
     // 修改
     edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
+      this.$refs.editAlarmContent.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
deleted file mode 100644
index bfb0c1d..0000000
--- a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.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-col>
-        <el-col :span="12">
-          <el-form-item label="监测指标" prop="name">
-            <el-input
-              v-model="deviceForm.name"
-              clearable
-              placeholder="请输入监测指标名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="开启报警" prop="openAlarm">
-            <el-select
-              v-model="deviceForm.openAlarm"
-              placeholder="请选择是否开启报警"
-              clearable
-            >
-              <el-option
-                v-for="item in openAlarmList"
-                :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="openJob">
-            <el-select
-              v-model="deviceForm.openJob"
-              placeholder="请选择是否开启工单"
-              clearable
-            >
-              <el-option
-                v-for="item in openJobList"
-                :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="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入告警上限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入告警下限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="level">
-            <el-select
-              v-model="deviceForm.level"
-              placeholder="请选择报警等级"
-              clearable
-            >
-              <el-option
-                v-for="item in levelList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
-export default {
-  name: 'DialogAlarmLevel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: '', // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否开启报警
-      openAlarmList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 是否开启工单
-      openJobList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 报警等级
-      levelList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        },
-        {
-          name: '三级报警',
-          value: '3'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: '',
-        name: '',
-        openAlarm: '',
-        openJob: '',
-        level: '',
-        lowValue: '',
-        highValue: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
-        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
-        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
-        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
-        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmLevel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
new file mode 100644
index 0000000..4db04c2
--- /dev/null
+++ b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
@@ -0,0 +1,281 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.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-col>
+        <el-col :span="12">
+          <el-form-item label="监测指标" prop="name">
+            <el-input
+              v-model="deviceForm.name"
+              clearable
+              placeholder="请输入监测指标名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="开启报警" prop="openAlarm">
+            <el-select
+              v-model="deviceForm.openAlarm"
+              placeholder="请选择是否开启报警"
+              clearable
+            >
+              <el-option
+                v-for="item in openAlarmList"
+                :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="openJob">
+            <el-select
+              v-model="deviceForm.openJob"
+              placeholder="请选择是否开启工单"
+              clearable
+            >
+              <el-option
+                v-for="item in openJobList"
+                :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="highValue">
+            <el-input
+              v-model="deviceForm.highValue"
+              placeholder="请输入告警上限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警下限" prop="lowValue">
+            <el-input
+              v-model="deviceForm.lowValue"
+              placeholder="请输入告警下限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警等级" prop="level">
+            <el-select
+              v-model="deviceForm.level"
+              placeholder="请选择报警等级"
+              clearable
+            >
+              <el-option
+                v-for="item in levelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
+export default {
+  name: 'EditAlarmLevel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: '', // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否开启报警
+      openAlarmList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 是否开启工单
+      openJobList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 报警等级
+      levelList: [
+        {
+          name: '一级报警',
+          value: '1'
+        },
+        {
+          name: '二级报警',
+          value: '2'
+        },
+        {
+          name: '三级报警',
+          value: '3'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: '',
+        name: '',
+        openAlarm: '',
+        openJob: '',
+        level: '',
+        lowValue: '',
+        highValue: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
+        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
+        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
+        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
+        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
+        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmLevel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 193f00f..708efea 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -73,11 +73,11 @@
 import EditH2sLevel from './components/editH2sLevel'
 import EditHumiLevel from './components/editHumiLevel'
 import EditO2Level from './components/editO2Level'
-import dialogAlarmLevel from './components/dialogAlarmLevel'
+import editAlarmLevel from './components/editAlarmLevel'
 
 export default {
   name: 'ListLevel',
-  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, dialogAlarmLevel },
+  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, editAlarmLevel },
   data() {
     return {
       selectedTenant: {
@@ -181,7 +181,7 @@
     },
     // 新增
     add() {
-      this.cmpName = 'dialog-alarm-level'
+      this.cmpName = 'edit-alarm-level'
       setTimeout(() => {
         this.$refs.editdialog.initDialog('create')
       }, 100)
diff --git a/src/views/systemConfig/deptPermission/components/dialogListDept.vue b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
deleted file mode 100644
index 5d75707..0000000
--- a/src/views/systemConfig/deptPermission/components/dialogListDept.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <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="wellType">
-            <el-select
-              v-model="deviceForm.wellType"
-              clearable
-              placeholder="请选择支持井类型"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in wellTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="lng">
-            <el-input
-              v-model="deviceForm.lng"
-              clearable
-              placeholder="请输入经度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="纬度" prop="lat">
-            <el-input
-              v-model="deviceForm.lat"
-              clearable
-              placeholder="请输入纬度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="组织id" prop="deptid">
-            <el-input
-              v-model="deviceForm.deptid"
-              clearable
-              disabled
-              placeholder="请输入组织id"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
-export default {
-  name: 'DialogListDept',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 支持井类型
-      wellTypeList: [
-        {
-          label: '井类型一',
-          value: '1'
-        },
-        {
-          label: '井类型二',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      },
-      // 表单校验规则
-      rules: {
-        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
-        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDept(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDept(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
new file mode 100644
index 0000000..429076f
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <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="wellType">
+            <el-select
+              v-model="deviceForm.wellType"
+              clearable
+              placeholder="请选择支持井类型"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in wellTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="lng">
+            <el-input
+              v-model="deviceForm.lng"
+              clearable
+              placeholder="请输入经度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="纬度" prop="lat">
+            <el-input
+              v-model="deviceForm.lat"
+              clearable
+              placeholder="请输入纬度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="组织id" prop="deptid">
+            <el-input
+              v-model="deviceForm.deptid"
+              clearable
+              disabled
+              placeholder="请输入组织id"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
+export default {
+  name: 'EditDeptPermission',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 支持井类型
+      wellTypeList: [
+        {
+          label: '井类型一',
+          value: '1'
+        },
+        {
+          label: '井类型二',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      },
+      // 表单校验规则
+      rules: {
+        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
+        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDept(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDept(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
new file mode 100644
index 0000000..4305f54
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-select
+          v-model="listQuery.deptid"
+          placeholder="组织id"
+          clearable
+        >
+          <el-option
+            v-for="item in deptidList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="120" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-list-dept ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editListDept from '@/views/systemConfig/deptPermission/components/editDeptPermission'
+import { deptList, delDept } from '@/api/systemConfig/deptPermission'
+
+export default {
+  name: 'DeptPermission',
+  components: { editListDept },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        deptid: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      deptidList: [
+        {
+          label: '3213213',
+          value: '0'
+        },
+        {
+          label: '9873213',
+          value: '1'
+        }
+      ],
+      columns: [
+        {
+          text: '组织名称',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '支持井类型',
+          value: 'wellType',
+          align: 'center'
+        },
+        {
+          text: '支持设备类型',
+          value: 'deviceType',
+          align: 'center'
+        },
+        {
+          text: '地图默认中心经度',
+          value: 'lng',
+          align: 'center'
+        },
+        {
+          text: '地图默认中心纬度',
+          value: 'lat',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      deptList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDept(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/listDept.vue b/src/views/systemConfig/deptPermission/listDept.vue
deleted file mode 100644
index 738c5b1..0000000
--- a/src/views/systemConfig/deptPermission/listDept.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-select
-          v-model="listQuery.deptid"
-          placeholder="组织id"
-          clearable
-        >
-          <el-option
-            v-for="item in deptidList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="120" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-list-dept ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogListDept from '@/views/systemConfig/deptPermission/components/dialogListDept'
-import { deptList, delDept } from '@/api/systemConfig/deptPermission'
-
-export default {
-  name: 'ListDept',
-  components: { dialogListDept },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        deptid: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      deptidList: [
-        {
-          label: '3213213',
-          value: '0'
-        },
-        {
-          label: '9873213',
-          value: '1'
-        }
-      ],
-      columns: [
-        {
-          text: '组织名称',
-          value: 'deptName',
-          align: 'center'
-        },
-        {
-          text: '支持井类型',
-          value: 'wellType',
-          align: 'center'
-        },
-        {
-          text: '支持设备类型',
-          value: 'deviceType',
-          align: 'center'
-        },
-        {
-          text: '地图默认中心经度',
-          value: 'lng',
-          align: 'center'
-        },
-        {
-          text: '地图默认中心纬度',
-          value: 'lat',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      deptList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue b/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
deleted file mode 100644
index 7ca5297..0000000
--- a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
+++ /dev/null
@@ -1,347 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="通讯方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请选择支持通信方式"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="坐标系" prop="coordinateType">
-            <el-input
-              v-model="deviceForm.coordinateType"
-              placeholder="请输入数据默认坐标系"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="生成工单" prop="isJobGenerate">
-            <el-select
-              v-model="deviceForm.isJobGenerate"
-              clearable
-              placeholder="请选择是否生成工单"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in jobList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="APP推送" prop="isAppPush">
-            <el-select
-              v-model="deviceForm.isAppPush"
-              clearable
-              placeholder="请选择是否APP推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in appPushList"
-                :key="item.value"
-                :label="item.label"
-                :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="isMessagePush">
-            <el-select
-              v-model="deviceForm.isMessagePush"
-              clearable
-              placeholder="请选择是否短信推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in messagePushList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="项目id" prop="devcode">
-            <el-input
-              v-model="deviceForm.devcode"
-              clearable
-              disabled
-              placeholder="未知"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/tenantConfig'
-export default {
-  name: 'DialogListTenant',
-  data() {
-    return {
-      // 通讯方式
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 是否生成工单
-      jobList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启App推送
-      appPushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启短信推送
-      messagePushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        isMessagePush: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
-        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
-        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
-        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
-        isMessagePush: [{ required: true, message: '是否开启短信推送必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        isMessagePush: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          communication: row.communication.split(','),
-          coordinateType: row.coordinateType,
-          isJobGenerate: row.isJobGenerate,
-          isAppPush: row.isAppPush,
-          isMessagePush: row.isMessagePush,
-          devcode: row.tenentId
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/system/tenant/components/dialogSysTenant.vue b/src/views/system/tenant/components/dialogSysTenant.vue
deleted file mode 100644
index 0b2d1c1..0000000
--- a/src/views/system/tenant/components/dialogSysTenant.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系人电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="历史保存天数" prop="clearDay">
-            <el-input
-              v-model="deviceForm.clearDay"
-              placeholder="请输入历史数据保存天数"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
-          <el-form-item label="组织名称" prop="deptName">
-            <el-select
-              v-model="deviceForm.deptName"
-              placeholder="请选择关联组织名称"
-              clearable
-            >
-              <el-option
-                v-for="item in deptNameList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
-export default {
-  name: 'DialogSysTenant',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情',
-        makeDep: '项目绑定组织'
-      },
-      // 组织关系列表
-      deptNameList: [
-        {
-          name: '组织名称一',
-          value: '0'
-        },
-        {
-          name: '组织名称二',
-          value: '1'
-        },
-        {
-          name: '组织名称三',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      },
-      // 表单校验规则
-      rules: {
-        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
-        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
-        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
-        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
-        this.deviceForm = {
-          tenantCode: row.tenantCode,
-          tenantName: row.tenantName,
-          linkPerson: row.linkPerson,
-          tel: row.tel,
-          clearDay: row.clearDay,
-          deptName: row.deptName
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      } else if (this.dialogStatus === 'makeDep') {
-        this.makeDept()
-      }
-    },
-    // 绑定组织关系
-    makeDept() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          deptTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('绑定成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addTenantSys(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
new file mode 100644
index 0000000..13e311c
--- /dev/null
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -0,0 +1,273 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系人电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearDay">
+            <el-input
+              v-model="deviceForm.clearDay"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <el-select
+              v-model="deviceForm.deptName"
+              placeholder="请选择关联组织名称"
+              clearable
+            >
+              <el-option
+                v-for="item in deptNameList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
+export default {
+  name: 'EditSysTenant',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情',
+        makeDep: '项目绑定组织'
+      },
+      // 组织关系列表
+      deptNameList: [
+        {
+          name: '组织名称一',
+          value: '0'
+        },
+        {
+          name: '组织名称二',
+          value: '1'
+        },
+        {
+          name: '组织名称三',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      },
+      // 表单校验规则
+      rules: {
+        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
+        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
+        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
+        this.deviceForm = {
+          tenantCode: row.tenantCode,
+          tenantName: row.tenantName,
+          linkPerson: row.linkPerson,
+          tel: row.tel,
+          clearDay: row.clearDay,
+          deptName: row.deptName
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      } else if (this.dialogStatus === 'makeDep') {
+        this.makeDept()
+      }
+    },
+    // 绑定组织关系
+    makeDept() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          deptTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addTenantSys(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
new file mode 100644
index 0000000..408328c
--- /dev/null
+++ b/src/views/system/tenant/tenantList.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="140" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/system/tenant/components/editTenant'
+import { tenantSysList, delTenantSys } from '@/api/system/tenant'
+
+export default {
+  name: 'TenantList',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '项目编码',
+          value: 'tenantCode',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '项目联系人',
+          value: 'linkPerson',
+          align: 'center'
+        },
+        {
+          text: '联系人电话',
+          value: 'tel',
+          align: 'center'
+        },
+        {
+          text: '历史数据保存天数',
+          value: 'clearDay',
+          align: 'center'
+        },
+        {
+          text: '关联组织',
+          value: 'deptId',
+          align: 'center'
+        },
+        {
+          text: '关联组织名称',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      tenantSysList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delTenantSys(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    },
+    // 绑定组织
+    makeDep(row) {
+      this.$refs.editAlarmContent.initDialog('makeDep', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantSystList.vue b/src/views/system/tenant/tenantSystList.vue
deleted file mode 100644
index 61149b2..0000000
--- a/src/views/system/tenant/tenantSystList.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="140" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" size="small" @click="makeDep(scope.row)">
-              组织
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/system/tenant/components/dialogSysTenant'
-import { tenantSysList, delTenantSys } from '@/api/system/tenant'
-
-export default {
-  name: 'TenantSystList',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '项目编码',
-          value: 'tenantCode',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '项目联系人',
-          value: 'linkPerson',
-          align: 'center'
-        },
-        {
-          text: '联系人电话',
-          value: 'tel',
-          align: 'center'
-        },
-        {
-          text: '历史数据保存天数',
-          value: 'clearDay',
-          align: 'center'
-        },
-        {
-          text: '关联组织',
-          value: 'deptId',
-          align: 'center'
-        },
-        {
-          text: '关联组织名称',
-          value: 'deptName',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      tenantSysList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delTenantSys(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    },
-    // 绑定组织
-    makeDep(row) {
-      this.$refs.dialogAlarmContent.initDialog('makeDep', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
deleted file mode 100644
index 0ea149c..0000000
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
-              clearable
-              placeholder="请输入告警内容"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警类型" prop="alarmType">
-            <el-select
-              v-model="deviceForm.alarmType"
-              placeholder="告警类型"
-              clearable
-            >
-              <el-option
-                v-for="item in alarmTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
-export default {
-  name: 'DialogAlarmContent',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
-        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        console.log(row)
-        this.deviceForm = {
-          alarmType: row.alarmType,
-          alarmContent: row.alarmContent,
-          devcode: row.id,
-          deviceType: row.deviceType.split(',')
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/editAlarmContent.vue b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
new file mode 100644
index 0000000..96e56f2
--- /dev/null
+++ b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
+              clearable
+              placeholder="请输入告警内容"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警类型" prop="alarmType">
+            <el-select
+              v-model="deviceForm.alarmType"
+              placeholder="告警类型"
+              clearable
+            >
+              <el-option
+                v-for="item in alarmTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              clearable
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
+export default {
+  name: 'EditAlarmContent',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
+        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        console.log(row)
+        this.deviceForm = {
+          alarmType: row.alarmType,
+          alarmContent: row.alarmContent,
+          devcode: row.id,
+          deviceType: row.deviceType.split(',')
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index f203f26..b7d9dab 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -73,17 +73,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import dialogAlarmContent from '@/views/systemConfig/alarmContent/components/dialogAlarmContent'
+import editAlarmContent from '@/views/systemConfig/alarmContent/components/editAlarmContent'
 import { getDevice, alarmContentList, delAlarmContent } from '@/api/systemConfig/alarmContent'
 
 export default {
   name: 'ListContent',
-  components: { dialogAlarmContent },
+  components: { editAlarmContent },
   data() {
     return {
       // 查询条件
@@ -183,11 +183,11 @@
     },
     // 新增
     add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
+      this.$refs.editAlarmContent.initDialog('create')
     },
     // 修改
     edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
+      this.$refs.editAlarmContent.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
deleted file mode 100644
index bfb0c1d..0000000
--- a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.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-col>
-        <el-col :span="12">
-          <el-form-item label="监测指标" prop="name">
-            <el-input
-              v-model="deviceForm.name"
-              clearable
-              placeholder="请输入监测指标名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="开启报警" prop="openAlarm">
-            <el-select
-              v-model="deviceForm.openAlarm"
-              placeholder="请选择是否开启报警"
-              clearable
-            >
-              <el-option
-                v-for="item in openAlarmList"
-                :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="openJob">
-            <el-select
-              v-model="deviceForm.openJob"
-              placeholder="请选择是否开启工单"
-              clearable
-            >
-              <el-option
-                v-for="item in openJobList"
-                :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="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入告警上限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入告警下限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="level">
-            <el-select
-              v-model="deviceForm.level"
-              placeholder="请选择报警等级"
-              clearable
-            >
-              <el-option
-                v-for="item in levelList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
-export default {
-  name: 'DialogAlarmLevel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: '', // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否开启报警
-      openAlarmList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 是否开启工单
-      openJobList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 报警等级
-      levelList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        },
-        {
-          name: '三级报警',
-          value: '3'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: '',
-        name: '',
-        openAlarm: '',
-        openJob: '',
-        level: '',
-        lowValue: '',
-        highValue: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
-        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
-        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
-        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
-        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmLevel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
new file mode 100644
index 0000000..4db04c2
--- /dev/null
+++ b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
@@ -0,0 +1,281 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.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-col>
+        <el-col :span="12">
+          <el-form-item label="监测指标" prop="name">
+            <el-input
+              v-model="deviceForm.name"
+              clearable
+              placeholder="请输入监测指标名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="开启报警" prop="openAlarm">
+            <el-select
+              v-model="deviceForm.openAlarm"
+              placeholder="请选择是否开启报警"
+              clearable
+            >
+              <el-option
+                v-for="item in openAlarmList"
+                :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="openJob">
+            <el-select
+              v-model="deviceForm.openJob"
+              placeholder="请选择是否开启工单"
+              clearable
+            >
+              <el-option
+                v-for="item in openJobList"
+                :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="highValue">
+            <el-input
+              v-model="deviceForm.highValue"
+              placeholder="请输入告警上限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警下限" prop="lowValue">
+            <el-input
+              v-model="deviceForm.lowValue"
+              placeholder="请输入告警下限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警等级" prop="level">
+            <el-select
+              v-model="deviceForm.level"
+              placeholder="请选择报警等级"
+              clearable
+            >
+              <el-option
+                v-for="item in levelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
+export default {
+  name: 'EditAlarmLevel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: '', // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否开启报警
+      openAlarmList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 是否开启工单
+      openJobList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 报警等级
+      levelList: [
+        {
+          name: '一级报警',
+          value: '1'
+        },
+        {
+          name: '二级报警',
+          value: '2'
+        },
+        {
+          name: '三级报警',
+          value: '3'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: '',
+        name: '',
+        openAlarm: '',
+        openJob: '',
+        level: '',
+        lowValue: '',
+        highValue: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
+        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
+        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
+        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
+        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
+        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmLevel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 193f00f..708efea 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -73,11 +73,11 @@
 import EditH2sLevel from './components/editH2sLevel'
 import EditHumiLevel from './components/editHumiLevel'
 import EditO2Level from './components/editO2Level'
-import dialogAlarmLevel from './components/dialogAlarmLevel'
+import editAlarmLevel from './components/editAlarmLevel'
 
 export default {
   name: 'ListLevel',
-  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, dialogAlarmLevel },
+  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, editAlarmLevel },
   data() {
     return {
       selectedTenant: {
@@ -181,7 +181,7 @@
     },
     // 新增
     add() {
-      this.cmpName = 'dialog-alarm-level'
+      this.cmpName = 'edit-alarm-level'
       setTimeout(() => {
         this.$refs.editdialog.initDialog('create')
       }, 100)
diff --git a/src/views/systemConfig/deptPermission/components/dialogListDept.vue b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
deleted file mode 100644
index 5d75707..0000000
--- a/src/views/systemConfig/deptPermission/components/dialogListDept.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <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="wellType">
-            <el-select
-              v-model="deviceForm.wellType"
-              clearable
-              placeholder="请选择支持井类型"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in wellTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="lng">
-            <el-input
-              v-model="deviceForm.lng"
-              clearable
-              placeholder="请输入经度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="纬度" prop="lat">
-            <el-input
-              v-model="deviceForm.lat"
-              clearable
-              placeholder="请输入纬度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="组织id" prop="deptid">
-            <el-input
-              v-model="deviceForm.deptid"
-              clearable
-              disabled
-              placeholder="请输入组织id"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
-export default {
-  name: 'DialogListDept',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 支持井类型
-      wellTypeList: [
-        {
-          label: '井类型一',
-          value: '1'
-        },
-        {
-          label: '井类型二',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      },
-      // 表单校验规则
-      rules: {
-        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
-        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDept(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDept(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
new file mode 100644
index 0000000..429076f
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <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="wellType">
+            <el-select
+              v-model="deviceForm.wellType"
+              clearable
+              placeholder="请选择支持井类型"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in wellTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="lng">
+            <el-input
+              v-model="deviceForm.lng"
+              clearable
+              placeholder="请输入经度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="纬度" prop="lat">
+            <el-input
+              v-model="deviceForm.lat"
+              clearable
+              placeholder="请输入纬度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="组织id" prop="deptid">
+            <el-input
+              v-model="deviceForm.deptid"
+              clearable
+              disabled
+              placeholder="请输入组织id"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
+export default {
+  name: 'EditDeptPermission',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 支持井类型
+      wellTypeList: [
+        {
+          label: '井类型一',
+          value: '1'
+        },
+        {
+          label: '井类型二',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      },
+      // 表单校验规则
+      rules: {
+        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
+        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDept(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDept(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
new file mode 100644
index 0000000..4305f54
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-select
+          v-model="listQuery.deptid"
+          placeholder="组织id"
+          clearable
+        >
+          <el-option
+            v-for="item in deptidList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="120" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-list-dept ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editListDept from '@/views/systemConfig/deptPermission/components/editDeptPermission'
+import { deptList, delDept } from '@/api/systemConfig/deptPermission'
+
+export default {
+  name: 'DeptPermission',
+  components: { editListDept },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        deptid: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      deptidList: [
+        {
+          label: '3213213',
+          value: '0'
+        },
+        {
+          label: '9873213',
+          value: '1'
+        }
+      ],
+      columns: [
+        {
+          text: '组织名称',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '支持井类型',
+          value: 'wellType',
+          align: 'center'
+        },
+        {
+          text: '支持设备类型',
+          value: 'deviceType',
+          align: 'center'
+        },
+        {
+          text: '地图默认中心经度',
+          value: 'lng',
+          align: 'center'
+        },
+        {
+          text: '地图默认中心纬度',
+          value: 'lat',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      deptList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDept(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/listDept.vue b/src/views/systemConfig/deptPermission/listDept.vue
deleted file mode 100644
index 738c5b1..0000000
--- a/src/views/systemConfig/deptPermission/listDept.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-select
-          v-model="listQuery.deptid"
-          placeholder="组织id"
-          clearable
-        >
-          <el-option
-            v-for="item in deptidList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="120" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-list-dept ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogListDept from '@/views/systemConfig/deptPermission/components/dialogListDept'
-import { deptList, delDept } from '@/api/systemConfig/deptPermission'
-
-export default {
-  name: 'ListDept',
-  components: { dialogListDept },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        deptid: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      deptidList: [
-        {
-          label: '3213213',
-          value: '0'
-        },
-        {
-          label: '9873213',
-          value: '1'
-        }
-      ],
-      columns: [
-        {
-          text: '组织名称',
-          value: 'deptName',
-          align: 'center'
-        },
-        {
-          text: '支持井类型',
-          value: 'wellType',
-          align: 'center'
-        },
-        {
-          text: '支持设备类型',
-          value: 'deviceType',
-          align: 'center'
-        },
-        {
-          text: '地图默认中心经度',
-          value: 'lng',
-          align: 'center'
-        },
-        {
-          text: '地图默认中心纬度',
-          value: 'lat',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      deptList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue b/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
deleted file mode 100644
index 7ca5297..0000000
--- a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
+++ /dev/null
@@ -1,347 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="通讯方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请选择支持通信方式"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="坐标系" prop="coordinateType">
-            <el-input
-              v-model="deviceForm.coordinateType"
-              placeholder="请输入数据默认坐标系"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="生成工单" prop="isJobGenerate">
-            <el-select
-              v-model="deviceForm.isJobGenerate"
-              clearable
-              placeholder="请选择是否生成工单"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in jobList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="APP推送" prop="isAppPush">
-            <el-select
-              v-model="deviceForm.isAppPush"
-              clearable
-              placeholder="请选择是否APP推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in appPushList"
-                :key="item.value"
-                :label="item.label"
-                :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="isMessagePush">
-            <el-select
-              v-model="deviceForm.isMessagePush"
-              clearable
-              placeholder="请选择是否短信推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in messagePushList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="项目id" prop="devcode">
-            <el-input
-              v-model="deviceForm.devcode"
-              clearable
-              disabled
-              placeholder="未知"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/tenantConfig'
-export default {
-  name: 'DialogListTenant',
-  data() {
-    return {
-      // 通讯方式
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 是否生成工单
-      jobList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启App推送
-      appPushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启短信推送
-      messagePushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        isMessagePush: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
-        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
-        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
-        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
-        isMessagePush: [{ required: true, message: '是否开启短信推送必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        isMessagePush: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          communication: row.communication.split(','),
-          coordinateType: row.coordinateType,
-          isJobGenerate: row.isJobGenerate,
-          isAppPush: row.isAppPush,
-          isMessagePush: row.isMessagePush,
-          devcode: row.tenentId
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
new file mode 100644
index 0000000..d1be724
--- /dev/null
+++ b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
@@ -0,0 +1,337 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="通讯方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              :disabled="dialogStatus === 'detail' ? true : false"
+              placeholder="请选择支持通信方式"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="坐标系" prop="coordinateType">
+            <el-input
+              v-model="deviceForm.coordinateType"
+              placeholder="请输入数据默认坐标系"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="生成工单" prop="isJobGenerate">
+            <el-select
+              v-model="deviceForm.isJobGenerate"
+              clearable
+              placeholder="请选择是否生成工单"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in jobList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="APP推送" prop="isAppPush">
+            <el-select
+              v-model="deviceForm.isAppPush"
+              clearable
+              placeholder="请选择是否APP推送"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in appPushList"
+                :key="item.value"
+                :label="item.label"
+                :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="isMessagePush">
+            <el-select
+              v-model="deviceForm.isMessagePush"
+              clearable
+              placeholder="请选择是否短信推送"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in messagePushList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="项目id" prop="devcode">
+            <el-input
+              v-model="deviceForm.devcode"
+              clearable
+              disabled
+              placeholder="未知"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { updateAlarmContent, addAlarmContent } from '@/api/systemConfig/tenantConfig'
+export default {
+  name: 'EditTenantConfig',
+  data() {
+    return {
+      // 通讯方式
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 是否生成工单
+      jobList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      // 是否开启App推送
+      appPushList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      // 是否开启短信推送
+      messagePushList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        isMessagePush: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
+        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
+        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
+        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
+        isMessagePush: [{ required: true, message: '是否开启短信推送必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        isMessagePush: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          communication: row.communication.split(','),
+          coordinateType: row.coordinateType,
+          isJobGenerate: row.isJobGenerate,
+          isAppPush: row.isAppPush,
+          isMessagePush: row.isMessagePush,
+          devcode: row.tenentId
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/system/tenant/components/dialogSysTenant.vue b/src/views/system/tenant/components/dialogSysTenant.vue
deleted file mode 100644
index 0b2d1c1..0000000
--- a/src/views/system/tenant/components/dialogSysTenant.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系人电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="历史保存天数" prop="clearDay">
-            <el-input
-              v-model="deviceForm.clearDay"
-              placeholder="请输入历史数据保存天数"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
-          <el-form-item label="组织名称" prop="deptName">
-            <el-select
-              v-model="deviceForm.deptName"
-              placeholder="请选择关联组织名称"
-              clearable
-            >
-              <el-option
-                v-for="item in deptNameList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
-export default {
-  name: 'DialogSysTenant',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情',
-        makeDep: '项目绑定组织'
-      },
-      // 组织关系列表
-      deptNameList: [
-        {
-          name: '组织名称一',
-          value: '0'
-        },
-        {
-          name: '组织名称二',
-          value: '1'
-        },
-        {
-          name: '组织名称三',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      },
-      // 表单校验规则
-      rules: {
-        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
-        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
-        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
-        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
-        this.deviceForm = {
-          tenantCode: row.tenantCode,
-          tenantName: row.tenantName,
-          linkPerson: row.linkPerson,
-          tel: row.tel,
-          clearDay: row.clearDay,
-          deptName: row.deptName
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      } else if (this.dialogStatus === 'makeDep') {
-        this.makeDept()
-      }
-    },
-    // 绑定组织关系
-    makeDept() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          deptTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('绑定成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addTenantSys(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
new file mode 100644
index 0000000..13e311c
--- /dev/null
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -0,0 +1,273 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系人电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearDay">
+            <el-input
+              v-model="deviceForm.clearDay"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <el-select
+              v-model="deviceForm.deptName"
+              placeholder="请选择关联组织名称"
+              clearable
+            >
+              <el-option
+                v-for="item in deptNameList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
+export default {
+  name: 'EditSysTenant',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情',
+        makeDep: '项目绑定组织'
+      },
+      // 组织关系列表
+      deptNameList: [
+        {
+          name: '组织名称一',
+          value: '0'
+        },
+        {
+          name: '组织名称二',
+          value: '1'
+        },
+        {
+          name: '组织名称三',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      },
+      // 表单校验规则
+      rules: {
+        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
+        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
+        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
+        this.deviceForm = {
+          tenantCode: row.tenantCode,
+          tenantName: row.tenantName,
+          linkPerson: row.linkPerson,
+          tel: row.tel,
+          clearDay: row.clearDay,
+          deptName: row.deptName
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      } else if (this.dialogStatus === 'makeDep') {
+        this.makeDept()
+      }
+    },
+    // 绑定组织关系
+    makeDept() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          deptTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addTenantSys(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
new file mode 100644
index 0000000..408328c
--- /dev/null
+++ b/src/views/system/tenant/tenantList.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="140" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/system/tenant/components/editTenant'
+import { tenantSysList, delTenantSys } from '@/api/system/tenant'
+
+export default {
+  name: 'TenantList',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '项目编码',
+          value: 'tenantCode',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '项目联系人',
+          value: 'linkPerson',
+          align: 'center'
+        },
+        {
+          text: '联系人电话',
+          value: 'tel',
+          align: 'center'
+        },
+        {
+          text: '历史数据保存天数',
+          value: 'clearDay',
+          align: 'center'
+        },
+        {
+          text: '关联组织',
+          value: 'deptId',
+          align: 'center'
+        },
+        {
+          text: '关联组织名称',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      tenantSysList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delTenantSys(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    },
+    // 绑定组织
+    makeDep(row) {
+      this.$refs.editAlarmContent.initDialog('makeDep', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantSystList.vue b/src/views/system/tenant/tenantSystList.vue
deleted file mode 100644
index 61149b2..0000000
--- a/src/views/system/tenant/tenantSystList.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="140" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" size="small" @click="makeDep(scope.row)">
-              组织
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/system/tenant/components/dialogSysTenant'
-import { tenantSysList, delTenantSys } from '@/api/system/tenant'
-
-export default {
-  name: 'TenantSystList',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '项目编码',
-          value: 'tenantCode',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '项目联系人',
-          value: 'linkPerson',
-          align: 'center'
-        },
-        {
-          text: '联系人电话',
-          value: 'tel',
-          align: 'center'
-        },
-        {
-          text: '历史数据保存天数',
-          value: 'clearDay',
-          align: 'center'
-        },
-        {
-          text: '关联组织',
-          value: 'deptId',
-          align: 'center'
-        },
-        {
-          text: '关联组织名称',
-          value: 'deptName',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      tenantSysList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delTenantSys(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    },
-    // 绑定组织
-    makeDep(row) {
-      this.$refs.dialogAlarmContent.initDialog('makeDep', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
deleted file mode 100644
index 0ea149c..0000000
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
-              clearable
-              placeholder="请输入告警内容"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警类型" prop="alarmType">
-            <el-select
-              v-model="deviceForm.alarmType"
-              placeholder="告警类型"
-              clearable
-            >
-              <el-option
-                v-for="item in alarmTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
-export default {
-  name: 'DialogAlarmContent',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
-        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        console.log(row)
-        this.deviceForm = {
-          alarmType: row.alarmType,
-          alarmContent: row.alarmContent,
-          devcode: row.id,
-          deviceType: row.deviceType.split(',')
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/editAlarmContent.vue b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
new file mode 100644
index 0000000..96e56f2
--- /dev/null
+++ b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
+              clearable
+              placeholder="请输入告警内容"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警类型" prop="alarmType">
+            <el-select
+              v-model="deviceForm.alarmType"
+              placeholder="告警类型"
+              clearable
+            >
+              <el-option
+                v-for="item in alarmTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              clearable
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
+export default {
+  name: 'EditAlarmContent',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
+        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        console.log(row)
+        this.deviceForm = {
+          alarmType: row.alarmType,
+          alarmContent: row.alarmContent,
+          devcode: row.id,
+          deviceType: row.deviceType.split(',')
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index f203f26..b7d9dab 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -73,17 +73,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import dialogAlarmContent from '@/views/systemConfig/alarmContent/components/dialogAlarmContent'
+import editAlarmContent from '@/views/systemConfig/alarmContent/components/editAlarmContent'
 import { getDevice, alarmContentList, delAlarmContent } from '@/api/systemConfig/alarmContent'
 
 export default {
   name: 'ListContent',
-  components: { dialogAlarmContent },
+  components: { editAlarmContent },
   data() {
     return {
       // 查询条件
@@ -183,11 +183,11 @@
     },
     // 新增
     add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
+      this.$refs.editAlarmContent.initDialog('create')
     },
     // 修改
     edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
+      this.$refs.editAlarmContent.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
deleted file mode 100644
index bfb0c1d..0000000
--- a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.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-col>
-        <el-col :span="12">
-          <el-form-item label="监测指标" prop="name">
-            <el-input
-              v-model="deviceForm.name"
-              clearable
-              placeholder="请输入监测指标名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="开启报警" prop="openAlarm">
-            <el-select
-              v-model="deviceForm.openAlarm"
-              placeholder="请选择是否开启报警"
-              clearable
-            >
-              <el-option
-                v-for="item in openAlarmList"
-                :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="openJob">
-            <el-select
-              v-model="deviceForm.openJob"
-              placeholder="请选择是否开启工单"
-              clearable
-            >
-              <el-option
-                v-for="item in openJobList"
-                :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="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入告警上限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入告警下限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="level">
-            <el-select
-              v-model="deviceForm.level"
-              placeholder="请选择报警等级"
-              clearable
-            >
-              <el-option
-                v-for="item in levelList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
-export default {
-  name: 'DialogAlarmLevel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: '', // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否开启报警
-      openAlarmList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 是否开启工单
-      openJobList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 报警等级
-      levelList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        },
-        {
-          name: '三级报警',
-          value: '3'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: '',
-        name: '',
-        openAlarm: '',
-        openJob: '',
-        level: '',
-        lowValue: '',
-        highValue: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
-        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
-        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
-        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
-        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmLevel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
new file mode 100644
index 0000000..4db04c2
--- /dev/null
+++ b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
@@ -0,0 +1,281 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.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-col>
+        <el-col :span="12">
+          <el-form-item label="监测指标" prop="name">
+            <el-input
+              v-model="deviceForm.name"
+              clearable
+              placeholder="请输入监测指标名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="开启报警" prop="openAlarm">
+            <el-select
+              v-model="deviceForm.openAlarm"
+              placeholder="请选择是否开启报警"
+              clearable
+            >
+              <el-option
+                v-for="item in openAlarmList"
+                :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="openJob">
+            <el-select
+              v-model="deviceForm.openJob"
+              placeholder="请选择是否开启工单"
+              clearable
+            >
+              <el-option
+                v-for="item in openJobList"
+                :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="highValue">
+            <el-input
+              v-model="deviceForm.highValue"
+              placeholder="请输入告警上限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警下限" prop="lowValue">
+            <el-input
+              v-model="deviceForm.lowValue"
+              placeholder="请输入告警下限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警等级" prop="level">
+            <el-select
+              v-model="deviceForm.level"
+              placeholder="请选择报警等级"
+              clearable
+            >
+              <el-option
+                v-for="item in levelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
+export default {
+  name: 'EditAlarmLevel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: '', // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否开启报警
+      openAlarmList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 是否开启工单
+      openJobList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 报警等级
+      levelList: [
+        {
+          name: '一级报警',
+          value: '1'
+        },
+        {
+          name: '二级报警',
+          value: '2'
+        },
+        {
+          name: '三级报警',
+          value: '3'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: '',
+        name: '',
+        openAlarm: '',
+        openJob: '',
+        level: '',
+        lowValue: '',
+        highValue: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
+        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
+        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
+        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
+        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
+        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmLevel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 193f00f..708efea 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -73,11 +73,11 @@
 import EditH2sLevel from './components/editH2sLevel'
 import EditHumiLevel from './components/editHumiLevel'
 import EditO2Level from './components/editO2Level'
-import dialogAlarmLevel from './components/dialogAlarmLevel'
+import editAlarmLevel from './components/editAlarmLevel'
 
 export default {
   name: 'ListLevel',
-  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, dialogAlarmLevel },
+  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, editAlarmLevel },
   data() {
     return {
       selectedTenant: {
@@ -181,7 +181,7 @@
     },
     // 新增
     add() {
-      this.cmpName = 'dialog-alarm-level'
+      this.cmpName = 'edit-alarm-level'
       setTimeout(() => {
         this.$refs.editdialog.initDialog('create')
       }, 100)
diff --git a/src/views/systemConfig/deptPermission/components/dialogListDept.vue b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
deleted file mode 100644
index 5d75707..0000000
--- a/src/views/systemConfig/deptPermission/components/dialogListDept.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <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="wellType">
-            <el-select
-              v-model="deviceForm.wellType"
-              clearable
-              placeholder="请选择支持井类型"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in wellTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="lng">
-            <el-input
-              v-model="deviceForm.lng"
-              clearable
-              placeholder="请输入经度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="纬度" prop="lat">
-            <el-input
-              v-model="deviceForm.lat"
-              clearable
-              placeholder="请输入纬度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="组织id" prop="deptid">
-            <el-input
-              v-model="deviceForm.deptid"
-              clearable
-              disabled
-              placeholder="请输入组织id"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
-export default {
-  name: 'DialogListDept',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 支持井类型
-      wellTypeList: [
-        {
-          label: '井类型一',
-          value: '1'
-        },
-        {
-          label: '井类型二',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      },
-      // 表单校验规则
-      rules: {
-        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
-        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDept(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDept(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
new file mode 100644
index 0000000..429076f
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <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="wellType">
+            <el-select
+              v-model="deviceForm.wellType"
+              clearable
+              placeholder="请选择支持井类型"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in wellTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="lng">
+            <el-input
+              v-model="deviceForm.lng"
+              clearable
+              placeholder="请输入经度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="纬度" prop="lat">
+            <el-input
+              v-model="deviceForm.lat"
+              clearable
+              placeholder="请输入纬度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="组织id" prop="deptid">
+            <el-input
+              v-model="deviceForm.deptid"
+              clearable
+              disabled
+              placeholder="请输入组织id"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
+export default {
+  name: 'EditDeptPermission',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 支持井类型
+      wellTypeList: [
+        {
+          label: '井类型一',
+          value: '1'
+        },
+        {
+          label: '井类型二',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      },
+      // 表单校验规则
+      rules: {
+        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
+        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDept(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDept(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
new file mode 100644
index 0000000..4305f54
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-select
+          v-model="listQuery.deptid"
+          placeholder="组织id"
+          clearable
+        >
+          <el-option
+            v-for="item in deptidList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="120" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-list-dept ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editListDept from '@/views/systemConfig/deptPermission/components/editDeptPermission'
+import { deptList, delDept } from '@/api/systemConfig/deptPermission'
+
+export default {
+  name: 'DeptPermission',
+  components: { editListDept },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        deptid: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      deptidList: [
+        {
+          label: '3213213',
+          value: '0'
+        },
+        {
+          label: '9873213',
+          value: '1'
+        }
+      ],
+      columns: [
+        {
+          text: '组织名称',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '支持井类型',
+          value: 'wellType',
+          align: 'center'
+        },
+        {
+          text: '支持设备类型',
+          value: 'deviceType',
+          align: 'center'
+        },
+        {
+          text: '地图默认中心经度',
+          value: 'lng',
+          align: 'center'
+        },
+        {
+          text: '地图默认中心纬度',
+          value: 'lat',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      deptList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDept(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/listDept.vue b/src/views/systemConfig/deptPermission/listDept.vue
deleted file mode 100644
index 738c5b1..0000000
--- a/src/views/systemConfig/deptPermission/listDept.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-select
-          v-model="listQuery.deptid"
-          placeholder="组织id"
-          clearable
-        >
-          <el-option
-            v-for="item in deptidList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="120" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-list-dept ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogListDept from '@/views/systemConfig/deptPermission/components/dialogListDept'
-import { deptList, delDept } from '@/api/systemConfig/deptPermission'
-
-export default {
-  name: 'ListDept',
-  components: { dialogListDept },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        deptid: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      deptidList: [
-        {
-          label: '3213213',
-          value: '0'
-        },
-        {
-          label: '9873213',
-          value: '1'
-        }
-      ],
-      columns: [
-        {
-          text: '组织名称',
-          value: 'deptName',
-          align: 'center'
-        },
-        {
-          text: '支持井类型',
-          value: 'wellType',
-          align: 'center'
-        },
-        {
-          text: '支持设备类型',
-          value: 'deviceType',
-          align: 'center'
-        },
-        {
-          text: '地图默认中心经度',
-          value: 'lng',
-          align: 'center'
-        },
-        {
-          text: '地图默认中心纬度',
-          value: 'lat',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      deptList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue b/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
deleted file mode 100644
index 7ca5297..0000000
--- a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
+++ /dev/null
@@ -1,347 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="通讯方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请选择支持通信方式"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="坐标系" prop="coordinateType">
-            <el-input
-              v-model="deviceForm.coordinateType"
-              placeholder="请输入数据默认坐标系"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="生成工单" prop="isJobGenerate">
-            <el-select
-              v-model="deviceForm.isJobGenerate"
-              clearable
-              placeholder="请选择是否生成工单"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in jobList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="APP推送" prop="isAppPush">
-            <el-select
-              v-model="deviceForm.isAppPush"
-              clearable
-              placeholder="请选择是否APP推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in appPushList"
-                :key="item.value"
-                :label="item.label"
-                :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="isMessagePush">
-            <el-select
-              v-model="deviceForm.isMessagePush"
-              clearable
-              placeholder="请选择是否短信推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in messagePushList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="项目id" prop="devcode">
-            <el-input
-              v-model="deviceForm.devcode"
-              clearable
-              disabled
-              placeholder="未知"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/tenantConfig'
-export default {
-  name: 'DialogListTenant',
-  data() {
-    return {
-      // 通讯方式
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 是否生成工单
-      jobList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启App推送
-      appPushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启短信推送
-      messagePushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        isMessagePush: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
-        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
-        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
-        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
-        isMessagePush: [{ required: true, message: '是否开启短信推送必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        isMessagePush: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          communication: row.communication.split(','),
-          coordinateType: row.coordinateType,
-          isJobGenerate: row.isJobGenerate,
-          isAppPush: row.isAppPush,
-          isMessagePush: row.isMessagePush,
-          devcode: row.tenentId
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
new file mode 100644
index 0000000..d1be724
--- /dev/null
+++ b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
@@ -0,0 +1,337 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="通讯方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              :disabled="dialogStatus === 'detail' ? true : false"
+              placeholder="请选择支持通信方式"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="坐标系" prop="coordinateType">
+            <el-input
+              v-model="deviceForm.coordinateType"
+              placeholder="请输入数据默认坐标系"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="生成工单" prop="isJobGenerate">
+            <el-select
+              v-model="deviceForm.isJobGenerate"
+              clearable
+              placeholder="请选择是否生成工单"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in jobList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="APP推送" prop="isAppPush">
+            <el-select
+              v-model="deviceForm.isAppPush"
+              clearable
+              placeholder="请选择是否APP推送"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in appPushList"
+                :key="item.value"
+                :label="item.label"
+                :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="isMessagePush">
+            <el-select
+              v-model="deviceForm.isMessagePush"
+              clearable
+              placeholder="请选择是否短信推送"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in messagePushList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="项目id" prop="devcode">
+            <el-input
+              v-model="deviceForm.devcode"
+              clearable
+              disabled
+              placeholder="未知"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { updateAlarmContent, addAlarmContent } from '@/api/systemConfig/tenantConfig'
+export default {
+  name: 'EditTenantConfig',
+  data() {
+    return {
+      // 通讯方式
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 是否生成工单
+      jobList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      // 是否开启App推送
+      appPushList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      // 是否开启短信推送
+      messagePushList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        isMessagePush: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
+        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
+        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
+        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
+        isMessagePush: [{ required: true, message: '是否开启短信推送必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        isMessagePush: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          communication: row.communication.split(','),
+          coordinateType: row.coordinateType,
+          isJobGenerate: row.isJobGenerate,
+          isAppPush: row.isAppPush,
+          isMessagePush: row.isMessagePush,
+          devcode: row.tenentId
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/systemConfig/tenantConfig/listTenant.vue b/src/views/systemConfig/tenantConfig/listTenant.vue
deleted file mode 100644
index 26ac194..0000000
--- a/src/views/systemConfig/tenantConfig/listTenant.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="120" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/systemConfig/tenantConfig/components/dialogListTenant'
-import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
-
-export default {
-  name: 'ListTenant',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '编号',
-          value: 'tenentId',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '支持通讯协议',
-          value: 'communication',
-          align: 'center'
-        },
-        {
-          text: '导入数据默认坐标系',
-          value: 'coordinateType',
-          align: 'center'
-        },
-        {
-          text: '是否需要生成工单',
-          value: 'isJobGenerate',
-          align: 'center'
-        },
-        {
-          text: '是否开启APP推送',
-          value: 'isAppPush',
-          align: 'center'
-        },
-        {
-          text: '是否开启短信推送',
-          value: 'isMessagePush',
-          align: 'center'
-        },
-        {
-          text: '报警推送规则',
-          value: 'alarmPushType',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      alarmTenantList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delAlarmTenant(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/system/tenant/components/dialogSysTenant.vue b/src/views/system/tenant/components/dialogSysTenant.vue
deleted file mode 100644
index 0b2d1c1..0000000
--- a/src/views/system/tenant/components/dialogSysTenant.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系人电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="历史保存天数" prop="clearDay">
-            <el-input
-              v-model="deviceForm.clearDay"
-              placeholder="请输入历史数据保存天数"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
-          <el-form-item label="组织名称" prop="deptName">
-            <el-select
-              v-model="deviceForm.deptName"
-              placeholder="请选择关联组织名称"
-              clearable
-            >
-              <el-option
-                v-for="item in deptNameList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
-export default {
-  name: 'DialogSysTenant',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情',
-        makeDep: '项目绑定组织'
-      },
-      // 组织关系列表
-      deptNameList: [
-        {
-          name: '组织名称一',
-          value: '0'
-        },
-        {
-          name: '组织名称二',
-          value: '1'
-        },
-        {
-          name: '组织名称三',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      },
-      // 表单校验规则
-      rules: {
-        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
-        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
-        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
-        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
-        this.deviceForm = {
-          tenantCode: row.tenantCode,
-          tenantName: row.tenantName,
-          linkPerson: row.linkPerson,
-          tel: row.tel,
-          clearDay: row.clearDay,
-          deptName: row.deptName
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      } else if (this.dialogStatus === 'makeDep') {
-        this.makeDept()
-      }
-    },
-    // 绑定组织关系
-    makeDept() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          deptTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('绑定成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addTenantSys(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
new file mode 100644
index 0000000..13e311c
--- /dev/null
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -0,0 +1,273 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系人电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearDay">
+            <el-input
+              v-model="deviceForm.clearDay"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <el-select
+              v-model="deviceForm.deptName"
+              placeholder="请选择关联组织名称"
+              clearable
+            >
+              <el-option
+                v-for="item in deptNameList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
+export default {
+  name: 'EditSysTenant',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情',
+        makeDep: '项目绑定组织'
+      },
+      // 组织关系列表
+      deptNameList: [
+        {
+          name: '组织名称一',
+          value: '0'
+        },
+        {
+          name: '组织名称二',
+          value: '1'
+        },
+        {
+          name: '组织名称三',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      },
+      // 表单校验规则
+      rules: {
+        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
+        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
+        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
+        this.deviceForm = {
+          tenantCode: row.tenantCode,
+          tenantName: row.tenantName,
+          linkPerson: row.linkPerson,
+          tel: row.tel,
+          clearDay: row.clearDay,
+          deptName: row.deptName
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      } else if (this.dialogStatus === 'makeDep') {
+        this.makeDept()
+      }
+    },
+    // 绑定组织关系
+    makeDept() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          deptTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addTenantSys(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
new file mode 100644
index 0000000..408328c
--- /dev/null
+++ b/src/views/system/tenant/tenantList.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="140" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/system/tenant/components/editTenant'
+import { tenantSysList, delTenantSys } from '@/api/system/tenant'
+
+export default {
+  name: 'TenantList',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '项目编码',
+          value: 'tenantCode',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '项目联系人',
+          value: 'linkPerson',
+          align: 'center'
+        },
+        {
+          text: '联系人电话',
+          value: 'tel',
+          align: 'center'
+        },
+        {
+          text: '历史数据保存天数',
+          value: 'clearDay',
+          align: 'center'
+        },
+        {
+          text: '关联组织',
+          value: 'deptId',
+          align: 'center'
+        },
+        {
+          text: '关联组织名称',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      tenantSysList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delTenantSys(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    },
+    // 绑定组织
+    makeDep(row) {
+      this.$refs.editAlarmContent.initDialog('makeDep', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantSystList.vue b/src/views/system/tenant/tenantSystList.vue
deleted file mode 100644
index 61149b2..0000000
--- a/src/views/system/tenant/tenantSystList.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="140" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" size="small" @click="makeDep(scope.row)">
-              组织
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/system/tenant/components/dialogSysTenant'
-import { tenantSysList, delTenantSys } from '@/api/system/tenant'
-
-export default {
-  name: 'TenantSystList',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '项目编码',
-          value: 'tenantCode',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '项目联系人',
-          value: 'linkPerson',
-          align: 'center'
-        },
-        {
-          text: '联系人电话',
-          value: 'tel',
-          align: 'center'
-        },
-        {
-          text: '历史数据保存天数',
-          value: 'clearDay',
-          align: 'center'
-        },
-        {
-          text: '关联组织',
-          value: 'deptId',
-          align: 'center'
-        },
-        {
-          text: '关联组织名称',
-          value: 'deptName',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      tenantSysList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delTenantSys(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    },
-    // 绑定组织
-    makeDep(row) {
-      this.$refs.dialogAlarmContent.initDialog('makeDep', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
deleted file mode 100644
index 0ea149c..0000000
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
-              clearable
-              placeholder="请输入告警内容"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警类型" prop="alarmType">
-            <el-select
-              v-model="deviceForm.alarmType"
-              placeholder="告警类型"
-              clearable
-            >
-              <el-option
-                v-for="item in alarmTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
-export default {
-  name: 'DialogAlarmContent',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
-        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        console.log(row)
-        this.deviceForm = {
-          alarmType: row.alarmType,
-          alarmContent: row.alarmContent,
-          devcode: row.id,
-          deviceType: row.deviceType.split(',')
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/editAlarmContent.vue b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
new file mode 100644
index 0000000..96e56f2
--- /dev/null
+++ b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
+              clearable
+              placeholder="请输入告警内容"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警类型" prop="alarmType">
+            <el-select
+              v-model="deviceForm.alarmType"
+              placeholder="告警类型"
+              clearable
+            >
+              <el-option
+                v-for="item in alarmTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              clearable
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
+export default {
+  name: 'EditAlarmContent',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
+        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        console.log(row)
+        this.deviceForm = {
+          alarmType: row.alarmType,
+          alarmContent: row.alarmContent,
+          devcode: row.id,
+          deviceType: row.deviceType.split(',')
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index f203f26..b7d9dab 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -73,17 +73,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import dialogAlarmContent from '@/views/systemConfig/alarmContent/components/dialogAlarmContent'
+import editAlarmContent from '@/views/systemConfig/alarmContent/components/editAlarmContent'
 import { getDevice, alarmContentList, delAlarmContent } from '@/api/systemConfig/alarmContent'
 
 export default {
   name: 'ListContent',
-  components: { dialogAlarmContent },
+  components: { editAlarmContent },
   data() {
     return {
       // 查询条件
@@ -183,11 +183,11 @@
     },
     // 新增
     add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
+      this.$refs.editAlarmContent.initDialog('create')
     },
     // 修改
     edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
+      this.$refs.editAlarmContent.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
deleted file mode 100644
index bfb0c1d..0000000
--- a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.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-col>
-        <el-col :span="12">
-          <el-form-item label="监测指标" prop="name">
-            <el-input
-              v-model="deviceForm.name"
-              clearable
-              placeholder="请输入监测指标名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="开启报警" prop="openAlarm">
-            <el-select
-              v-model="deviceForm.openAlarm"
-              placeholder="请选择是否开启报警"
-              clearable
-            >
-              <el-option
-                v-for="item in openAlarmList"
-                :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="openJob">
-            <el-select
-              v-model="deviceForm.openJob"
-              placeholder="请选择是否开启工单"
-              clearable
-            >
-              <el-option
-                v-for="item in openJobList"
-                :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="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入告警上限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入告警下限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="level">
-            <el-select
-              v-model="deviceForm.level"
-              placeholder="请选择报警等级"
-              clearable
-            >
-              <el-option
-                v-for="item in levelList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
-export default {
-  name: 'DialogAlarmLevel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: '', // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否开启报警
-      openAlarmList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 是否开启工单
-      openJobList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 报警等级
-      levelList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        },
-        {
-          name: '三级报警',
-          value: '3'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: '',
-        name: '',
-        openAlarm: '',
-        openJob: '',
-        level: '',
-        lowValue: '',
-        highValue: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
-        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
-        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
-        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
-        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmLevel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
new file mode 100644
index 0000000..4db04c2
--- /dev/null
+++ b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
@@ -0,0 +1,281 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.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-col>
+        <el-col :span="12">
+          <el-form-item label="监测指标" prop="name">
+            <el-input
+              v-model="deviceForm.name"
+              clearable
+              placeholder="请输入监测指标名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="开启报警" prop="openAlarm">
+            <el-select
+              v-model="deviceForm.openAlarm"
+              placeholder="请选择是否开启报警"
+              clearable
+            >
+              <el-option
+                v-for="item in openAlarmList"
+                :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="openJob">
+            <el-select
+              v-model="deviceForm.openJob"
+              placeholder="请选择是否开启工单"
+              clearable
+            >
+              <el-option
+                v-for="item in openJobList"
+                :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="highValue">
+            <el-input
+              v-model="deviceForm.highValue"
+              placeholder="请输入告警上限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警下限" prop="lowValue">
+            <el-input
+              v-model="deviceForm.lowValue"
+              placeholder="请输入告警下限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警等级" prop="level">
+            <el-select
+              v-model="deviceForm.level"
+              placeholder="请选择报警等级"
+              clearable
+            >
+              <el-option
+                v-for="item in levelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
+export default {
+  name: 'EditAlarmLevel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: '', // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否开启报警
+      openAlarmList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 是否开启工单
+      openJobList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 报警等级
+      levelList: [
+        {
+          name: '一级报警',
+          value: '1'
+        },
+        {
+          name: '二级报警',
+          value: '2'
+        },
+        {
+          name: '三级报警',
+          value: '3'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: '',
+        name: '',
+        openAlarm: '',
+        openJob: '',
+        level: '',
+        lowValue: '',
+        highValue: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
+        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
+        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
+        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
+        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
+        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmLevel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 193f00f..708efea 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -73,11 +73,11 @@
 import EditH2sLevel from './components/editH2sLevel'
 import EditHumiLevel from './components/editHumiLevel'
 import EditO2Level from './components/editO2Level'
-import dialogAlarmLevel from './components/dialogAlarmLevel'
+import editAlarmLevel from './components/editAlarmLevel'
 
 export default {
   name: 'ListLevel',
-  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, dialogAlarmLevel },
+  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, editAlarmLevel },
   data() {
     return {
       selectedTenant: {
@@ -181,7 +181,7 @@
     },
     // 新增
     add() {
-      this.cmpName = 'dialog-alarm-level'
+      this.cmpName = 'edit-alarm-level'
       setTimeout(() => {
         this.$refs.editdialog.initDialog('create')
       }, 100)
diff --git a/src/views/systemConfig/deptPermission/components/dialogListDept.vue b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
deleted file mode 100644
index 5d75707..0000000
--- a/src/views/systemConfig/deptPermission/components/dialogListDept.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <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="wellType">
-            <el-select
-              v-model="deviceForm.wellType"
-              clearable
-              placeholder="请选择支持井类型"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in wellTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="lng">
-            <el-input
-              v-model="deviceForm.lng"
-              clearable
-              placeholder="请输入经度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="纬度" prop="lat">
-            <el-input
-              v-model="deviceForm.lat"
-              clearable
-              placeholder="请输入纬度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="组织id" prop="deptid">
-            <el-input
-              v-model="deviceForm.deptid"
-              clearable
-              disabled
-              placeholder="请输入组织id"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
-export default {
-  name: 'DialogListDept',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 支持井类型
-      wellTypeList: [
-        {
-          label: '井类型一',
-          value: '1'
-        },
-        {
-          label: '井类型二',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      },
-      // 表单校验规则
-      rules: {
-        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
-        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDept(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDept(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
new file mode 100644
index 0000000..429076f
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <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="wellType">
+            <el-select
+              v-model="deviceForm.wellType"
+              clearable
+              placeholder="请选择支持井类型"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in wellTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="lng">
+            <el-input
+              v-model="deviceForm.lng"
+              clearable
+              placeholder="请输入经度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="纬度" prop="lat">
+            <el-input
+              v-model="deviceForm.lat"
+              clearable
+              placeholder="请输入纬度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="组织id" prop="deptid">
+            <el-input
+              v-model="deviceForm.deptid"
+              clearable
+              disabled
+              placeholder="请输入组织id"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
+export default {
+  name: 'EditDeptPermission',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 支持井类型
+      wellTypeList: [
+        {
+          label: '井类型一',
+          value: '1'
+        },
+        {
+          label: '井类型二',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      },
+      // 表单校验规则
+      rules: {
+        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
+        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDept(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDept(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
new file mode 100644
index 0000000..4305f54
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-select
+          v-model="listQuery.deptid"
+          placeholder="组织id"
+          clearable
+        >
+          <el-option
+            v-for="item in deptidList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="120" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-list-dept ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editListDept from '@/views/systemConfig/deptPermission/components/editDeptPermission'
+import { deptList, delDept } from '@/api/systemConfig/deptPermission'
+
+export default {
+  name: 'DeptPermission',
+  components: { editListDept },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        deptid: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      deptidList: [
+        {
+          label: '3213213',
+          value: '0'
+        },
+        {
+          label: '9873213',
+          value: '1'
+        }
+      ],
+      columns: [
+        {
+          text: '组织名称',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '支持井类型',
+          value: 'wellType',
+          align: 'center'
+        },
+        {
+          text: '支持设备类型',
+          value: 'deviceType',
+          align: 'center'
+        },
+        {
+          text: '地图默认中心经度',
+          value: 'lng',
+          align: 'center'
+        },
+        {
+          text: '地图默认中心纬度',
+          value: 'lat',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      deptList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDept(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/listDept.vue b/src/views/systemConfig/deptPermission/listDept.vue
deleted file mode 100644
index 738c5b1..0000000
--- a/src/views/systemConfig/deptPermission/listDept.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-select
-          v-model="listQuery.deptid"
-          placeholder="组织id"
-          clearable
-        >
-          <el-option
-            v-for="item in deptidList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="120" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-list-dept ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogListDept from '@/views/systemConfig/deptPermission/components/dialogListDept'
-import { deptList, delDept } from '@/api/systemConfig/deptPermission'
-
-export default {
-  name: 'ListDept',
-  components: { dialogListDept },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        deptid: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      deptidList: [
-        {
-          label: '3213213',
-          value: '0'
-        },
-        {
-          label: '9873213',
-          value: '1'
-        }
-      ],
-      columns: [
-        {
-          text: '组织名称',
-          value: 'deptName',
-          align: 'center'
-        },
-        {
-          text: '支持井类型',
-          value: 'wellType',
-          align: 'center'
-        },
-        {
-          text: '支持设备类型',
-          value: 'deviceType',
-          align: 'center'
-        },
-        {
-          text: '地图默认中心经度',
-          value: 'lng',
-          align: 'center'
-        },
-        {
-          text: '地图默认中心纬度',
-          value: 'lat',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      deptList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue b/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
deleted file mode 100644
index 7ca5297..0000000
--- a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
+++ /dev/null
@@ -1,347 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="通讯方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请选择支持通信方式"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="坐标系" prop="coordinateType">
-            <el-input
-              v-model="deviceForm.coordinateType"
-              placeholder="请输入数据默认坐标系"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="生成工单" prop="isJobGenerate">
-            <el-select
-              v-model="deviceForm.isJobGenerate"
-              clearable
-              placeholder="请选择是否生成工单"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in jobList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="APP推送" prop="isAppPush">
-            <el-select
-              v-model="deviceForm.isAppPush"
-              clearable
-              placeholder="请选择是否APP推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in appPushList"
-                :key="item.value"
-                :label="item.label"
-                :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="isMessagePush">
-            <el-select
-              v-model="deviceForm.isMessagePush"
-              clearable
-              placeholder="请选择是否短信推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in messagePushList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="项目id" prop="devcode">
-            <el-input
-              v-model="deviceForm.devcode"
-              clearable
-              disabled
-              placeholder="未知"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/tenantConfig'
-export default {
-  name: 'DialogListTenant',
-  data() {
-    return {
-      // 通讯方式
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 是否生成工单
-      jobList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启App推送
-      appPushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启短信推送
-      messagePushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        isMessagePush: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
-        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
-        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
-        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
-        isMessagePush: [{ required: true, message: '是否开启短信推送必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        isMessagePush: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          communication: row.communication.split(','),
-          coordinateType: row.coordinateType,
-          isJobGenerate: row.isJobGenerate,
-          isAppPush: row.isAppPush,
-          isMessagePush: row.isMessagePush,
-          devcode: row.tenentId
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
new file mode 100644
index 0000000..d1be724
--- /dev/null
+++ b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
@@ -0,0 +1,337 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="通讯方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              :disabled="dialogStatus === 'detail' ? true : false"
+              placeholder="请选择支持通信方式"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="坐标系" prop="coordinateType">
+            <el-input
+              v-model="deviceForm.coordinateType"
+              placeholder="请输入数据默认坐标系"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="生成工单" prop="isJobGenerate">
+            <el-select
+              v-model="deviceForm.isJobGenerate"
+              clearable
+              placeholder="请选择是否生成工单"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in jobList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="APP推送" prop="isAppPush">
+            <el-select
+              v-model="deviceForm.isAppPush"
+              clearable
+              placeholder="请选择是否APP推送"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in appPushList"
+                :key="item.value"
+                :label="item.label"
+                :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="isMessagePush">
+            <el-select
+              v-model="deviceForm.isMessagePush"
+              clearable
+              placeholder="请选择是否短信推送"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in messagePushList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="项目id" prop="devcode">
+            <el-input
+              v-model="deviceForm.devcode"
+              clearable
+              disabled
+              placeholder="未知"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { updateAlarmContent, addAlarmContent } from '@/api/systemConfig/tenantConfig'
+export default {
+  name: 'EditTenantConfig',
+  data() {
+    return {
+      // 通讯方式
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 是否生成工单
+      jobList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      // 是否开启App推送
+      appPushList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      // 是否开启短信推送
+      messagePushList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        isMessagePush: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
+        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
+        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
+        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
+        isMessagePush: [{ required: true, message: '是否开启短信推送必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        isMessagePush: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          communication: row.communication.split(','),
+          coordinateType: row.coordinateType,
+          isJobGenerate: row.isJobGenerate,
+          isAppPush: row.isAppPush,
+          isMessagePush: row.isMessagePush,
+          devcode: row.tenentId
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/systemConfig/tenantConfig/listTenant.vue b/src/views/systemConfig/tenantConfig/listTenant.vue
deleted file mode 100644
index 26ac194..0000000
--- a/src/views/systemConfig/tenantConfig/listTenant.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="120" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/systemConfig/tenantConfig/components/dialogListTenant'
-import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
-
-export default {
-  name: 'ListTenant',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '编号',
-          value: 'tenentId',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '支持通讯协议',
-          value: 'communication',
-          align: 'center'
-        },
-        {
-          text: '导入数据默认坐标系',
-          value: 'coordinateType',
-          align: 'center'
-        },
-        {
-          text: '是否需要生成工单',
-          value: 'isJobGenerate',
-          align: 'center'
-        },
-        {
-          text: '是否开启APP推送',
-          value: 'isAppPush',
-          align: 'center'
-        },
-        {
-          text: '是否开启短信推送',
-          value: 'isMessagePush',
-          align: 'center'
-        },
-        {
-          text: '报警推送规则',
-          value: 'alarmPushType',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      alarmTenantList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delAlarmTenant(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
new file mode 100644
index 0000000..58b9aac
--- /dev/null
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -0,0 +1,180 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="120" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/systemConfig/tenantConfig/components/editTenantConfig'
+import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
+
+export default {
+  name: 'TenantConfig',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '编号',
+          value: 'tenentId',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '支持通讯协议',
+          value: 'communication',
+          align: 'center'
+        },
+        {
+          text: '导入数据默认坐标系',
+          value: 'coordinateType',
+          align: 'center'
+        },
+        {
+          text: '是否需要生成工单',
+          value: 'isJobGenerate',
+          align: 'center'
+        },
+        {
+          text: '是否开启APP推送',
+          value: 'isAppPush',
+          align: 'center'
+        },
+        {
+          text: '是否开启短信推送',
+          value: 'isMessagePush',
+          align: 'center'
+        },
+        {
+          text: '报警推送规则',
+          value: 'alarmPushType',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      alarmTenantList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delAlarmTenant(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/system/tenant/components/dialogSysTenant.vue b/src/views/system/tenant/components/dialogSysTenant.vue
deleted file mode 100644
index 0b2d1c1..0000000
--- a/src/views/system/tenant/components/dialogSysTenant.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系人电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="历史保存天数" prop="clearDay">
-            <el-input
-              v-model="deviceForm.clearDay"
-              placeholder="请输入历史数据保存天数"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
-          <el-form-item label="组织名称" prop="deptName">
-            <el-select
-              v-model="deviceForm.deptName"
-              placeholder="请选择关联组织名称"
-              clearable
-            >
-              <el-option
-                v-for="item in deptNameList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
-export default {
-  name: 'DialogSysTenant',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情',
-        makeDep: '项目绑定组织'
-      },
-      // 组织关系列表
-      deptNameList: [
-        {
-          name: '组织名称一',
-          value: '0'
-        },
-        {
-          name: '组织名称二',
-          value: '1'
-        },
-        {
-          name: '组织名称三',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      },
-      // 表单校验规则
-      rules: {
-        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
-        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
-        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
-        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
-        this.deviceForm = {
-          tenantCode: row.tenantCode,
-          tenantName: row.tenantName,
-          linkPerson: row.linkPerson,
-          tel: row.tel,
-          clearDay: row.clearDay,
-          deptName: row.deptName
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      } else if (this.dialogStatus === 'makeDep') {
-        this.makeDept()
-      }
-    },
-    // 绑定组织关系
-    makeDept() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          deptTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('绑定成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addTenantSys(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
new file mode 100644
index 0000000..13e311c
--- /dev/null
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -0,0 +1,273 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系人电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearDay">
+            <el-input
+              v-model="deviceForm.clearDay"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <el-select
+              v-model="deviceForm.deptName"
+              placeholder="请选择关联组织名称"
+              clearable
+            >
+              <el-option
+                v-for="item in deptNameList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
+export default {
+  name: 'EditSysTenant',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情',
+        makeDep: '项目绑定组织'
+      },
+      // 组织关系列表
+      deptNameList: [
+        {
+          name: '组织名称一',
+          value: '0'
+        },
+        {
+          name: '组织名称二',
+          value: '1'
+        },
+        {
+          name: '组织名称三',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      },
+      // 表单校验规则
+      rules: {
+        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
+        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
+        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
+        this.deviceForm = {
+          tenantCode: row.tenantCode,
+          tenantName: row.tenantName,
+          linkPerson: row.linkPerson,
+          tel: row.tel,
+          clearDay: row.clearDay,
+          deptName: row.deptName
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      } else if (this.dialogStatus === 'makeDep') {
+        this.makeDept()
+      }
+    },
+    // 绑定组织关系
+    makeDept() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          deptTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addTenantSys(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
new file mode 100644
index 0000000..408328c
--- /dev/null
+++ b/src/views/system/tenant/tenantList.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="140" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/system/tenant/components/editTenant'
+import { tenantSysList, delTenantSys } from '@/api/system/tenant'
+
+export default {
+  name: 'TenantList',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '项目编码',
+          value: 'tenantCode',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '项目联系人',
+          value: 'linkPerson',
+          align: 'center'
+        },
+        {
+          text: '联系人电话',
+          value: 'tel',
+          align: 'center'
+        },
+        {
+          text: '历史数据保存天数',
+          value: 'clearDay',
+          align: 'center'
+        },
+        {
+          text: '关联组织',
+          value: 'deptId',
+          align: 'center'
+        },
+        {
+          text: '关联组织名称',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      tenantSysList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delTenantSys(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    },
+    // 绑定组织
+    makeDep(row) {
+      this.$refs.editAlarmContent.initDialog('makeDep', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantSystList.vue b/src/views/system/tenant/tenantSystList.vue
deleted file mode 100644
index 61149b2..0000000
--- a/src/views/system/tenant/tenantSystList.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="140" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" size="small" @click="makeDep(scope.row)">
-              组织
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/system/tenant/components/dialogSysTenant'
-import { tenantSysList, delTenantSys } from '@/api/system/tenant'
-
-export default {
-  name: 'TenantSystList',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '项目编码',
-          value: 'tenantCode',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '项目联系人',
-          value: 'linkPerson',
-          align: 'center'
-        },
-        {
-          text: '联系人电话',
-          value: 'tel',
-          align: 'center'
-        },
-        {
-          text: '历史数据保存天数',
-          value: 'clearDay',
-          align: 'center'
-        },
-        {
-          text: '关联组织',
-          value: 'deptId',
-          align: 'center'
-        },
-        {
-          text: '关联组织名称',
-          value: 'deptName',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      tenantSysList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delTenantSys(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    },
-    // 绑定组织
-    makeDep(row) {
-      this.$refs.dialogAlarmContent.initDialog('makeDep', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
deleted file mode 100644
index 0ea149c..0000000
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
-              clearable
-              placeholder="请输入告警内容"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警类型" prop="alarmType">
-            <el-select
-              v-model="deviceForm.alarmType"
-              placeholder="告警类型"
-              clearable
-            >
-              <el-option
-                v-for="item in alarmTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
-export default {
-  name: 'DialogAlarmContent',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
-        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        console.log(row)
-        this.deviceForm = {
-          alarmType: row.alarmType,
-          alarmContent: row.alarmContent,
-          devcode: row.id,
-          deviceType: row.deviceType.split(',')
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/editAlarmContent.vue b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
new file mode 100644
index 0000000..96e56f2
--- /dev/null
+++ b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
+              clearable
+              placeholder="请输入告警内容"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警类型" prop="alarmType">
+            <el-select
+              v-model="deviceForm.alarmType"
+              placeholder="告警类型"
+              clearable
+            >
+              <el-option
+                v-for="item in alarmTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              clearable
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
+export default {
+  name: 'EditAlarmContent',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
+        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        console.log(row)
+        this.deviceForm = {
+          alarmType: row.alarmType,
+          alarmContent: row.alarmContent,
+          devcode: row.id,
+          deviceType: row.deviceType.split(',')
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index f203f26..b7d9dab 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -73,17 +73,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import dialogAlarmContent from '@/views/systemConfig/alarmContent/components/dialogAlarmContent'
+import editAlarmContent from '@/views/systemConfig/alarmContent/components/editAlarmContent'
 import { getDevice, alarmContentList, delAlarmContent } from '@/api/systemConfig/alarmContent'
 
 export default {
   name: 'ListContent',
-  components: { dialogAlarmContent },
+  components: { editAlarmContent },
   data() {
     return {
       // 查询条件
@@ -183,11 +183,11 @@
     },
     // 新增
     add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
+      this.$refs.editAlarmContent.initDialog('create')
     },
     // 修改
     edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
+      this.$refs.editAlarmContent.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
deleted file mode 100644
index bfb0c1d..0000000
--- a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.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-col>
-        <el-col :span="12">
-          <el-form-item label="监测指标" prop="name">
-            <el-input
-              v-model="deviceForm.name"
-              clearable
-              placeholder="请输入监测指标名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="开启报警" prop="openAlarm">
-            <el-select
-              v-model="deviceForm.openAlarm"
-              placeholder="请选择是否开启报警"
-              clearable
-            >
-              <el-option
-                v-for="item in openAlarmList"
-                :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="openJob">
-            <el-select
-              v-model="deviceForm.openJob"
-              placeholder="请选择是否开启工单"
-              clearable
-            >
-              <el-option
-                v-for="item in openJobList"
-                :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="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入告警上限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入告警下限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="level">
-            <el-select
-              v-model="deviceForm.level"
-              placeholder="请选择报警等级"
-              clearable
-            >
-              <el-option
-                v-for="item in levelList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
-export default {
-  name: 'DialogAlarmLevel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: '', // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否开启报警
-      openAlarmList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 是否开启工单
-      openJobList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 报警等级
-      levelList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        },
-        {
-          name: '三级报警',
-          value: '3'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: '',
-        name: '',
-        openAlarm: '',
-        openJob: '',
-        level: '',
-        lowValue: '',
-        highValue: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
-        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
-        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
-        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
-        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmLevel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
new file mode 100644
index 0000000..4db04c2
--- /dev/null
+++ b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
@@ -0,0 +1,281 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.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-col>
+        <el-col :span="12">
+          <el-form-item label="监测指标" prop="name">
+            <el-input
+              v-model="deviceForm.name"
+              clearable
+              placeholder="请输入监测指标名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="开启报警" prop="openAlarm">
+            <el-select
+              v-model="deviceForm.openAlarm"
+              placeholder="请选择是否开启报警"
+              clearable
+            >
+              <el-option
+                v-for="item in openAlarmList"
+                :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="openJob">
+            <el-select
+              v-model="deviceForm.openJob"
+              placeholder="请选择是否开启工单"
+              clearable
+            >
+              <el-option
+                v-for="item in openJobList"
+                :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="highValue">
+            <el-input
+              v-model="deviceForm.highValue"
+              placeholder="请输入告警上限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警下限" prop="lowValue">
+            <el-input
+              v-model="deviceForm.lowValue"
+              placeholder="请输入告警下限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警等级" prop="level">
+            <el-select
+              v-model="deviceForm.level"
+              placeholder="请选择报警等级"
+              clearable
+            >
+              <el-option
+                v-for="item in levelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
+export default {
+  name: 'EditAlarmLevel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: '', // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否开启报警
+      openAlarmList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 是否开启工单
+      openJobList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 报警等级
+      levelList: [
+        {
+          name: '一级报警',
+          value: '1'
+        },
+        {
+          name: '二级报警',
+          value: '2'
+        },
+        {
+          name: '三级报警',
+          value: '3'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: '',
+        name: '',
+        openAlarm: '',
+        openJob: '',
+        level: '',
+        lowValue: '',
+        highValue: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
+        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
+        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
+        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
+        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
+        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmLevel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 193f00f..708efea 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -73,11 +73,11 @@
 import EditH2sLevel from './components/editH2sLevel'
 import EditHumiLevel from './components/editHumiLevel'
 import EditO2Level from './components/editO2Level'
-import dialogAlarmLevel from './components/dialogAlarmLevel'
+import editAlarmLevel from './components/editAlarmLevel'
 
 export default {
   name: 'ListLevel',
-  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, dialogAlarmLevel },
+  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, editAlarmLevel },
   data() {
     return {
       selectedTenant: {
@@ -181,7 +181,7 @@
     },
     // 新增
     add() {
-      this.cmpName = 'dialog-alarm-level'
+      this.cmpName = 'edit-alarm-level'
       setTimeout(() => {
         this.$refs.editdialog.initDialog('create')
       }, 100)
diff --git a/src/views/systemConfig/deptPermission/components/dialogListDept.vue b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
deleted file mode 100644
index 5d75707..0000000
--- a/src/views/systemConfig/deptPermission/components/dialogListDept.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <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="wellType">
-            <el-select
-              v-model="deviceForm.wellType"
-              clearable
-              placeholder="请选择支持井类型"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in wellTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="lng">
-            <el-input
-              v-model="deviceForm.lng"
-              clearable
-              placeholder="请输入经度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="纬度" prop="lat">
-            <el-input
-              v-model="deviceForm.lat"
-              clearable
-              placeholder="请输入纬度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="组织id" prop="deptid">
-            <el-input
-              v-model="deviceForm.deptid"
-              clearable
-              disabled
-              placeholder="请输入组织id"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
-export default {
-  name: 'DialogListDept',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 支持井类型
-      wellTypeList: [
-        {
-          label: '井类型一',
-          value: '1'
-        },
-        {
-          label: '井类型二',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      },
-      // 表单校验规则
-      rules: {
-        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
-        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDept(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDept(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
new file mode 100644
index 0000000..429076f
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <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="wellType">
+            <el-select
+              v-model="deviceForm.wellType"
+              clearable
+              placeholder="请选择支持井类型"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in wellTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="lng">
+            <el-input
+              v-model="deviceForm.lng"
+              clearable
+              placeholder="请输入经度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="纬度" prop="lat">
+            <el-input
+              v-model="deviceForm.lat"
+              clearable
+              placeholder="请输入纬度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="组织id" prop="deptid">
+            <el-input
+              v-model="deviceForm.deptid"
+              clearable
+              disabled
+              placeholder="请输入组织id"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
+export default {
+  name: 'EditDeptPermission',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 支持井类型
+      wellTypeList: [
+        {
+          label: '井类型一',
+          value: '1'
+        },
+        {
+          label: '井类型二',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      },
+      // 表单校验规则
+      rules: {
+        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
+        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDept(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDept(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
new file mode 100644
index 0000000..4305f54
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-select
+          v-model="listQuery.deptid"
+          placeholder="组织id"
+          clearable
+        >
+          <el-option
+            v-for="item in deptidList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="120" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-list-dept ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editListDept from '@/views/systemConfig/deptPermission/components/editDeptPermission'
+import { deptList, delDept } from '@/api/systemConfig/deptPermission'
+
+export default {
+  name: 'DeptPermission',
+  components: { editListDept },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        deptid: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      deptidList: [
+        {
+          label: '3213213',
+          value: '0'
+        },
+        {
+          label: '9873213',
+          value: '1'
+        }
+      ],
+      columns: [
+        {
+          text: '组织名称',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '支持井类型',
+          value: 'wellType',
+          align: 'center'
+        },
+        {
+          text: '支持设备类型',
+          value: 'deviceType',
+          align: 'center'
+        },
+        {
+          text: '地图默认中心经度',
+          value: 'lng',
+          align: 'center'
+        },
+        {
+          text: '地图默认中心纬度',
+          value: 'lat',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      deptList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDept(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/listDept.vue b/src/views/systemConfig/deptPermission/listDept.vue
deleted file mode 100644
index 738c5b1..0000000
--- a/src/views/systemConfig/deptPermission/listDept.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-select
-          v-model="listQuery.deptid"
-          placeholder="组织id"
-          clearable
-        >
-          <el-option
-            v-for="item in deptidList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="120" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-list-dept ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogListDept from '@/views/systemConfig/deptPermission/components/dialogListDept'
-import { deptList, delDept } from '@/api/systemConfig/deptPermission'
-
-export default {
-  name: 'ListDept',
-  components: { dialogListDept },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        deptid: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      deptidList: [
-        {
-          label: '3213213',
-          value: '0'
-        },
-        {
-          label: '9873213',
-          value: '1'
-        }
-      ],
-      columns: [
-        {
-          text: '组织名称',
-          value: 'deptName',
-          align: 'center'
-        },
-        {
-          text: '支持井类型',
-          value: 'wellType',
-          align: 'center'
-        },
-        {
-          text: '支持设备类型',
-          value: 'deviceType',
-          align: 'center'
-        },
-        {
-          text: '地图默认中心经度',
-          value: 'lng',
-          align: 'center'
-        },
-        {
-          text: '地图默认中心纬度',
-          value: 'lat',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      deptList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue b/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
deleted file mode 100644
index 7ca5297..0000000
--- a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
+++ /dev/null
@@ -1,347 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="通讯方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请选择支持通信方式"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="坐标系" prop="coordinateType">
-            <el-input
-              v-model="deviceForm.coordinateType"
-              placeholder="请输入数据默认坐标系"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="生成工单" prop="isJobGenerate">
-            <el-select
-              v-model="deviceForm.isJobGenerate"
-              clearable
-              placeholder="请选择是否生成工单"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in jobList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="APP推送" prop="isAppPush">
-            <el-select
-              v-model="deviceForm.isAppPush"
-              clearable
-              placeholder="请选择是否APP推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in appPushList"
-                :key="item.value"
-                :label="item.label"
-                :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="isMessagePush">
-            <el-select
-              v-model="deviceForm.isMessagePush"
-              clearable
-              placeholder="请选择是否短信推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in messagePushList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="项目id" prop="devcode">
-            <el-input
-              v-model="deviceForm.devcode"
-              clearable
-              disabled
-              placeholder="未知"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/tenantConfig'
-export default {
-  name: 'DialogListTenant',
-  data() {
-    return {
-      // 通讯方式
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 是否生成工单
-      jobList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启App推送
-      appPushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启短信推送
-      messagePushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        isMessagePush: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
-        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
-        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
-        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
-        isMessagePush: [{ required: true, message: '是否开启短信推送必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        isMessagePush: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          communication: row.communication.split(','),
-          coordinateType: row.coordinateType,
-          isJobGenerate: row.isJobGenerate,
-          isAppPush: row.isAppPush,
-          isMessagePush: row.isMessagePush,
-          devcode: row.tenentId
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
new file mode 100644
index 0000000..d1be724
--- /dev/null
+++ b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
@@ -0,0 +1,337 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="通讯方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              :disabled="dialogStatus === 'detail' ? true : false"
+              placeholder="请选择支持通信方式"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="坐标系" prop="coordinateType">
+            <el-input
+              v-model="deviceForm.coordinateType"
+              placeholder="请输入数据默认坐标系"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="生成工单" prop="isJobGenerate">
+            <el-select
+              v-model="deviceForm.isJobGenerate"
+              clearable
+              placeholder="请选择是否生成工单"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in jobList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="APP推送" prop="isAppPush">
+            <el-select
+              v-model="deviceForm.isAppPush"
+              clearable
+              placeholder="请选择是否APP推送"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in appPushList"
+                :key="item.value"
+                :label="item.label"
+                :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="isMessagePush">
+            <el-select
+              v-model="deviceForm.isMessagePush"
+              clearable
+              placeholder="请选择是否短信推送"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in messagePushList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="项目id" prop="devcode">
+            <el-input
+              v-model="deviceForm.devcode"
+              clearable
+              disabled
+              placeholder="未知"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { updateAlarmContent, addAlarmContent } from '@/api/systemConfig/tenantConfig'
+export default {
+  name: 'EditTenantConfig',
+  data() {
+    return {
+      // 通讯方式
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 是否生成工单
+      jobList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      // 是否开启App推送
+      appPushList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      // 是否开启短信推送
+      messagePushList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        isMessagePush: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
+        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
+        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
+        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
+        isMessagePush: [{ required: true, message: '是否开启短信推送必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        isMessagePush: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          communication: row.communication.split(','),
+          coordinateType: row.coordinateType,
+          isJobGenerate: row.isJobGenerate,
+          isAppPush: row.isAppPush,
+          isMessagePush: row.isMessagePush,
+          devcode: row.tenentId
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/systemConfig/tenantConfig/listTenant.vue b/src/views/systemConfig/tenantConfig/listTenant.vue
deleted file mode 100644
index 26ac194..0000000
--- a/src/views/systemConfig/tenantConfig/listTenant.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="120" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/systemConfig/tenantConfig/components/dialogListTenant'
-import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
-
-export default {
-  name: 'ListTenant',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '编号',
-          value: 'tenentId',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '支持通讯协议',
-          value: 'communication',
-          align: 'center'
-        },
-        {
-          text: '导入数据默认坐标系',
-          value: 'coordinateType',
-          align: 'center'
-        },
-        {
-          text: '是否需要生成工单',
-          value: 'isJobGenerate',
-          align: 'center'
-        },
-        {
-          text: '是否开启APP推送',
-          value: 'isAppPush',
-          align: 'center'
-        },
-        {
-          text: '是否开启短信推送',
-          value: 'isMessagePush',
-          align: 'center'
-        },
-        {
-          text: '报警推送规则',
-          value: 'alarmPushType',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      alarmTenantList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delAlarmTenant(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
new file mode 100644
index 0000000..58b9aac
--- /dev/null
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -0,0 +1,180 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="120" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/systemConfig/tenantConfig/components/editTenantConfig'
+import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
+
+export default {
+  name: 'TenantConfig',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '编号',
+          value: 'tenentId',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '支持通讯协议',
+          value: 'communication',
+          align: 'center'
+        },
+        {
+          text: '导入数据默认坐标系',
+          value: 'coordinateType',
+          align: 'center'
+        },
+        {
+          text: '是否需要生成工单',
+          value: 'isJobGenerate',
+          align: 'center'
+        },
+        {
+          text: '是否开启APP推送',
+          value: 'isAppPush',
+          align: 'center'
+        },
+        {
+          text: '是否开启短信推送',
+          value: 'isMessagePush',
+          align: 'center'
+        },
+        {
+          text: '报警推送规则',
+          value: 'alarmPushType',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      alarmTenantList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delAlarmTenant(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/warningManage/components/dialogListWarning.vue b/src/views/warningManage/components/dialogListWarning.vue
deleted file mode 100644
index 010a00e..0000000
--- a/src/views/warningManage/components/dialogListWarning.vue
+++ /dev/null
@@ -1,293 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入报警下限"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="报警上限" prop="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入报警上限"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="操作人姓名" prop="openAtor">
-            <el-input
-              v-model="deviceForm.openAtor"
-              placeholder="请输入操作人姓名"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="超时时间" prop="overTime">
-            <el-date-picker
-              v-model="deviceForm.overTime"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              clearable
-              placeholder="请选择超时时间"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="突然阈值" prop="saltaTion">
-            <el-input
-              v-model="deviceForm.saltaTion"
-              clearable
-              placeholder="请输入突然阈值"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="时间戳" prop="ts">
-            <el-date-picker
-              v-model="deviceForm.ts"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              clearable
-              placeholder="请选择时间戳"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="grade">
-            <el-select
-              v-model="deviceForm.grade"
-              placeholder="请选择报警等级"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in gradeList"
-                :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="sensorCode">
-            <el-input
-              v-model="deviceForm.sensorCode"
-              clearable
-              placeholder="请输入传感器编号"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devCode">
-            <el-input
-              v-model="deviceForm.devCode"
-              clearable
-              disabled
-              placeholder="请输入设备编号"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { updateWarningRule, addWarningRule } from '@/api/warning/warningRule'
-export default {
-  name: 'DialogListWarning',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 报警等级
-      gradeList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        highValue: '',
-        lowValue: '',
-        overTime: '',
-        saltaTion: '',
-        sensorCode: '',
-        grade: '',
-        ts: '',
-        openAtor: '',
-        devCode: ''
-      },
-      // 表单校验规则
-      rules: {
-        highValue: [{ required: true, message: '报警上限不能为空', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '报警下限不能为空', trigger: ['blur', 'change'] }],
-        overTime: [{ required: true, message: '超时时间必选', trigger: ['blur', 'change'] }],
-        saltaTion: [{ required: true, message: '突然阈值不能为空', trigger: ['blur', 'change'] }],
-        sensorCode: [{ required: true, message: '传感器编号不能为空', trigger: ['blur', 'change'] }],
-        grade: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        ts: [{ required: true, message: '时间戳必选', trigger: ['blur', 'change'] }],
-        openAtor: [{ required: true, message: '操作人姓名不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        highValue: '',
-        lowValue: '',
-        overTime: '',
-        saltaTion: '',
-        sensorCode: '',
-        grade: '',
-        ts: '',
-        openAtor: '',
-        devCode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          highValue: row.highValue,
-          lowValue: row.lowValue,
-          overTime: row.overTime,
-          saltaTion: row.saltaTion,
-          sensorCode: row.sensorCode,
-          grade: row.grade,
-          ts: row.ts,
-          openAtor: row.openAtor,
-          devCode: row.devCode
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateWarningRule(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addWarningRule(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/system/tenant/components/dialogSysTenant.vue b/src/views/system/tenant/components/dialogSysTenant.vue
deleted file mode 100644
index 0b2d1c1..0000000
--- a/src/views/system/tenant/components/dialogSysTenant.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系人电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="历史保存天数" prop="clearDay">
-            <el-input
-              v-model="deviceForm.clearDay"
-              placeholder="请输入历史数据保存天数"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
-          <el-form-item label="组织名称" prop="deptName">
-            <el-select
-              v-model="deviceForm.deptName"
-              placeholder="请选择关联组织名称"
-              clearable
-            >
-              <el-option
-                v-for="item in deptNameList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
-export default {
-  name: 'DialogSysTenant',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情',
-        makeDep: '项目绑定组织'
-      },
-      // 组织关系列表
-      deptNameList: [
-        {
-          name: '组织名称一',
-          value: '0'
-        },
-        {
-          name: '组织名称二',
-          value: '1'
-        },
-        {
-          name: '组织名称三',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      },
-      // 表单校验规则
-      rules: {
-        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
-        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
-        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
-        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
-        this.deviceForm = {
-          tenantCode: row.tenantCode,
-          tenantName: row.tenantName,
-          linkPerson: row.linkPerson,
-          tel: row.tel,
-          clearDay: row.clearDay,
-          deptName: row.deptName
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      } else if (this.dialogStatus === 'makeDep') {
-        this.makeDept()
-      }
-    },
-    // 绑定组织关系
-    makeDept() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          deptTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('绑定成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addTenantSys(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
new file mode 100644
index 0000000..13e311c
--- /dev/null
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -0,0 +1,273 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系人电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearDay">
+            <el-input
+              v-model="deviceForm.clearDay"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <el-select
+              v-model="deviceForm.deptName"
+              placeholder="请选择关联组织名称"
+              clearable
+            >
+              <el-option
+                v-for="item in deptNameList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
+export default {
+  name: 'EditSysTenant',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情',
+        makeDep: '项目绑定组织'
+      },
+      // 组织关系列表
+      deptNameList: [
+        {
+          name: '组织名称一',
+          value: '0'
+        },
+        {
+          name: '组织名称二',
+          value: '1'
+        },
+        {
+          name: '组织名称三',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      },
+      // 表单校验规则
+      rules: {
+        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
+        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
+        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
+        this.deviceForm = {
+          tenantCode: row.tenantCode,
+          tenantName: row.tenantName,
+          linkPerson: row.linkPerson,
+          tel: row.tel,
+          clearDay: row.clearDay,
+          deptName: row.deptName
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      } else if (this.dialogStatus === 'makeDep') {
+        this.makeDept()
+      }
+    },
+    // 绑定组织关系
+    makeDept() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          deptTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addTenantSys(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
new file mode 100644
index 0000000..408328c
--- /dev/null
+++ b/src/views/system/tenant/tenantList.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="140" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/system/tenant/components/editTenant'
+import { tenantSysList, delTenantSys } from '@/api/system/tenant'
+
+export default {
+  name: 'TenantList',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '项目编码',
+          value: 'tenantCode',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '项目联系人',
+          value: 'linkPerson',
+          align: 'center'
+        },
+        {
+          text: '联系人电话',
+          value: 'tel',
+          align: 'center'
+        },
+        {
+          text: '历史数据保存天数',
+          value: 'clearDay',
+          align: 'center'
+        },
+        {
+          text: '关联组织',
+          value: 'deptId',
+          align: 'center'
+        },
+        {
+          text: '关联组织名称',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      tenantSysList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delTenantSys(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    },
+    // 绑定组织
+    makeDep(row) {
+      this.$refs.editAlarmContent.initDialog('makeDep', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantSystList.vue b/src/views/system/tenant/tenantSystList.vue
deleted file mode 100644
index 61149b2..0000000
--- a/src/views/system/tenant/tenantSystList.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="140" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" size="small" @click="makeDep(scope.row)">
-              组织
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/system/tenant/components/dialogSysTenant'
-import { tenantSysList, delTenantSys } from '@/api/system/tenant'
-
-export default {
-  name: 'TenantSystList',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '项目编码',
-          value: 'tenantCode',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '项目联系人',
-          value: 'linkPerson',
-          align: 'center'
-        },
-        {
-          text: '联系人电话',
-          value: 'tel',
-          align: 'center'
-        },
-        {
-          text: '历史数据保存天数',
-          value: 'clearDay',
-          align: 'center'
-        },
-        {
-          text: '关联组织',
-          value: 'deptId',
-          align: 'center'
-        },
-        {
-          text: '关联组织名称',
-          value: 'deptName',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      tenantSysList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delTenantSys(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    },
-    // 绑定组织
-    makeDep(row) {
-      this.$refs.dialogAlarmContent.initDialog('makeDep', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
deleted file mode 100644
index 0ea149c..0000000
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
-              clearable
-              placeholder="请输入告警内容"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警类型" prop="alarmType">
-            <el-select
-              v-model="deviceForm.alarmType"
-              placeholder="告警类型"
-              clearable
-            >
-              <el-option
-                v-for="item in alarmTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
-export default {
-  name: 'DialogAlarmContent',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
-        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        console.log(row)
-        this.deviceForm = {
-          alarmType: row.alarmType,
-          alarmContent: row.alarmContent,
-          devcode: row.id,
-          deviceType: row.deviceType.split(',')
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/editAlarmContent.vue b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
new file mode 100644
index 0000000..96e56f2
--- /dev/null
+++ b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
+              clearable
+              placeholder="请输入告警内容"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警类型" prop="alarmType">
+            <el-select
+              v-model="deviceForm.alarmType"
+              placeholder="告警类型"
+              clearable
+            >
+              <el-option
+                v-for="item in alarmTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              clearable
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
+export default {
+  name: 'EditAlarmContent',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
+        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        console.log(row)
+        this.deviceForm = {
+          alarmType: row.alarmType,
+          alarmContent: row.alarmContent,
+          devcode: row.id,
+          deviceType: row.deviceType.split(',')
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index f203f26..b7d9dab 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -73,17 +73,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import dialogAlarmContent from '@/views/systemConfig/alarmContent/components/dialogAlarmContent'
+import editAlarmContent from '@/views/systemConfig/alarmContent/components/editAlarmContent'
 import { getDevice, alarmContentList, delAlarmContent } from '@/api/systemConfig/alarmContent'
 
 export default {
   name: 'ListContent',
-  components: { dialogAlarmContent },
+  components: { editAlarmContent },
   data() {
     return {
       // 查询条件
@@ -183,11 +183,11 @@
     },
     // 新增
     add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
+      this.$refs.editAlarmContent.initDialog('create')
     },
     // 修改
     edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
+      this.$refs.editAlarmContent.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
deleted file mode 100644
index bfb0c1d..0000000
--- a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.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-col>
-        <el-col :span="12">
-          <el-form-item label="监测指标" prop="name">
-            <el-input
-              v-model="deviceForm.name"
-              clearable
-              placeholder="请输入监测指标名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="开启报警" prop="openAlarm">
-            <el-select
-              v-model="deviceForm.openAlarm"
-              placeholder="请选择是否开启报警"
-              clearable
-            >
-              <el-option
-                v-for="item in openAlarmList"
-                :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="openJob">
-            <el-select
-              v-model="deviceForm.openJob"
-              placeholder="请选择是否开启工单"
-              clearable
-            >
-              <el-option
-                v-for="item in openJobList"
-                :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="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入告警上限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入告警下限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="level">
-            <el-select
-              v-model="deviceForm.level"
-              placeholder="请选择报警等级"
-              clearable
-            >
-              <el-option
-                v-for="item in levelList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
-export default {
-  name: 'DialogAlarmLevel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: '', // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否开启报警
-      openAlarmList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 是否开启工单
-      openJobList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 报警等级
-      levelList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        },
-        {
-          name: '三级报警',
-          value: '3'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: '',
-        name: '',
-        openAlarm: '',
-        openJob: '',
-        level: '',
-        lowValue: '',
-        highValue: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
-        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
-        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
-        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
-        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmLevel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
new file mode 100644
index 0000000..4db04c2
--- /dev/null
+++ b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
@@ -0,0 +1,281 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.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-col>
+        <el-col :span="12">
+          <el-form-item label="监测指标" prop="name">
+            <el-input
+              v-model="deviceForm.name"
+              clearable
+              placeholder="请输入监测指标名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="开启报警" prop="openAlarm">
+            <el-select
+              v-model="deviceForm.openAlarm"
+              placeholder="请选择是否开启报警"
+              clearable
+            >
+              <el-option
+                v-for="item in openAlarmList"
+                :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="openJob">
+            <el-select
+              v-model="deviceForm.openJob"
+              placeholder="请选择是否开启工单"
+              clearable
+            >
+              <el-option
+                v-for="item in openJobList"
+                :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="highValue">
+            <el-input
+              v-model="deviceForm.highValue"
+              placeholder="请输入告警上限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警下限" prop="lowValue">
+            <el-input
+              v-model="deviceForm.lowValue"
+              placeholder="请输入告警下限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警等级" prop="level">
+            <el-select
+              v-model="deviceForm.level"
+              placeholder="请选择报警等级"
+              clearable
+            >
+              <el-option
+                v-for="item in levelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
+export default {
+  name: 'EditAlarmLevel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: '', // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否开启报警
+      openAlarmList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 是否开启工单
+      openJobList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 报警等级
+      levelList: [
+        {
+          name: '一级报警',
+          value: '1'
+        },
+        {
+          name: '二级报警',
+          value: '2'
+        },
+        {
+          name: '三级报警',
+          value: '3'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: '',
+        name: '',
+        openAlarm: '',
+        openJob: '',
+        level: '',
+        lowValue: '',
+        highValue: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
+        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
+        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
+        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
+        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
+        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmLevel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 193f00f..708efea 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -73,11 +73,11 @@
 import EditH2sLevel from './components/editH2sLevel'
 import EditHumiLevel from './components/editHumiLevel'
 import EditO2Level from './components/editO2Level'
-import dialogAlarmLevel from './components/dialogAlarmLevel'
+import editAlarmLevel from './components/editAlarmLevel'
 
 export default {
   name: 'ListLevel',
-  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, dialogAlarmLevel },
+  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, editAlarmLevel },
   data() {
     return {
       selectedTenant: {
@@ -181,7 +181,7 @@
     },
     // 新增
     add() {
-      this.cmpName = 'dialog-alarm-level'
+      this.cmpName = 'edit-alarm-level'
       setTimeout(() => {
         this.$refs.editdialog.initDialog('create')
       }, 100)
diff --git a/src/views/systemConfig/deptPermission/components/dialogListDept.vue b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
deleted file mode 100644
index 5d75707..0000000
--- a/src/views/systemConfig/deptPermission/components/dialogListDept.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <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="wellType">
-            <el-select
-              v-model="deviceForm.wellType"
-              clearable
-              placeholder="请选择支持井类型"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in wellTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="lng">
-            <el-input
-              v-model="deviceForm.lng"
-              clearable
-              placeholder="请输入经度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="纬度" prop="lat">
-            <el-input
-              v-model="deviceForm.lat"
-              clearable
-              placeholder="请输入纬度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="组织id" prop="deptid">
-            <el-input
-              v-model="deviceForm.deptid"
-              clearable
-              disabled
-              placeholder="请输入组织id"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
-export default {
-  name: 'DialogListDept',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 支持井类型
-      wellTypeList: [
-        {
-          label: '井类型一',
-          value: '1'
-        },
-        {
-          label: '井类型二',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      },
-      // 表单校验规则
-      rules: {
-        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
-        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDept(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDept(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
new file mode 100644
index 0000000..429076f
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <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="wellType">
+            <el-select
+              v-model="deviceForm.wellType"
+              clearable
+              placeholder="请选择支持井类型"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in wellTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="lng">
+            <el-input
+              v-model="deviceForm.lng"
+              clearable
+              placeholder="请输入经度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="纬度" prop="lat">
+            <el-input
+              v-model="deviceForm.lat"
+              clearable
+              placeholder="请输入纬度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="组织id" prop="deptid">
+            <el-input
+              v-model="deviceForm.deptid"
+              clearable
+              disabled
+              placeholder="请输入组织id"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
+export default {
+  name: 'EditDeptPermission',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 支持井类型
+      wellTypeList: [
+        {
+          label: '井类型一',
+          value: '1'
+        },
+        {
+          label: '井类型二',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      },
+      // 表单校验规则
+      rules: {
+        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
+        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDept(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDept(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
new file mode 100644
index 0000000..4305f54
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-select
+          v-model="listQuery.deptid"
+          placeholder="组织id"
+          clearable
+        >
+          <el-option
+            v-for="item in deptidList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="120" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-list-dept ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editListDept from '@/views/systemConfig/deptPermission/components/editDeptPermission'
+import { deptList, delDept } from '@/api/systemConfig/deptPermission'
+
+export default {
+  name: 'DeptPermission',
+  components: { editListDept },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        deptid: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      deptidList: [
+        {
+          label: '3213213',
+          value: '0'
+        },
+        {
+          label: '9873213',
+          value: '1'
+        }
+      ],
+      columns: [
+        {
+          text: '组织名称',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '支持井类型',
+          value: 'wellType',
+          align: 'center'
+        },
+        {
+          text: '支持设备类型',
+          value: 'deviceType',
+          align: 'center'
+        },
+        {
+          text: '地图默认中心经度',
+          value: 'lng',
+          align: 'center'
+        },
+        {
+          text: '地图默认中心纬度',
+          value: 'lat',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      deptList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDept(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/listDept.vue b/src/views/systemConfig/deptPermission/listDept.vue
deleted file mode 100644
index 738c5b1..0000000
--- a/src/views/systemConfig/deptPermission/listDept.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-select
-          v-model="listQuery.deptid"
-          placeholder="组织id"
-          clearable
-        >
-          <el-option
-            v-for="item in deptidList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="120" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-list-dept ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogListDept from '@/views/systemConfig/deptPermission/components/dialogListDept'
-import { deptList, delDept } from '@/api/systemConfig/deptPermission'
-
-export default {
-  name: 'ListDept',
-  components: { dialogListDept },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        deptid: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      deptidList: [
-        {
-          label: '3213213',
-          value: '0'
-        },
-        {
-          label: '9873213',
-          value: '1'
-        }
-      ],
-      columns: [
-        {
-          text: '组织名称',
-          value: 'deptName',
-          align: 'center'
-        },
-        {
-          text: '支持井类型',
-          value: 'wellType',
-          align: 'center'
-        },
-        {
-          text: '支持设备类型',
-          value: 'deviceType',
-          align: 'center'
-        },
-        {
-          text: '地图默认中心经度',
-          value: 'lng',
-          align: 'center'
-        },
-        {
-          text: '地图默认中心纬度',
-          value: 'lat',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      deptList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue b/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
deleted file mode 100644
index 7ca5297..0000000
--- a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
+++ /dev/null
@@ -1,347 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="通讯方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请选择支持通信方式"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="坐标系" prop="coordinateType">
-            <el-input
-              v-model="deviceForm.coordinateType"
-              placeholder="请输入数据默认坐标系"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="生成工单" prop="isJobGenerate">
-            <el-select
-              v-model="deviceForm.isJobGenerate"
-              clearable
-              placeholder="请选择是否生成工单"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in jobList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="APP推送" prop="isAppPush">
-            <el-select
-              v-model="deviceForm.isAppPush"
-              clearable
-              placeholder="请选择是否APP推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in appPushList"
-                :key="item.value"
-                :label="item.label"
-                :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="isMessagePush">
-            <el-select
-              v-model="deviceForm.isMessagePush"
-              clearable
-              placeholder="请选择是否短信推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in messagePushList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="项目id" prop="devcode">
-            <el-input
-              v-model="deviceForm.devcode"
-              clearable
-              disabled
-              placeholder="未知"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/tenantConfig'
-export default {
-  name: 'DialogListTenant',
-  data() {
-    return {
-      // 通讯方式
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 是否生成工单
-      jobList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启App推送
-      appPushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启短信推送
-      messagePushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        isMessagePush: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
-        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
-        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
-        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
-        isMessagePush: [{ required: true, message: '是否开启短信推送必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        isMessagePush: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          communication: row.communication.split(','),
-          coordinateType: row.coordinateType,
-          isJobGenerate: row.isJobGenerate,
-          isAppPush: row.isAppPush,
-          isMessagePush: row.isMessagePush,
-          devcode: row.tenentId
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
new file mode 100644
index 0000000..d1be724
--- /dev/null
+++ b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
@@ -0,0 +1,337 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="通讯方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              :disabled="dialogStatus === 'detail' ? true : false"
+              placeholder="请选择支持通信方式"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="坐标系" prop="coordinateType">
+            <el-input
+              v-model="deviceForm.coordinateType"
+              placeholder="请输入数据默认坐标系"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="生成工单" prop="isJobGenerate">
+            <el-select
+              v-model="deviceForm.isJobGenerate"
+              clearable
+              placeholder="请选择是否生成工单"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in jobList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="APP推送" prop="isAppPush">
+            <el-select
+              v-model="deviceForm.isAppPush"
+              clearable
+              placeholder="请选择是否APP推送"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in appPushList"
+                :key="item.value"
+                :label="item.label"
+                :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="isMessagePush">
+            <el-select
+              v-model="deviceForm.isMessagePush"
+              clearable
+              placeholder="请选择是否短信推送"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in messagePushList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="项目id" prop="devcode">
+            <el-input
+              v-model="deviceForm.devcode"
+              clearable
+              disabled
+              placeholder="未知"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { updateAlarmContent, addAlarmContent } from '@/api/systemConfig/tenantConfig'
+export default {
+  name: 'EditTenantConfig',
+  data() {
+    return {
+      // 通讯方式
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 是否生成工单
+      jobList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      // 是否开启App推送
+      appPushList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      // 是否开启短信推送
+      messagePushList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        isMessagePush: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
+        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
+        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
+        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
+        isMessagePush: [{ required: true, message: '是否开启短信推送必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        isMessagePush: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          communication: row.communication.split(','),
+          coordinateType: row.coordinateType,
+          isJobGenerate: row.isJobGenerate,
+          isAppPush: row.isAppPush,
+          isMessagePush: row.isMessagePush,
+          devcode: row.tenentId
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/systemConfig/tenantConfig/listTenant.vue b/src/views/systemConfig/tenantConfig/listTenant.vue
deleted file mode 100644
index 26ac194..0000000
--- a/src/views/systemConfig/tenantConfig/listTenant.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="120" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/systemConfig/tenantConfig/components/dialogListTenant'
-import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
-
-export default {
-  name: 'ListTenant',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '编号',
-          value: 'tenentId',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '支持通讯协议',
-          value: 'communication',
-          align: 'center'
-        },
-        {
-          text: '导入数据默认坐标系',
-          value: 'coordinateType',
-          align: 'center'
-        },
-        {
-          text: '是否需要生成工单',
-          value: 'isJobGenerate',
-          align: 'center'
-        },
-        {
-          text: '是否开启APP推送',
-          value: 'isAppPush',
-          align: 'center'
-        },
-        {
-          text: '是否开启短信推送',
-          value: 'isMessagePush',
-          align: 'center'
-        },
-        {
-          text: '报警推送规则',
-          value: 'alarmPushType',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      alarmTenantList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delAlarmTenant(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
new file mode 100644
index 0000000..58b9aac
--- /dev/null
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -0,0 +1,180 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="120" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/systemConfig/tenantConfig/components/editTenantConfig'
+import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
+
+export default {
+  name: 'TenantConfig',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '编号',
+          value: 'tenentId',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '支持通讯协议',
+          value: 'communication',
+          align: 'center'
+        },
+        {
+          text: '导入数据默认坐标系',
+          value: 'coordinateType',
+          align: 'center'
+        },
+        {
+          text: '是否需要生成工单',
+          value: 'isJobGenerate',
+          align: 'center'
+        },
+        {
+          text: '是否开启APP推送',
+          value: 'isAppPush',
+          align: 'center'
+        },
+        {
+          text: '是否开启短信推送',
+          value: 'isMessagePush',
+          align: 'center'
+        },
+        {
+          text: '报警推送规则',
+          value: 'alarmPushType',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      alarmTenantList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delAlarmTenant(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/warningManage/components/dialogListWarning.vue b/src/views/warningManage/components/dialogListWarning.vue
deleted file mode 100644
index 010a00e..0000000
--- a/src/views/warningManage/components/dialogListWarning.vue
+++ /dev/null
@@ -1,293 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入报警下限"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="报警上限" prop="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入报警上限"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="操作人姓名" prop="openAtor">
-            <el-input
-              v-model="deviceForm.openAtor"
-              placeholder="请输入操作人姓名"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="超时时间" prop="overTime">
-            <el-date-picker
-              v-model="deviceForm.overTime"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              clearable
-              placeholder="请选择超时时间"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="突然阈值" prop="saltaTion">
-            <el-input
-              v-model="deviceForm.saltaTion"
-              clearable
-              placeholder="请输入突然阈值"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="时间戳" prop="ts">
-            <el-date-picker
-              v-model="deviceForm.ts"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              clearable
-              placeholder="请选择时间戳"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="grade">
-            <el-select
-              v-model="deviceForm.grade"
-              placeholder="请选择报警等级"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in gradeList"
-                :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="sensorCode">
-            <el-input
-              v-model="deviceForm.sensorCode"
-              clearable
-              placeholder="请输入传感器编号"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devCode">
-            <el-input
-              v-model="deviceForm.devCode"
-              clearable
-              disabled
-              placeholder="请输入设备编号"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { updateWarningRule, addWarningRule } from '@/api/warning/warningRule'
-export default {
-  name: 'DialogListWarning',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 报警等级
-      gradeList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        highValue: '',
-        lowValue: '',
-        overTime: '',
-        saltaTion: '',
-        sensorCode: '',
-        grade: '',
-        ts: '',
-        openAtor: '',
-        devCode: ''
-      },
-      // 表单校验规则
-      rules: {
-        highValue: [{ required: true, message: '报警上限不能为空', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '报警下限不能为空', trigger: ['blur', 'change'] }],
-        overTime: [{ required: true, message: '超时时间必选', trigger: ['blur', 'change'] }],
-        saltaTion: [{ required: true, message: '突然阈值不能为空', trigger: ['blur', 'change'] }],
-        sensorCode: [{ required: true, message: '传感器编号不能为空', trigger: ['blur', 'change'] }],
-        grade: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        ts: [{ required: true, message: '时间戳必选', trigger: ['blur', 'change'] }],
-        openAtor: [{ required: true, message: '操作人姓名不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        highValue: '',
-        lowValue: '',
-        overTime: '',
-        saltaTion: '',
-        sensorCode: '',
-        grade: '',
-        ts: '',
-        openAtor: '',
-        devCode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          highValue: row.highValue,
-          lowValue: row.lowValue,
-          overTime: row.overTime,
-          saltaTion: row.saltaTion,
-          sensorCode: row.sensorCode,
-          grade: row.grade,
-          ts: row.ts,
-          openAtor: row.openAtor,
-          devCode: row.devCode
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateWarningRule(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addWarningRule(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/warningManage/components/editWarning.vue b/src/views/warningManage/components/editWarning.vue
new file mode 100644
index 0000000..3c8a081
--- /dev/null
+++ b/src/views/warningManage/components/editWarning.vue
@@ -0,0 +1,293 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警下限" prop="lowValue">
+            <el-input
+              v-model="deviceForm.lowValue"
+              placeholder="请输入报警下限"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="报警上限" prop="highValue">
+            <el-input
+              v-model="deviceForm.highValue"
+              placeholder="请输入报警上限"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="操作人姓名" prop="openAtor">
+            <el-input
+              v-model="deviceForm.openAtor"
+              placeholder="请输入操作人姓名"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="超时时间" prop="overTime">
+            <el-date-picker
+              v-model="deviceForm.overTime"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              clearable
+              placeholder="请选择超时时间"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="突然阈值" prop="saltaTion">
+            <el-input
+              v-model="deviceForm.saltaTion"
+              clearable
+              placeholder="请输入突然阈值"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="时间戳" prop="ts">
+            <el-date-picker
+              v-model="deviceForm.ts"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              clearable
+              placeholder="请选择时间戳"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警等级" prop="grade">
+            <el-select
+              v-model="deviceForm.grade"
+              placeholder="请选择报警等级"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in gradeList"
+                :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="sensorCode">
+            <el-input
+              v-model="deviceForm.sensorCode"
+              clearable
+              placeholder="请输入传感器编号"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devCode">
+            <el-input
+              v-model="deviceForm.devCode"
+              clearable
+              disabled
+              placeholder="请输入设备编号"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { updateWarningRule, addWarningRule } from '@/api/warning/warningRule'
+export default {
+  name: 'EditWarning',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 报警等级
+      gradeList: [
+        {
+          name: '一级报警',
+          value: '1'
+        },
+        {
+          name: '二级报警',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        highValue: '',
+        lowValue: '',
+        overTime: '',
+        saltaTion: '',
+        sensorCode: '',
+        grade: '',
+        ts: '',
+        openAtor: '',
+        devCode: ''
+      },
+      // 表单校验规则
+      rules: {
+        highValue: [{ required: true, message: '报警上限不能为空', trigger: ['blur', 'change'] }],
+        lowValue: [{ required: true, message: '报警下限不能为空', trigger: ['blur', 'change'] }],
+        overTime: [{ required: true, message: '超时时间必选', trigger: ['blur', 'change'] }],
+        saltaTion: [{ required: true, message: '突然阈值不能为空', trigger: ['blur', 'change'] }],
+        sensorCode: [{ required: true, message: '传感器编号不能为空', trigger: ['blur', 'change'] }],
+        grade: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
+        ts: [{ required: true, message: '时间戳必选', trigger: ['blur', 'change'] }],
+        openAtor: [{ required: true, message: '操作人姓名不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        highValue: '',
+        lowValue: '',
+        overTime: '',
+        saltaTion: '',
+        sensorCode: '',
+        grade: '',
+        ts: '',
+        openAtor: '',
+        devCode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          highValue: row.highValue,
+          lowValue: row.lowValue,
+          overTime: row.overTime,
+          saltaTion: row.saltaTion,
+          sensorCode: row.sensorCode,
+          grade: row.grade,
+          ts: row.ts,
+          openAtor: row.openAtor,
+          devCode: row.devCode
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateWarningRule(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addWarningRule(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/system/tenant/components/dialogSysTenant.vue b/src/views/system/tenant/components/dialogSysTenant.vue
deleted file mode 100644
index 0b2d1c1..0000000
--- a/src/views/system/tenant/components/dialogSysTenant.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系人电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="历史保存天数" prop="clearDay">
-            <el-input
-              v-model="deviceForm.clearDay"
-              placeholder="请输入历史数据保存天数"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
-          <el-form-item label="组织名称" prop="deptName">
-            <el-select
-              v-model="deviceForm.deptName"
-              placeholder="请选择关联组织名称"
-              clearable
-            >
-              <el-option
-                v-for="item in deptNameList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
-export default {
-  name: 'DialogSysTenant',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情',
-        makeDep: '项目绑定组织'
-      },
-      // 组织关系列表
-      deptNameList: [
-        {
-          name: '组织名称一',
-          value: '0'
-        },
-        {
-          name: '组织名称二',
-          value: '1'
-        },
-        {
-          name: '组织名称三',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      },
-      // 表单校验规则
-      rules: {
-        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
-        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
-        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
-        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
-        this.deviceForm = {
-          tenantCode: row.tenantCode,
-          tenantName: row.tenantName,
-          linkPerson: row.linkPerson,
-          tel: row.tel,
-          clearDay: row.clearDay,
-          deptName: row.deptName
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      } else if (this.dialogStatus === 'makeDep') {
-        this.makeDept()
-      }
-    },
-    // 绑定组织关系
-    makeDept() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          deptTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('绑定成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addTenantSys(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
new file mode 100644
index 0000000..13e311c
--- /dev/null
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -0,0 +1,273 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系人电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearDay">
+            <el-input
+              v-model="deviceForm.clearDay"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <el-select
+              v-model="deviceForm.deptName"
+              placeholder="请选择关联组织名称"
+              clearable
+            >
+              <el-option
+                v-for="item in deptNameList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
+export default {
+  name: 'EditSysTenant',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情',
+        makeDep: '项目绑定组织'
+      },
+      // 组织关系列表
+      deptNameList: [
+        {
+          name: '组织名称一',
+          value: '0'
+        },
+        {
+          name: '组织名称二',
+          value: '1'
+        },
+        {
+          name: '组织名称三',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      },
+      // 表单校验规则
+      rules: {
+        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
+        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
+        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
+        this.deviceForm = {
+          tenantCode: row.tenantCode,
+          tenantName: row.tenantName,
+          linkPerson: row.linkPerson,
+          tel: row.tel,
+          clearDay: row.clearDay,
+          deptName: row.deptName
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      } else if (this.dialogStatus === 'makeDep') {
+        this.makeDept()
+      }
+    },
+    // 绑定组织关系
+    makeDept() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          deptTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addTenantSys(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
new file mode 100644
index 0000000..408328c
--- /dev/null
+++ b/src/views/system/tenant/tenantList.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="140" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/system/tenant/components/editTenant'
+import { tenantSysList, delTenantSys } from '@/api/system/tenant'
+
+export default {
+  name: 'TenantList',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '项目编码',
+          value: 'tenantCode',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '项目联系人',
+          value: 'linkPerson',
+          align: 'center'
+        },
+        {
+          text: '联系人电话',
+          value: 'tel',
+          align: 'center'
+        },
+        {
+          text: '历史数据保存天数',
+          value: 'clearDay',
+          align: 'center'
+        },
+        {
+          text: '关联组织',
+          value: 'deptId',
+          align: 'center'
+        },
+        {
+          text: '关联组织名称',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      tenantSysList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delTenantSys(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    },
+    // 绑定组织
+    makeDep(row) {
+      this.$refs.editAlarmContent.initDialog('makeDep', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantSystList.vue b/src/views/system/tenant/tenantSystList.vue
deleted file mode 100644
index 61149b2..0000000
--- a/src/views/system/tenant/tenantSystList.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="140" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" size="small" @click="makeDep(scope.row)">
-              组织
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/system/tenant/components/dialogSysTenant'
-import { tenantSysList, delTenantSys } from '@/api/system/tenant'
-
-export default {
-  name: 'TenantSystList',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '项目编码',
-          value: 'tenantCode',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '项目联系人',
-          value: 'linkPerson',
-          align: 'center'
-        },
-        {
-          text: '联系人电话',
-          value: 'tel',
-          align: 'center'
-        },
-        {
-          text: '历史数据保存天数',
-          value: 'clearDay',
-          align: 'center'
-        },
-        {
-          text: '关联组织',
-          value: 'deptId',
-          align: 'center'
-        },
-        {
-          text: '关联组织名称',
-          value: 'deptName',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      tenantSysList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delTenantSys(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    },
-    // 绑定组织
-    makeDep(row) {
-      this.$refs.dialogAlarmContent.initDialog('makeDep', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
deleted file mode 100644
index 0ea149c..0000000
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
-              clearable
-              placeholder="请输入告警内容"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警类型" prop="alarmType">
-            <el-select
-              v-model="deviceForm.alarmType"
-              placeholder="告警类型"
-              clearable
-            >
-              <el-option
-                v-for="item in alarmTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
-export default {
-  name: 'DialogAlarmContent',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
-        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        console.log(row)
-        this.deviceForm = {
-          alarmType: row.alarmType,
-          alarmContent: row.alarmContent,
-          devcode: row.id,
-          deviceType: row.deviceType.split(',')
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/editAlarmContent.vue b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
new file mode 100644
index 0000000..96e56f2
--- /dev/null
+++ b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
+              clearable
+              placeholder="请输入告警内容"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警类型" prop="alarmType">
+            <el-select
+              v-model="deviceForm.alarmType"
+              placeholder="告警类型"
+              clearable
+            >
+              <el-option
+                v-for="item in alarmTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              clearable
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
+export default {
+  name: 'EditAlarmContent',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
+        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        console.log(row)
+        this.deviceForm = {
+          alarmType: row.alarmType,
+          alarmContent: row.alarmContent,
+          devcode: row.id,
+          deviceType: row.deviceType.split(',')
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index f203f26..b7d9dab 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -73,17 +73,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import dialogAlarmContent from '@/views/systemConfig/alarmContent/components/dialogAlarmContent'
+import editAlarmContent from '@/views/systemConfig/alarmContent/components/editAlarmContent'
 import { getDevice, alarmContentList, delAlarmContent } from '@/api/systemConfig/alarmContent'
 
 export default {
   name: 'ListContent',
-  components: { dialogAlarmContent },
+  components: { editAlarmContent },
   data() {
     return {
       // 查询条件
@@ -183,11 +183,11 @@
     },
     // 新增
     add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
+      this.$refs.editAlarmContent.initDialog('create')
     },
     // 修改
     edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
+      this.$refs.editAlarmContent.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
deleted file mode 100644
index bfb0c1d..0000000
--- a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.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-col>
-        <el-col :span="12">
-          <el-form-item label="监测指标" prop="name">
-            <el-input
-              v-model="deviceForm.name"
-              clearable
-              placeholder="请输入监测指标名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="开启报警" prop="openAlarm">
-            <el-select
-              v-model="deviceForm.openAlarm"
-              placeholder="请选择是否开启报警"
-              clearable
-            >
-              <el-option
-                v-for="item in openAlarmList"
-                :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="openJob">
-            <el-select
-              v-model="deviceForm.openJob"
-              placeholder="请选择是否开启工单"
-              clearable
-            >
-              <el-option
-                v-for="item in openJobList"
-                :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="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入告警上限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入告警下限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="level">
-            <el-select
-              v-model="deviceForm.level"
-              placeholder="请选择报警等级"
-              clearable
-            >
-              <el-option
-                v-for="item in levelList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
-export default {
-  name: 'DialogAlarmLevel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: '', // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否开启报警
-      openAlarmList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 是否开启工单
-      openJobList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 报警等级
-      levelList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        },
-        {
-          name: '三级报警',
-          value: '3'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: '',
-        name: '',
-        openAlarm: '',
-        openJob: '',
-        level: '',
-        lowValue: '',
-        highValue: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
-        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
-        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
-        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
-        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmLevel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
new file mode 100644
index 0000000..4db04c2
--- /dev/null
+++ b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
@@ -0,0 +1,281 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.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-col>
+        <el-col :span="12">
+          <el-form-item label="监测指标" prop="name">
+            <el-input
+              v-model="deviceForm.name"
+              clearable
+              placeholder="请输入监测指标名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="开启报警" prop="openAlarm">
+            <el-select
+              v-model="deviceForm.openAlarm"
+              placeholder="请选择是否开启报警"
+              clearable
+            >
+              <el-option
+                v-for="item in openAlarmList"
+                :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="openJob">
+            <el-select
+              v-model="deviceForm.openJob"
+              placeholder="请选择是否开启工单"
+              clearable
+            >
+              <el-option
+                v-for="item in openJobList"
+                :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="highValue">
+            <el-input
+              v-model="deviceForm.highValue"
+              placeholder="请输入告警上限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警下限" prop="lowValue">
+            <el-input
+              v-model="deviceForm.lowValue"
+              placeholder="请输入告警下限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警等级" prop="level">
+            <el-select
+              v-model="deviceForm.level"
+              placeholder="请选择报警等级"
+              clearable
+            >
+              <el-option
+                v-for="item in levelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
+export default {
+  name: 'EditAlarmLevel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: '', // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否开启报警
+      openAlarmList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 是否开启工单
+      openJobList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 报警等级
+      levelList: [
+        {
+          name: '一级报警',
+          value: '1'
+        },
+        {
+          name: '二级报警',
+          value: '2'
+        },
+        {
+          name: '三级报警',
+          value: '3'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: '',
+        name: '',
+        openAlarm: '',
+        openJob: '',
+        level: '',
+        lowValue: '',
+        highValue: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
+        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
+        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
+        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
+        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
+        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmLevel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 193f00f..708efea 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -73,11 +73,11 @@
 import EditH2sLevel from './components/editH2sLevel'
 import EditHumiLevel from './components/editHumiLevel'
 import EditO2Level from './components/editO2Level'
-import dialogAlarmLevel from './components/dialogAlarmLevel'
+import editAlarmLevel from './components/editAlarmLevel'
 
 export default {
   name: 'ListLevel',
-  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, dialogAlarmLevel },
+  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, editAlarmLevel },
   data() {
     return {
       selectedTenant: {
@@ -181,7 +181,7 @@
     },
     // 新增
     add() {
-      this.cmpName = 'dialog-alarm-level'
+      this.cmpName = 'edit-alarm-level'
       setTimeout(() => {
         this.$refs.editdialog.initDialog('create')
       }, 100)
diff --git a/src/views/systemConfig/deptPermission/components/dialogListDept.vue b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
deleted file mode 100644
index 5d75707..0000000
--- a/src/views/systemConfig/deptPermission/components/dialogListDept.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <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="wellType">
-            <el-select
-              v-model="deviceForm.wellType"
-              clearable
-              placeholder="请选择支持井类型"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in wellTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="lng">
-            <el-input
-              v-model="deviceForm.lng"
-              clearable
-              placeholder="请输入经度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="纬度" prop="lat">
-            <el-input
-              v-model="deviceForm.lat"
-              clearable
-              placeholder="请输入纬度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="组织id" prop="deptid">
-            <el-input
-              v-model="deviceForm.deptid"
-              clearable
-              disabled
-              placeholder="请输入组织id"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
-export default {
-  name: 'DialogListDept',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 支持井类型
-      wellTypeList: [
-        {
-          label: '井类型一',
-          value: '1'
-        },
-        {
-          label: '井类型二',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      },
-      // 表单校验规则
-      rules: {
-        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
-        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDept(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDept(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
new file mode 100644
index 0000000..429076f
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <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="wellType">
+            <el-select
+              v-model="deviceForm.wellType"
+              clearable
+              placeholder="请选择支持井类型"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in wellTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="lng">
+            <el-input
+              v-model="deviceForm.lng"
+              clearable
+              placeholder="请输入经度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="纬度" prop="lat">
+            <el-input
+              v-model="deviceForm.lat"
+              clearable
+              placeholder="请输入纬度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="组织id" prop="deptid">
+            <el-input
+              v-model="deviceForm.deptid"
+              clearable
+              disabled
+              placeholder="请输入组织id"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
+export default {
+  name: 'EditDeptPermission',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 支持井类型
+      wellTypeList: [
+        {
+          label: '井类型一',
+          value: '1'
+        },
+        {
+          label: '井类型二',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      },
+      // 表单校验规则
+      rules: {
+        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
+        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDept(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDept(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
new file mode 100644
index 0000000..4305f54
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-select
+          v-model="listQuery.deptid"
+          placeholder="组织id"
+          clearable
+        >
+          <el-option
+            v-for="item in deptidList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="120" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-list-dept ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editListDept from '@/views/systemConfig/deptPermission/components/editDeptPermission'
+import { deptList, delDept } from '@/api/systemConfig/deptPermission'
+
+export default {
+  name: 'DeptPermission',
+  components: { editListDept },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        deptid: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      deptidList: [
+        {
+          label: '3213213',
+          value: '0'
+        },
+        {
+          label: '9873213',
+          value: '1'
+        }
+      ],
+      columns: [
+        {
+          text: '组织名称',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '支持井类型',
+          value: 'wellType',
+          align: 'center'
+        },
+        {
+          text: '支持设备类型',
+          value: 'deviceType',
+          align: 'center'
+        },
+        {
+          text: '地图默认中心经度',
+          value: 'lng',
+          align: 'center'
+        },
+        {
+          text: '地图默认中心纬度',
+          value: 'lat',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      deptList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDept(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/listDept.vue b/src/views/systemConfig/deptPermission/listDept.vue
deleted file mode 100644
index 738c5b1..0000000
--- a/src/views/systemConfig/deptPermission/listDept.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-select
-          v-model="listQuery.deptid"
-          placeholder="组织id"
-          clearable
-        >
-          <el-option
-            v-for="item in deptidList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="120" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-list-dept ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogListDept from '@/views/systemConfig/deptPermission/components/dialogListDept'
-import { deptList, delDept } from '@/api/systemConfig/deptPermission'
-
-export default {
-  name: 'ListDept',
-  components: { dialogListDept },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        deptid: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      deptidList: [
-        {
-          label: '3213213',
-          value: '0'
-        },
-        {
-          label: '9873213',
-          value: '1'
-        }
-      ],
-      columns: [
-        {
-          text: '组织名称',
-          value: 'deptName',
-          align: 'center'
-        },
-        {
-          text: '支持井类型',
-          value: 'wellType',
-          align: 'center'
-        },
-        {
-          text: '支持设备类型',
-          value: 'deviceType',
-          align: 'center'
-        },
-        {
-          text: '地图默认中心经度',
-          value: 'lng',
-          align: 'center'
-        },
-        {
-          text: '地图默认中心纬度',
-          value: 'lat',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      deptList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue b/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
deleted file mode 100644
index 7ca5297..0000000
--- a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
+++ /dev/null
@@ -1,347 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="通讯方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请选择支持通信方式"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="坐标系" prop="coordinateType">
-            <el-input
-              v-model="deviceForm.coordinateType"
-              placeholder="请输入数据默认坐标系"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="生成工单" prop="isJobGenerate">
-            <el-select
-              v-model="deviceForm.isJobGenerate"
-              clearable
-              placeholder="请选择是否生成工单"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in jobList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="APP推送" prop="isAppPush">
-            <el-select
-              v-model="deviceForm.isAppPush"
-              clearable
-              placeholder="请选择是否APP推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in appPushList"
-                :key="item.value"
-                :label="item.label"
-                :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="isMessagePush">
-            <el-select
-              v-model="deviceForm.isMessagePush"
-              clearable
-              placeholder="请选择是否短信推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in messagePushList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="项目id" prop="devcode">
-            <el-input
-              v-model="deviceForm.devcode"
-              clearable
-              disabled
-              placeholder="未知"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/tenantConfig'
-export default {
-  name: 'DialogListTenant',
-  data() {
-    return {
-      // 通讯方式
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 是否生成工单
-      jobList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启App推送
-      appPushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启短信推送
-      messagePushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        isMessagePush: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
-        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
-        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
-        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
-        isMessagePush: [{ required: true, message: '是否开启短信推送必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        isMessagePush: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          communication: row.communication.split(','),
-          coordinateType: row.coordinateType,
-          isJobGenerate: row.isJobGenerate,
-          isAppPush: row.isAppPush,
-          isMessagePush: row.isMessagePush,
-          devcode: row.tenentId
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
new file mode 100644
index 0000000..d1be724
--- /dev/null
+++ b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
@@ -0,0 +1,337 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="通讯方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              :disabled="dialogStatus === 'detail' ? true : false"
+              placeholder="请选择支持通信方式"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="坐标系" prop="coordinateType">
+            <el-input
+              v-model="deviceForm.coordinateType"
+              placeholder="请输入数据默认坐标系"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="生成工单" prop="isJobGenerate">
+            <el-select
+              v-model="deviceForm.isJobGenerate"
+              clearable
+              placeholder="请选择是否生成工单"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in jobList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="APP推送" prop="isAppPush">
+            <el-select
+              v-model="deviceForm.isAppPush"
+              clearable
+              placeholder="请选择是否APP推送"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in appPushList"
+                :key="item.value"
+                :label="item.label"
+                :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="isMessagePush">
+            <el-select
+              v-model="deviceForm.isMessagePush"
+              clearable
+              placeholder="请选择是否短信推送"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in messagePushList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="项目id" prop="devcode">
+            <el-input
+              v-model="deviceForm.devcode"
+              clearable
+              disabled
+              placeholder="未知"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { updateAlarmContent, addAlarmContent } from '@/api/systemConfig/tenantConfig'
+export default {
+  name: 'EditTenantConfig',
+  data() {
+    return {
+      // 通讯方式
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 是否生成工单
+      jobList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      // 是否开启App推送
+      appPushList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      // 是否开启短信推送
+      messagePushList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        isMessagePush: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
+        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
+        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
+        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
+        isMessagePush: [{ required: true, message: '是否开启短信推送必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        isMessagePush: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          communication: row.communication.split(','),
+          coordinateType: row.coordinateType,
+          isJobGenerate: row.isJobGenerate,
+          isAppPush: row.isAppPush,
+          isMessagePush: row.isMessagePush,
+          devcode: row.tenentId
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/systemConfig/tenantConfig/listTenant.vue b/src/views/systemConfig/tenantConfig/listTenant.vue
deleted file mode 100644
index 26ac194..0000000
--- a/src/views/systemConfig/tenantConfig/listTenant.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="120" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/systemConfig/tenantConfig/components/dialogListTenant'
-import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
-
-export default {
-  name: 'ListTenant',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '编号',
-          value: 'tenentId',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '支持通讯协议',
-          value: 'communication',
-          align: 'center'
-        },
-        {
-          text: '导入数据默认坐标系',
-          value: 'coordinateType',
-          align: 'center'
-        },
-        {
-          text: '是否需要生成工单',
-          value: 'isJobGenerate',
-          align: 'center'
-        },
-        {
-          text: '是否开启APP推送',
-          value: 'isAppPush',
-          align: 'center'
-        },
-        {
-          text: '是否开启短信推送',
-          value: 'isMessagePush',
-          align: 'center'
-        },
-        {
-          text: '报警推送规则',
-          value: 'alarmPushType',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      alarmTenantList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delAlarmTenant(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
new file mode 100644
index 0000000..58b9aac
--- /dev/null
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -0,0 +1,180 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="120" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/systemConfig/tenantConfig/components/editTenantConfig'
+import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
+
+export default {
+  name: 'TenantConfig',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '编号',
+          value: 'tenentId',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '支持通讯协议',
+          value: 'communication',
+          align: 'center'
+        },
+        {
+          text: '导入数据默认坐标系',
+          value: 'coordinateType',
+          align: 'center'
+        },
+        {
+          text: '是否需要生成工单',
+          value: 'isJobGenerate',
+          align: 'center'
+        },
+        {
+          text: '是否开启APP推送',
+          value: 'isAppPush',
+          align: 'center'
+        },
+        {
+          text: '是否开启短信推送',
+          value: 'isMessagePush',
+          align: 'center'
+        },
+        {
+          text: '报警推送规则',
+          value: 'alarmPushType',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      alarmTenantList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delAlarmTenant(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/warningManage/components/dialogListWarning.vue b/src/views/warningManage/components/dialogListWarning.vue
deleted file mode 100644
index 010a00e..0000000
--- a/src/views/warningManage/components/dialogListWarning.vue
+++ /dev/null
@@ -1,293 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入报警下限"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="报警上限" prop="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入报警上限"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="操作人姓名" prop="openAtor">
-            <el-input
-              v-model="deviceForm.openAtor"
-              placeholder="请输入操作人姓名"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="超时时间" prop="overTime">
-            <el-date-picker
-              v-model="deviceForm.overTime"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              clearable
-              placeholder="请选择超时时间"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="突然阈值" prop="saltaTion">
-            <el-input
-              v-model="deviceForm.saltaTion"
-              clearable
-              placeholder="请输入突然阈值"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="时间戳" prop="ts">
-            <el-date-picker
-              v-model="deviceForm.ts"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              clearable
-              placeholder="请选择时间戳"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="grade">
-            <el-select
-              v-model="deviceForm.grade"
-              placeholder="请选择报警等级"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in gradeList"
-                :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="sensorCode">
-            <el-input
-              v-model="deviceForm.sensorCode"
-              clearable
-              placeholder="请输入传感器编号"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devCode">
-            <el-input
-              v-model="deviceForm.devCode"
-              clearable
-              disabled
-              placeholder="请输入设备编号"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { updateWarningRule, addWarningRule } from '@/api/warning/warningRule'
-export default {
-  name: 'DialogListWarning',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 报警等级
-      gradeList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        highValue: '',
-        lowValue: '',
-        overTime: '',
-        saltaTion: '',
-        sensorCode: '',
-        grade: '',
-        ts: '',
-        openAtor: '',
-        devCode: ''
-      },
-      // 表单校验规则
-      rules: {
-        highValue: [{ required: true, message: '报警上限不能为空', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '报警下限不能为空', trigger: ['blur', 'change'] }],
-        overTime: [{ required: true, message: '超时时间必选', trigger: ['blur', 'change'] }],
-        saltaTion: [{ required: true, message: '突然阈值不能为空', trigger: ['blur', 'change'] }],
-        sensorCode: [{ required: true, message: '传感器编号不能为空', trigger: ['blur', 'change'] }],
-        grade: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        ts: [{ required: true, message: '时间戳必选', trigger: ['blur', 'change'] }],
-        openAtor: [{ required: true, message: '操作人姓名不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        highValue: '',
-        lowValue: '',
-        overTime: '',
-        saltaTion: '',
-        sensorCode: '',
-        grade: '',
-        ts: '',
-        openAtor: '',
-        devCode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          highValue: row.highValue,
-          lowValue: row.lowValue,
-          overTime: row.overTime,
-          saltaTion: row.saltaTion,
-          sensorCode: row.sensorCode,
-          grade: row.grade,
-          ts: row.ts,
-          openAtor: row.openAtor,
-          devCode: row.devCode
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateWarningRule(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addWarningRule(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/warningManage/components/editWarning.vue b/src/views/warningManage/components/editWarning.vue
new file mode 100644
index 0000000..3c8a081
--- /dev/null
+++ b/src/views/warningManage/components/editWarning.vue
@@ -0,0 +1,293 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警下限" prop="lowValue">
+            <el-input
+              v-model="deviceForm.lowValue"
+              placeholder="请输入报警下限"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="报警上限" prop="highValue">
+            <el-input
+              v-model="deviceForm.highValue"
+              placeholder="请输入报警上限"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="操作人姓名" prop="openAtor">
+            <el-input
+              v-model="deviceForm.openAtor"
+              placeholder="请输入操作人姓名"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="超时时间" prop="overTime">
+            <el-date-picker
+              v-model="deviceForm.overTime"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              clearable
+              placeholder="请选择超时时间"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="突然阈值" prop="saltaTion">
+            <el-input
+              v-model="deviceForm.saltaTion"
+              clearable
+              placeholder="请输入突然阈值"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="时间戳" prop="ts">
+            <el-date-picker
+              v-model="deviceForm.ts"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              clearable
+              placeholder="请选择时间戳"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警等级" prop="grade">
+            <el-select
+              v-model="deviceForm.grade"
+              placeholder="请选择报警等级"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in gradeList"
+                :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="sensorCode">
+            <el-input
+              v-model="deviceForm.sensorCode"
+              clearable
+              placeholder="请输入传感器编号"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devCode">
+            <el-input
+              v-model="deviceForm.devCode"
+              clearable
+              disabled
+              placeholder="请输入设备编号"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { updateWarningRule, addWarningRule } from '@/api/warning/warningRule'
+export default {
+  name: 'EditWarning',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 报警等级
+      gradeList: [
+        {
+          name: '一级报警',
+          value: '1'
+        },
+        {
+          name: '二级报警',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        highValue: '',
+        lowValue: '',
+        overTime: '',
+        saltaTion: '',
+        sensorCode: '',
+        grade: '',
+        ts: '',
+        openAtor: '',
+        devCode: ''
+      },
+      // 表单校验规则
+      rules: {
+        highValue: [{ required: true, message: '报警上限不能为空', trigger: ['blur', 'change'] }],
+        lowValue: [{ required: true, message: '报警下限不能为空', trigger: ['blur', 'change'] }],
+        overTime: [{ required: true, message: '超时时间必选', trigger: ['blur', 'change'] }],
+        saltaTion: [{ required: true, message: '突然阈值不能为空', trigger: ['blur', 'change'] }],
+        sensorCode: [{ required: true, message: '传感器编号不能为空', trigger: ['blur', 'change'] }],
+        grade: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
+        ts: [{ required: true, message: '时间戳必选', trigger: ['blur', 'change'] }],
+        openAtor: [{ required: true, message: '操作人姓名不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        highValue: '',
+        lowValue: '',
+        overTime: '',
+        saltaTion: '',
+        sensorCode: '',
+        grade: '',
+        ts: '',
+        openAtor: '',
+        devCode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          highValue: row.highValue,
+          lowValue: row.lowValue,
+          overTime: row.overTime,
+          saltaTion: row.saltaTion,
+          sensorCode: row.sensorCode,
+          grade: row.grade,
+          ts: row.ts,
+          openAtor: row.openAtor,
+          devCode: row.devCode
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateWarningRule(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addWarningRule(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/warningManage/warningRule.vue b/src/views/warningManage/warningRule.vue
index c09d63f..54c1f95 100644
--- a/src/views/warningManage/warningRule.vue
+++ b/src/views/warningManage/warningRule.vue
@@ -13,7 +13,7 @@
       <search-item>
         <el-input
           v-model="listQuery.devcode"
-          placeholder="设备编号"
+          placeholder="设备编号!!!"
           clearable
         />
       </search-item>
@@ -64,17 +64,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-list-warning ref="dialogAlarmContent" @watchChild="fetchData" />
+    <edit-list-warning ref="editAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import dialogListWarning from '@/views/warningManage/components/dialogListWarning'
+import editListWarning from '@/views/warningManage/components/editWarning'
 import { warningRuleList, delWarningRule, batchImportWarn } from '@/api/warning/warningRule'
 
 export default {
   name: 'WarningRule',
-  components: { dialogListWarning },
+  components: { editListWarning },
   data() {
     return {
       // 查询条件
@@ -181,15 +181,15 @@
     },
     // 新增
     add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
+      this.$refs.editAlarmContent.initDialog('create')
     },
     // 修改
     edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
+      this.$refs.editAlarmContent.initDialog('update', row)
     },
     // 详情
     detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
+      this.$refs.editAlarmContent.initDialog('detail', row)
     },
     // 批量导入报警规则
     uploadFile(param) {

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/system/tenant/components/dialogSysTenant.vue b/src/views/system/tenant/components/dialogSysTenant.vue
deleted file mode 100644
index 0b2d1c1..0000000
--- a/src/views/system/tenant/components/dialogSysTenant.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系人电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="历史保存天数" prop="clearDay">
-            <el-input
-              v-model="deviceForm.clearDay"
-              placeholder="请输入历史数据保存天数"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
-          <el-form-item label="组织名称" prop="deptName">
-            <el-select
-              v-model="deviceForm.deptName"
-              placeholder="请选择关联组织名称"
-              clearable
-            >
-              <el-option
-                v-for="item in deptNameList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
-export default {
-  name: 'DialogSysTenant',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情',
-        makeDep: '项目绑定组织'
-      },
-      // 组织关系列表
-      deptNameList: [
-        {
-          name: '组织名称一',
-          value: '0'
-        },
-        {
-          name: '组织名称二',
-          value: '1'
-        },
-        {
-          name: '组织名称三',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      },
-      // 表单校验规则
-      rules: {
-        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
-        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
-        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
-        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
-        this.deviceForm = {
-          tenantCode: row.tenantCode,
-          tenantName: row.tenantName,
-          linkPerson: row.linkPerson,
-          tel: row.tel,
-          clearDay: row.clearDay,
-          deptName: row.deptName
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      } else if (this.dialogStatus === 'makeDep') {
-        this.makeDept()
-      }
-    },
-    // 绑定组织关系
-    makeDept() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          deptTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('绑定成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addTenantSys(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
new file mode 100644
index 0000000..13e311c
--- /dev/null
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -0,0 +1,273 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系人电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearDay">
+            <el-input
+              v-model="deviceForm.clearDay"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <el-select
+              v-model="deviceForm.deptName"
+              placeholder="请选择关联组织名称"
+              clearable
+            >
+              <el-option
+                v-for="item in deptNameList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
+export default {
+  name: 'EditSysTenant',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情',
+        makeDep: '项目绑定组织'
+      },
+      // 组织关系列表
+      deptNameList: [
+        {
+          name: '组织名称一',
+          value: '0'
+        },
+        {
+          name: '组织名称二',
+          value: '1'
+        },
+        {
+          name: '组织名称三',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      },
+      // 表单校验规则
+      rules: {
+        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
+        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
+        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
+        this.deviceForm = {
+          tenantCode: row.tenantCode,
+          tenantName: row.tenantName,
+          linkPerson: row.linkPerson,
+          tel: row.tel,
+          clearDay: row.clearDay,
+          deptName: row.deptName
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      } else if (this.dialogStatus === 'makeDep') {
+        this.makeDept()
+      }
+    },
+    // 绑定组织关系
+    makeDept() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          deptTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addTenantSys(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
new file mode 100644
index 0000000..408328c
--- /dev/null
+++ b/src/views/system/tenant/tenantList.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="140" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/system/tenant/components/editTenant'
+import { tenantSysList, delTenantSys } from '@/api/system/tenant'
+
+export default {
+  name: 'TenantList',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '项目编码',
+          value: 'tenantCode',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '项目联系人',
+          value: 'linkPerson',
+          align: 'center'
+        },
+        {
+          text: '联系人电话',
+          value: 'tel',
+          align: 'center'
+        },
+        {
+          text: '历史数据保存天数',
+          value: 'clearDay',
+          align: 'center'
+        },
+        {
+          text: '关联组织',
+          value: 'deptId',
+          align: 'center'
+        },
+        {
+          text: '关联组织名称',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      tenantSysList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delTenantSys(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    },
+    // 绑定组织
+    makeDep(row) {
+      this.$refs.editAlarmContent.initDialog('makeDep', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantSystList.vue b/src/views/system/tenant/tenantSystList.vue
deleted file mode 100644
index 61149b2..0000000
--- a/src/views/system/tenant/tenantSystList.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="140" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" size="small" @click="makeDep(scope.row)">
-              组织
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/system/tenant/components/dialogSysTenant'
-import { tenantSysList, delTenantSys } from '@/api/system/tenant'
-
-export default {
-  name: 'TenantSystList',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '项目编码',
-          value: 'tenantCode',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '项目联系人',
-          value: 'linkPerson',
-          align: 'center'
-        },
-        {
-          text: '联系人电话',
-          value: 'tel',
-          align: 'center'
-        },
-        {
-          text: '历史数据保存天数',
-          value: 'clearDay',
-          align: 'center'
-        },
-        {
-          text: '关联组织',
-          value: 'deptId',
-          align: 'center'
-        },
-        {
-          text: '关联组织名称',
-          value: 'deptName',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      tenantSysList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delTenantSys(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    },
-    // 绑定组织
-    makeDep(row) {
-      this.$refs.dialogAlarmContent.initDialog('makeDep', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
deleted file mode 100644
index 0ea149c..0000000
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
-              clearable
-              placeholder="请输入告警内容"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警类型" prop="alarmType">
-            <el-select
-              v-model="deviceForm.alarmType"
-              placeholder="告警类型"
-              clearable
-            >
-              <el-option
-                v-for="item in alarmTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
-export default {
-  name: 'DialogAlarmContent',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
-        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        console.log(row)
-        this.deviceForm = {
-          alarmType: row.alarmType,
-          alarmContent: row.alarmContent,
-          devcode: row.id,
-          deviceType: row.deviceType.split(',')
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/editAlarmContent.vue b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
new file mode 100644
index 0000000..96e56f2
--- /dev/null
+++ b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
+              clearable
+              placeholder="请输入告警内容"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警类型" prop="alarmType">
+            <el-select
+              v-model="deviceForm.alarmType"
+              placeholder="告警类型"
+              clearable
+            >
+              <el-option
+                v-for="item in alarmTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              clearable
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
+export default {
+  name: 'EditAlarmContent',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
+        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        console.log(row)
+        this.deviceForm = {
+          alarmType: row.alarmType,
+          alarmContent: row.alarmContent,
+          devcode: row.id,
+          deviceType: row.deviceType.split(',')
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index f203f26..b7d9dab 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -73,17 +73,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import dialogAlarmContent from '@/views/systemConfig/alarmContent/components/dialogAlarmContent'
+import editAlarmContent from '@/views/systemConfig/alarmContent/components/editAlarmContent'
 import { getDevice, alarmContentList, delAlarmContent } from '@/api/systemConfig/alarmContent'
 
 export default {
   name: 'ListContent',
-  components: { dialogAlarmContent },
+  components: { editAlarmContent },
   data() {
     return {
       // 查询条件
@@ -183,11 +183,11 @@
     },
     // 新增
     add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
+      this.$refs.editAlarmContent.initDialog('create')
     },
     // 修改
     edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
+      this.$refs.editAlarmContent.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
deleted file mode 100644
index bfb0c1d..0000000
--- a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.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-col>
-        <el-col :span="12">
-          <el-form-item label="监测指标" prop="name">
-            <el-input
-              v-model="deviceForm.name"
-              clearable
-              placeholder="请输入监测指标名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="开启报警" prop="openAlarm">
-            <el-select
-              v-model="deviceForm.openAlarm"
-              placeholder="请选择是否开启报警"
-              clearable
-            >
-              <el-option
-                v-for="item in openAlarmList"
-                :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="openJob">
-            <el-select
-              v-model="deviceForm.openJob"
-              placeholder="请选择是否开启工单"
-              clearable
-            >
-              <el-option
-                v-for="item in openJobList"
-                :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="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入告警上限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入告警下限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="level">
-            <el-select
-              v-model="deviceForm.level"
-              placeholder="请选择报警等级"
-              clearable
-            >
-              <el-option
-                v-for="item in levelList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
-export default {
-  name: 'DialogAlarmLevel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: '', // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否开启报警
-      openAlarmList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 是否开启工单
-      openJobList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 报警等级
-      levelList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        },
-        {
-          name: '三级报警',
-          value: '3'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: '',
-        name: '',
-        openAlarm: '',
-        openJob: '',
-        level: '',
-        lowValue: '',
-        highValue: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
-        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
-        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
-        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
-        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmLevel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
new file mode 100644
index 0000000..4db04c2
--- /dev/null
+++ b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
@@ -0,0 +1,281 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.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-col>
+        <el-col :span="12">
+          <el-form-item label="监测指标" prop="name">
+            <el-input
+              v-model="deviceForm.name"
+              clearable
+              placeholder="请输入监测指标名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="开启报警" prop="openAlarm">
+            <el-select
+              v-model="deviceForm.openAlarm"
+              placeholder="请选择是否开启报警"
+              clearable
+            >
+              <el-option
+                v-for="item in openAlarmList"
+                :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="openJob">
+            <el-select
+              v-model="deviceForm.openJob"
+              placeholder="请选择是否开启工单"
+              clearable
+            >
+              <el-option
+                v-for="item in openJobList"
+                :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="highValue">
+            <el-input
+              v-model="deviceForm.highValue"
+              placeholder="请输入告警上限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警下限" prop="lowValue">
+            <el-input
+              v-model="deviceForm.lowValue"
+              placeholder="请输入告警下限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警等级" prop="level">
+            <el-select
+              v-model="deviceForm.level"
+              placeholder="请选择报警等级"
+              clearable
+            >
+              <el-option
+                v-for="item in levelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
+export default {
+  name: 'EditAlarmLevel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: '', // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否开启报警
+      openAlarmList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 是否开启工单
+      openJobList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 报警等级
+      levelList: [
+        {
+          name: '一级报警',
+          value: '1'
+        },
+        {
+          name: '二级报警',
+          value: '2'
+        },
+        {
+          name: '三级报警',
+          value: '3'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: '',
+        name: '',
+        openAlarm: '',
+        openJob: '',
+        level: '',
+        lowValue: '',
+        highValue: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
+        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
+        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
+        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
+        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
+        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmLevel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 193f00f..708efea 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -73,11 +73,11 @@
 import EditH2sLevel from './components/editH2sLevel'
 import EditHumiLevel from './components/editHumiLevel'
 import EditO2Level from './components/editO2Level'
-import dialogAlarmLevel from './components/dialogAlarmLevel'
+import editAlarmLevel from './components/editAlarmLevel'
 
 export default {
   name: 'ListLevel',
-  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, dialogAlarmLevel },
+  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, editAlarmLevel },
   data() {
     return {
       selectedTenant: {
@@ -181,7 +181,7 @@
     },
     // 新增
     add() {
-      this.cmpName = 'dialog-alarm-level'
+      this.cmpName = 'edit-alarm-level'
       setTimeout(() => {
         this.$refs.editdialog.initDialog('create')
       }, 100)
diff --git a/src/views/systemConfig/deptPermission/components/dialogListDept.vue b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
deleted file mode 100644
index 5d75707..0000000
--- a/src/views/systemConfig/deptPermission/components/dialogListDept.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <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="wellType">
-            <el-select
-              v-model="deviceForm.wellType"
-              clearable
-              placeholder="请选择支持井类型"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in wellTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="lng">
-            <el-input
-              v-model="deviceForm.lng"
-              clearable
-              placeholder="请输入经度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="纬度" prop="lat">
-            <el-input
-              v-model="deviceForm.lat"
-              clearable
-              placeholder="请输入纬度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="组织id" prop="deptid">
-            <el-input
-              v-model="deviceForm.deptid"
-              clearable
-              disabled
-              placeholder="请输入组织id"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
-export default {
-  name: 'DialogListDept',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 支持井类型
-      wellTypeList: [
-        {
-          label: '井类型一',
-          value: '1'
-        },
-        {
-          label: '井类型二',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      },
-      // 表单校验规则
-      rules: {
-        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
-        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDept(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDept(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
new file mode 100644
index 0000000..429076f
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <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="wellType">
+            <el-select
+              v-model="deviceForm.wellType"
+              clearable
+              placeholder="请选择支持井类型"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in wellTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="lng">
+            <el-input
+              v-model="deviceForm.lng"
+              clearable
+              placeholder="请输入经度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="纬度" prop="lat">
+            <el-input
+              v-model="deviceForm.lat"
+              clearable
+              placeholder="请输入纬度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="组织id" prop="deptid">
+            <el-input
+              v-model="deviceForm.deptid"
+              clearable
+              disabled
+              placeholder="请输入组织id"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
+export default {
+  name: 'EditDeptPermission',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 支持井类型
+      wellTypeList: [
+        {
+          label: '井类型一',
+          value: '1'
+        },
+        {
+          label: '井类型二',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      },
+      // 表单校验规则
+      rules: {
+        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
+        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDept(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDept(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
new file mode 100644
index 0000000..4305f54
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-select
+          v-model="listQuery.deptid"
+          placeholder="组织id"
+          clearable
+        >
+          <el-option
+            v-for="item in deptidList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="120" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-list-dept ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editListDept from '@/views/systemConfig/deptPermission/components/editDeptPermission'
+import { deptList, delDept } from '@/api/systemConfig/deptPermission'
+
+export default {
+  name: 'DeptPermission',
+  components: { editListDept },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        deptid: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      deptidList: [
+        {
+          label: '3213213',
+          value: '0'
+        },
+        {
+          label: '9873213',
+          value: '1'
+        }
+      ],
+      columns: [
+        {
+          text: '组织名称',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '支持井类型',
+          value: 'wellType',
+          align: 'center'
+        },
+        {
+          text: '支持设备类型',
+          value: 'deviceType',
+          align: 'center'
+        },
+        {
+          text: '地图默认中心经度',
+          value: 'lng',
+          align: 'center'
+        },
+        {
+          text: '地图默认中心纬度',
+          value: 'lat',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      deptList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDept(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/listDept.vue b/src/views/systemConfig/deptPermission/listDept.vue
deleted file mode 100644
index 738c5b1..0000000
--- a/src/views/systemConfig/deptPermission/listDept.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-select
-          v-model="listQuery.deptid"
-          placeholder="组织id"
-          clearable
-        >
-          <el-option
-            v-for="item in deptidList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="120" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-list-dept ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogListDept from '@/views/systemConfig/deptPermission/components/dialogListDept'
-import { deptList, delDept } from '@/api/systemConfig/deptPermission'
-
-export default {
-  name: 'ListDept',
-  components: { dialogListDept },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        deptid: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      deptidList: [
-        {
-          label: '3213213',
-          value: '0'
-        },
-        {
-          label: '9873213',
-          value: '1'
-        }
-      ],
-      columns: [
-        {
-          text: '组织名称',
-          value: 'deptName',
-          align: 'center'
-        },
-        {
-          text: '支持井类型',
-          value: 'wellType',
-          align: 'center'
-        },
-        {
-          text: '支持设备类型',
-          value: 'deviceType',
-          align: 'center'
-        },
-        {
-          text: '地图默认中心经度',
-          value: 'lng',
-          align: 'center'
-        },
-        {
-          text: '地图默认中心纬度',
-          value: 'lat',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      deptList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue b/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
deleted file mode 100644
index 7ca5297..0000000
--- a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
+++ /dev/null
@@ -1,347 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="通讯方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请选择支持通信方式"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="坐标系" prop="coordinateType">
-            <el-input
-              v-model="deviceForm.coordinateType"
-              placeholder="请输入数据默认坐标系"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="生成工单" prop="isJobGenerate">
-            <el-select
-              v-model="deviceForm.isJobGenerate"
-              clearable
-              placeholder="请选择是否生成工单"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in jobList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="APP推送" prop="isAppPush">
-            <el-select
-              v-model="deviceForm.isAppPush"
-              clearable
-              placeholder="请选择是否APP推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in appPushList"
-                :key="item.value"
-                :label="item.label"
-                :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="isMessagePush">
-            <el-select
-              v-model="deviceForm.isMessagePush"
-              clearable
-              placeholder="请选择是否短信推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in messagePushList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="项目id" prop="devcode">
-            <el-input
-              v-model="deviceForm.devcode"
-              clearable
-              disabled
-              placeholder="未知"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/tenantConfig'
-export default {
-  name: 'DialogListTenant',
-  data() {
-    return {
-      // 通讯方式
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 是否生成工单
-      jobList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启App推送
-      appPushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启短信推送
-      messagePushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        isMessagePush: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
-        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
-        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
-        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
-        isMessagePush: [{ required: true, message: '是否开启短信推送必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        isMessagePush: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          communication: row.communication.split(','),
-          coordinateType: row.coordinateType,
-          isJobGenerate: row.isJobGenerate,
-          isAppPush: row.isAppPush,
-          isMessagePush: row.isMessagePush,
-          devcode: row.tenentId
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
new file mode 100644
index 0000000..d1be724
--- /dev/null
+++ b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
@@ -0,0 +1,337 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="通讯方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              :disabled="dialogStatus === 'detail' ? true : false"
+              placeholder="请选择支持通信方式"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="坐标系" prop="coordinateType">
+            <el-input
+              v-model="deviceForm.coordinateType"
+              placeholder="请输入数据默认坐标系"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="生成工单" prop="isJobGenerate">
+            <el-select
+              v-model="deviceForm.isJobGenerate"
+              clearable
+              placeholder="请选择是否生成工单"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in jobList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="APP推送" prop="isAppPush">
+            <el-select
+              v-model="deviceForm.isAppPush"
+              clearable
+              placeholder="请选择是否APP推送"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in appPushList"
+                :key="item.value"
+                :label="item.label"
+                :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="isMessagePush">
+            <el-select
+              v-model="deviceForm.isMessagePush"
+              clearable
+              placeholder="请选择是否短信推送"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in messagePushList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="项目id" prop="devcode">
+            <el-input
+              v-model="deviceForm.devcode"
+              clearable
+              disabled
+              placeholder="未知"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { updateAlarmContent, addAlarmContent } from '@/api/systemConfig/tenantConfig'
+export default {
+  name: 'EditTenantConfig',
+  data() {
+    return {
+      // 通讯方式
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 是否生成工单
+      jobList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      // 是否开启App推送
+      appPushList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      // 是否开启短信推送
+      messagePushList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        isMessagePush: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
+        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
+        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
+        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
+        isMessagePush: [{ required: true, message: '是否开启短信推送必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        isMessagePush: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          communication: row.communication.split(','),
+          coordinateType: row.coordinateType,
+          isJobGenerate: row.isJobGenerate,
+          isAppPush: row.isAppPush,
+          isMessagePush: row.isMessagePush,
+          devcode: row.tenentId
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/systemConfig/tenantConfig/listTenant.vue b/src/views/systemConfig/tenantConfig/listTenant.vue
deleted file mode 100644
index 26ac194..0000000
--- a/src/views/systemConfig/tenantConfig/listTenant.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="120" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/systemConfig/tenantConfig/components/dialogListTenant'
-import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
-
-export default {
-  name: 'ListTenant',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '编号',
-          value: 'tenentId',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '支持通讯协议',
-          value: 'communication',
-          align: 'center'
-        },
-        {
-          text: '导入数据默认坐标系',
-          value: 'coordinateType',
-          align: 'center'
-        },
-        {
-          text: '是否需要生成工单',
-          value: 'isJobGenerate',
-          align: 'center'
-        },
-        {
-          text: '是否开启APP推送',
-          value: 'isAppPush',
-          align: 'center'
-        },
-        {
-          text: '是否开启短信推送',
-          value: 'isMessagePush',
-          align: 'center'
-        },
-        {
-          text: '报警推送规则',
-          value: 'alarmPushType',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      alarmTenantList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delAlarmTenant(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
new file mode 100644
index 0000000..58b9aac
--- /dev/null
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -0,0 +1,180 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="120" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/systemConfig/tenantConfig/components/editTenantConfig'
+import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
+
+export default {
+  name: 'TenantConfig',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '编号',
+          value: 'tenentId',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '支持通讯协议',
+          value: 'communication',
+          align: 'center'
+        },
+        {
+          text: '导入数据默认坐标系',
+          value: 'coordinateType',
+          align: 'center'
+        },
+        {
+          text: '是否需要生成工单',
+          value: 'isJobGenerate',
+          align: 'center'
+        },
+        {
+          text: '是否开启APP推送',
+          value: 'isAppPush',
+          align: 'center'
+        },
+        {
+          text: '是否开启短信推送',
+          value: 'isMessagePush',
+          align: 'center'
+        },
+        {
+          text: '报警推送规则',
+          value: 'alarmPushType',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      alarmTenantList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delAlarmTenant(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/warningManage/components/dialogListWarning.vue b/src/views/warningManage/components/dialogListWarning.vue
deleted file mode 100644
index 010a00e..0000000
--- a/src/views/warningManage/components/dialogListWarning.vue
+++ /dev/null
@@ -1,293 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入报警下限"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="报警上限" prop="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入报警上限"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="操作人姓名" prop="openAtor">
-            <el-input
-              v-model="deviceForm.openAtor"
-              placeholder="请输入操作人姓名"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="超时时间" prop="overTime">
-            <el-date-picker
-              v-model="deviceForm.overTime"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              clearable
-              placeholder="请选择超时时间"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="突然阈值" prop="saltaTion">
-            <el-input
-              v-model="deviceForm.saltaTion"
-              clearable
-              placeholder="请输入突然阈值"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="时间戳" prop="ts">
-            <el-date-picker
-              v-model="deviceForm.ts"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              clearable
-              placeholder="请选择时间戳"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="grade">
-            <el-select
-              v-model="deviceForm.grade"
-              placeholder="请选择报警等级"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in gradeList"
-                :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="sensorCode">
-            <el-input
-              v-model="deviceForm.sensorCode"
-              clearable
-              placeholder="请输入传感器编号"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devCode">
-            <el-input
-              v-model="deviceForm.devCode"
-              clearable
-              disabled
-              placeholder="请输入设备编号"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { updateWarningRule, addWarningRule } from '@/api/warning/warningRule'
-export default {
-  name: 'DialogListWarning',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 报警等级
-      gradeList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        highValue: '',
-        lowValue: '',
-        overTime: '',
-        saltaTion: '',
-        sensorCode: '',
-        grade: '',
-        ts: '',
-        openAtor: '',
-        devCode: ''
-      },
-      // 表单校验规则
-      rules: {
-        highValue: [{ required: true, message: '报警上限不能为空', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '报警下限不能为空', trigger: ['blur', 'change'] }],
-        overTime: [{ required: true, message: '超时时间必选', trigger: ['blur', 'change'] }],
-        saltaTion: [{ required: true, message: '突然阈值不能为空', trigger: ['blur', 'change'] }],
-        sensorCode: [{ required: true, message: '传感器编号不能为空', trigger: ['blur', 'change'] }],
-        grade: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        ts: [{ required: true, message: '时间戳必选', trigger: ['blur', 'change'] }],
-        openAtor: [{ required: true, message: '操作人姓名不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        highValue: '',
-        lowValue: '',
-        overTime: '',
-        saltaTion: '',
-        sensorCode: '',
-        grade: '',
-        ts: '',
-        openAtor: '',
-        devCode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          highValue: row.highValue,
-          lowValue: row.lowValue,
-          overTime: row.overTime,
-          saltaTion: row.saltaTion,
-          sensorCode: row.sensorCode,
-          grade: row.grade,
-          ts: row.ts,
-          openAtor: row.openAtor,
-          devCode: row.devCode
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateWarningRule(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addWarningRule(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/warningManage/components/editWarning.vue b/src/views/warningManage/components/editWarning.vue
new file mode 100644
index 0000000..3c8a081
--- /dev/null
+++ b/src/views/warningManage/components/editWarning.vue
@@ -0,0 +1,293 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警下限" prop="lowValue">
+            <el-input
+              v-model="deviceForm.lowValue"
+              placeholder="请输入报警下限"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="报警上限" prop="highValue">
+            <el-input
+              v-model="deviceForm.highValue"
+              placeholder="请输入报警上限"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="操作人姓名" prop="openAtor">
+            <el-input
+              v-model="deviceForm.openAtor"
+              placeholder="请输入操作人姓名"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="超时时间" prop="overTime">
+            <el-date-picker
+              v-model="deviceForm.overTime"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              clearable
+              placeholder="请选择超时时间"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="突然阈值" prop="saltaTion">
+            <el-input
+              v-model="deviceForm.saltaTion"
+              clearable
+              placeholder="请输入突然阈值"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="时间戳" prop="ts">
+            <el-date-picker
+              v-model="deviceForm.ts"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              clearable
+              placeholder="请选择时间戳"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警等级" prop="grade">
+            <el-select
+              v-model="deviceForm.grade"
+              placeholder="请选择报警等级"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in gradeList"
+                :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="sensorCode">
+            <el-input
+              v-model="deviceForm.sensorCode"
+              clearable
+              placeholder="请输入传感器编号"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devCode">
+            <el-input
+              v-model="deviceForm.devCode"
+              clearable
+              disabled
+              placeholder="请输入设备编号"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { updateWarningRule, addWarningRule } from '@/api/warning/warningRule'
+export default {
+  name: 'EditWarning',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 报警等级
+      gradeList: [
+        {
+          name: '一级报警',
+          value: '1'
+        },
+        {
+          name: '二级报警',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        highValue: '',
+        lowValue: '',
+        overTime: '',
+        saltaTion: '',
+        sensorCode: '',
+        grade: '',
+        ts: '',
+        openAtor: '',
+        devCode: ''
+      },
+      // 表单校验规则
+      rules: {
+        highValue: [{ required: true, message: '报警上限不能为空', trigger: ['blur', 'change'] }],
+        lowValue: [{ required: true, message: '报警下限不能为空', trigger: ['blur', 'change'] }],
+        overTime: [{ required: true, message: '超时时间必选', trigger: ['blur', 'change'] }],
+        saltaTion: [{ required: true, message: '突然阈值不能为空', trigger: ['blur', 'change'] }],
+        sensorCode: [{ required: true, message: '传感器编号不能为空', trigger: ['blur', 'change'] }],
+        grade: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
+        ts: [{ required: true, message: '时间戳必选', trigger: ['blur', 'change'] }],
+        openAtor: [{ required: true, message: '操作人姓名不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        highValue: '',
+        lowValue: '',
+        overTime: '',
+        saltaTion: '',
+        sensorCode: '',
+        grade: '',
+        ts: '',
+        openAtor: '',
+        devCode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          highValue: row.highValue,
+          lowValue: row.lowValue,
+          overTime: row.overTime,
+          saltaTion: row.saltaTion,
+          sensorCode: row.sensorCode,
+          grade: row.grade,
+          ts: row.ts,
+          openAtor: row.openAtor,
+          devCode: row.devCode
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateWarningRule(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addWarningRule(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/warningManage/warningRule.vue b/src/views/warningManage/warningRule.vue
index c09d63f..54c1f95 100644
--- a/src/views/warningManage/warningRule.vue
+++ b/src/views/warningManage/warningRule.vue
@@ -13,7 +13,7 @@
       <search-item>
         <el-input
           v-model="listQuery.devcode"
-          placeholder="设备编号"
+          placeholder="设备编号!!!"
           clearable
         />
       </search-item>
@@ -64,17 +64,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-list-warning ref="dialogAlarmContent" @watchChild="fetchData" />
+    <edit-list-warning ref="editAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import dialogListWarning from '@/views/warningManage/components/dialogListWarning'
+import editListWarning from '@/views/warningManage/components/editWarning'
 import { warningRuleList, delWarningRule, batchImportWarn } from '@/api/warning/warningRule'
 
 export default {
   name: 'WarningRule',
-  components: { dialogListWarning },
+  components: { editListWarning },
   data() {
     return {
       // 查询条件
@@ -181,15 +181,15 @@
     },
     // 新增
     add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
+      this.$refs.editAlarmContent.initDialog('create')
     },
     // 修改
     edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
+      this.$refs.editAlarmContent.initDialog('update', row)
     },
     // 详情
     detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
+      this.$refs.editAlarmContent.initDialog('detail', row)
     },
     // 批量导入报警规则
     uploadFile(param) {
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 113ee2b..17e54d5 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -280,6 +280,9 @@
     },
     qu() { // 获取区
       return this.wellForm.qu
+    },
+    area() { // 获取街道
+      return this.wellForm.area
     }
   },
   watch: {
@@ -298,10 +301,14 @@
           var lnglat = val.split(',')
           geocoder.getAddress(lnglat, function(status, result) {
             if (status === 'complete' && result.info === 'OK') {
+              _this.wellForm.qu = result.regeocode.addressComponent.district
+              _this.wellForm.area = result.regeocode.addressComponent.township
               _this.wellForm.position = result.regeocode.formattedAddress
             // result为对应的地理位置详细信息
             } else {
               _this.wellForm.position = ''
+              _this.wellForm.qu = ''
+              _this.wellForm.area = ''
             }
           })
         })
@@ -318,7 +325,7 @@
     },
     qu(val) { // 监控区变化
       if (val !== '') {
-        this.wellForm.area = ''
+        // this.wellForm.area = ''
         this.fetchArea2()
       }
     }
@@ -370,7 +377,7 @@
     },
     // 获取区域2
     fetchArea2() {
-      getAreaList(this.qu).then(response => {
+      getAreaList(this.wellForm.qu).then(response => {
         this.jiedaoList = response.data
       })
     },

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/system/tenant/components/dialogSysTenant.vue b/src/views/system/tenant/components/dialogSysTenant.vue
deleted file mode 100644
index 0b2d1c1..0000000
--- a/src/views/system/tenant/components/dialogSysTenant.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系人电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="历史保存天数" prop="clearDay">
-            <el-input
-              v-model="deviceForm.clearDay"
-              placeholder="请输入历史数据保存天数"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
-          <el-form-item label="组织名称" prop="deptName">
-            <el-select
-              v-model="deviceForm.deptName"
-              placeholder="请选择关联组织名称"
-              clearable
-            >
-              <el-option
-                v-for="item in deptNameList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
-export default {
-  name: 'DialogSysTenant',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情',
-        makeDep: '项目绑定组织'
-      },
-      // 组织关系列表
-      deptNameList: [
-        {
-          name: '组织名称一',
-          value: '0'
-        },
-        {
-          name: '组织名称二',
-          value: '1'
-        },
-        {
-          name: '组织名称三',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      },
-      // 表单校验规则
-      rules: {
-        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
-        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
-        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
-        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
-        this.deviceForm = {
-          tenantCode: row.tenantCode,
-          tenantName: row.tenantName,
-          linkPerson: row.linkPerson,
-          tel: row.tel,
-          clearDay: row.clearDay,
-          deptName: row.deptName
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      } else if (this.dialogStatus === 'makeDep') {
-        this.makeDept()
-      }
-    },
-    // 绑定组织关系
-    makeDept() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          deptTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('绑定成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addTenantSys(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
new file mode 100644
index 0000000..13e311c
--- /dev/null
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -0,0 +1,273 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系人电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearDay">
+            <el-input
+              v-model="deviceForm.clearDay"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <el-select
+              v-model="deviceForm.deptName"
+              placeholder="请选择关联组织名称"
+              clearable
+            >
+              <el-option
+                v-for="item in deptNameList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
+export default {
+  name: 'EditSysTenant',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情',
+        makeDep: '项目绑定组织'
+      },
+      // 组织关系列表
+      deptNameList: [
+        {
+          name: '组织名称一',
+          value: '0'
+        },
+        {
+          name: '组织名称二',
+          value: '1'
+        },
+        {
+          name: '组织名称三',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      },
+      // 表单校验规则
+      rules: {
+        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
+        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
+        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
+        this.deviceForm = {
+          tenantCode: row.tenantCode,
+          tenantName: row.tenantName,
+          linkPerson: row.linkPerson,
+          tel: row.tel,
+          clearDay: row.clearDay,
+          deptName: row.deptName
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      } else if (this.dialogStatus === 'makeDep') {
+        this.makeDept()
+      }
+    },
+    // 绑定组织关系
+    makeDept() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          deptTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addTenantSys(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
new file mode 100644
index 0000000..408328c
--- /dev/null
+++ b/src/views/system/tenant/tenantList.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="140" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/system/tenant/components/editTenant'
+import { tenantSysList, delTenantSys } from '@/api/system/tenant'
+
+export default {
+  name: 'TenantList',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '项目编码',
+          value: 'tenantCode',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '项目联系人',
+          value: 'linkPerson',
+          align: 'center'
+        },
+        {
+          text: '联系人电话',
+          value: 'tel',
+          align: 'center'
+        },
+        {
+          text: '历史数据保存天数',
+          value: 'clearDay',
+          align: 'center'
+        },
+        {
+          text: '关联组织',
+          value: 'deptId',
+          align: 'center'
+        },
+        {
+          text: '关联组织名称',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      tenantSysList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delTenantSys(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    },
+    // 绑定组织
+    makeDep(row) {
+      this.$refs.editAlarmContent.initDialog('makeDep', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantSystList.vue b/src/views/system/tenant/tenantSystList.vue
deleted file mode 100644
index 61149b2..0000000
--- a/src/views/system/tenant/tenantSystList.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="140" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" size="small" @click="makeDep(scope.row)">
-              组织
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/system/tenant/components/dialogSysTenant'
-import { tenantSysList, delTenantSys } from '@/api/system/tenant'
-
-export default {
-  name: 'TenantSystList',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '项目编码',
-          value: 'tenantCode',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '项目联系人',
-          value: 'linkPerson',
-          align: 'center'
-        },
-        {
-          text: '联系人电话',
-          value: 'tel',
-          align: 'center'
-        },
-        {
-          text: '历史数据保存天数',
-          value: 'clearDay',
-          align: 'center'
-        },
-        {
-          text: '关联组织',
-          value: 'deptId',
-          align: 'center'
-        },
-        {
-          text: '关联组织名称',
-          value: 'deptName',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      tenantSysList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delTenantSys(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    },
-    // 绑定组织
-    makeDep(row) {
-      this.$refs.dialogAlarmContent.initDialog('makeDep', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
deleted file mode 100644
index 0ea149c..0000000
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
-              clearable
-              placeholder="请输入告警内容"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警类型" prop="alarmType">
-            <el-select
-              v-model="deviceForm.alarmType"
-              placeholder="告警类型"
-              clearable
-            >
-              <el-option
-                v-for="item in alarmTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
-export default {
-  name: 'DialogAlarmContent',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
-        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        console.log(row)
-        this.deviceForm = {
-          alarmType: row.alarmType,
-          alarmContent: row.alarmContent,
-          devcode: row.id,
-          deviceType: row.deviceType.split(',')
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/editAlarmContent.vue b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
new file mode 100644
index 0000000..96e56f2
--- /dev/null
+++ b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
+              clearable
+              placeholder="请输入告警内容"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警类型" prop="alarmType">
+            <el-select
+              v-model="deviceForm.alarmType"
+              placeholder="告警类型"
+              clearable
+            >
+              <el-option
+                v-for="item in alarmTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              clearable
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
+export default {
+  name: 'EditAlarmContent',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
+        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        console.log(row)
+        this.deviceForm = {
+          alarmType: row.alarmType,
+          alarmContent: row.alarmContent,
+          devcode: row.id,
+          deviceType: row.deviceType.split(',')
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index f203f26..b7d9dab 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -73,17 +73,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import dialogAlarmContent from '@/views/systemConfig/alarmContent/components/dialogAlarmContent'
+import editAlarmContent from '@/views/systemConfig/alarmContent/components/editAlarmContent'
 import { getDevice, alarmContentList, delAlarmContent } from '@/api/systemConfig/alarmContent'
 
 export default {
   name: 'ListContent',
-  components: { dialogAlarmContent },
+  components: { editAlarmContent },
   data() {
     return {
       // 查询条件
@@ -183,11 +183,11 @@
     },
     // 新增
     add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
+      this.$refs.editAlarmContent.initDialog('create')
     },
     // 修改
     edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
+      this.$refs.editAlarmContent.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
deleted file mode 100644
index bfb0c1d..0000000
--- a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.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-col>
-        <el-col :span="12">
-          <el-form-item label="监测指标" prop="name">
-            <el-input
-              v-model="deviceForm.name"
-              clearable
-              placeholder="请输入监测指标名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="开启报警" prop="openAlarm">
-            <el-select
-              v-model="deviceForm.openAlarm"
-              placeholder="请选择是否开启报警"
-              clearable
-            >
-              <el-option
-                v-for="item in openAlarmList"
-                :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="openJob">
-            <el-select
-              v-model="deviceForm.openJob"
-              placeholder="请选择是否开启工单"
-              clearable
-            >
-              <el-option
-                v-for="item in openJobList"
-                :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="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入告警上限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入告警下限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="level">
-            <el-select
-              v-model="deviceForm.level"
-              placeholder="请选择报警等级"
-              clearable
-            >
-              <el-option
-                v-for="item in levelList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
-export default {
-  name: 'DialogAlarmLevel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: '', // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否开启报警
-      openAlarmList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 是否开启工单
-      openJobList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 报警等级
-      levelList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        },
-        {
-          name: '三级报警',
-          value: '3'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: '',
-        name: '',
-        openAlarm: '',
-        openJob: '',
-        level: '',
-        lowValue: '',
-        highValue: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
-        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
-        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
-        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
-        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmLevel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
new file mode 100644
index 0000000..4db04c2
--- /dev/null
+++ b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
@@ -0,0 +1,281 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.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-col>
+        <el-col :span="12">
+          <el-form-item label="监测指标" prop="name">
+            <el-input
+              v-model="deviceForm.name"
+              clearable
+              placeholder="请输入监测指标名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="开启报警" prop="openAlarm">
+            <el-select
+              v-model="deviceForm.openAlarm"
+              placeholder="请选择是否开启报警"
+              clearable
+            >
+              <el-option
+                v-for="item in openAlarmList"
+                :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="openJob">
+            <el-select
+              v-model="deviceForm.openJob"
+              placeholder="请选择是否开启工单"
+              clearable
+            >
+              <el-option
+                v-for="item in openJobList"
+                :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="highValue">
+            <el-input
+              v-model="deviceForm.highValue"
+              placeholder="请输入告警上限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警下限" prop="lowValue">
+            <el-input
+              v-model="deviceForm.lowValue"
+              placeholder="请输入告警下限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警等级" prop="level">
+            <el-select
+              v-model="deviceForm.level"
+              placeholder="请选择报警等级"
+              clearable
+            >
+              <el-option
+                v-for="item in levelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
+export default {
+  name: 'EditAlarmLevel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: '', // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否开启报警
+      openAlarmList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 是否开启工单
+      openJobList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 报警等级
+      levelList: [
+        {
+          name: '一级报警',
+          value: '1'
+        },
+        {
+          name: '二级报警',
+          value: '2'
+        },
+        {
+          name: '三级报警',
+          value: '3'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: '',
+        name: '',
+        openAlarm: '',
+        openJob: '',
+        level: '',
+        lowValue: '',
+        highValue: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
+        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
+        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
+        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
+        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
+        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmLevel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 193f00f..708efea 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -73,11 +73,11 @@
 import EditH2sLevel from './components/editH2sLevel'
 import EditHumiLevel from './components/editHumiLevel'
 import EditO2Level from './components/editO2Level'
-import dialogAlarmLevel from './components/dialogAlarmLevel'
+import editAlarmLevel from './components/editAlarmLevel'
 
 export default {
   name: 'ListLevel',
-  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, dialogAlarmLevel },
+  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, editAlarmLevel },
   data() {
     return {
       selectedTenant: {
@@ -181,7 +181,7 @@
     },
     // 新增
     add() {
-      this.cmpName = 'dialog-alarm-level'
+      this.cmpName = 'edit-alarm-level'
       setTimeout(() => {
         this.$refs.editdialog.initDialog('create')
       }, 100)
diff --git a/src/views/systemConfig/deptPermission/components/dialogListDept.vue b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
deleted file mode 100644
index 5d75707..0000000
--- a/src/views/systemConfig/deptPermission/components/dialogListDept.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <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="wellType">
-            <el-select
-              v-model="deviceForm.wellType"
-              clearable
-              placeholder="请选择支持井类型"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in wellTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="lng">
-            <el-input
-              v-model="deviceForm.lng"
-              clearable
-              placeholder="请输入经度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="纬度" prop="lat">
-            <el-input
-              v-model="deviceForm.lat"
-              clearable
-              placeholder="请输入纬度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="组织id" prop="deptid">
-            <el-input
-              v-model="deviceForm.deptid"
-              clearable
-              disabled
-              placeholder="请输入组织id"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
-export default {
-  name: 'DialogListDept',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 支持井类型
-      wellTypeList: [
-        {
-          label: '井类型一',
-          value: '1'
-        },
-        {
-          label: '井类型二',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      },
-      // 表单校验规则
-      rules: {
-        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
-        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDept(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDept(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
new file mode 100644
index 0000000..429076f
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <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="wellType">
+            <el-select
+              v-model="deviceForm.wellType"
+              clearable
+              placeholder="请选择支持井类型"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in wellTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="lng">
+            <el-input
+              v-model="deviceForm.lng"
+              clearable
+              placeholder="请输入经度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="纬度" prop="lat">
+            <el-input
+              v-model="deviceForm.lat"
+              clearable
+              placeholder="请输入纬度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="组织id" prop="deptid">
+            <el-input
+              v-model="deviceForm.deptid"
+              clearable
+              disabled
+              placeholder="请输入组织id"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
+export default {
+  name: 'EditDeptPermission',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 支持井类型
+      wellTypeList: [
+        {
+          label: '井类型一',
+          value: '1'
+        },
+        {
+          label: '井类型二',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      },
+      // 表单校验规则
+      rules: {
+        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
+        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDept(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDept(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
new file mode 100644
index 0000000..4305f54
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-select
+          v-model="listQuery.deptid"
+          placeholder="组织id"
+          clearable
+        >
+          <el-option
+            v-for="item in deptidList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="120" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-list-dept ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editListDept from '@/views/systemConfig/deptPermission/components/editDeptPermission'
+import { deptList, delDept } from '@/api/systemConfig/deptPermission'
+
+export default {
+  name: 'DeptPermission',
+  components: { editListDept },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        deptid: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      deptidList: [
+        {
+          label: '3213213',
+          value: '0'
+        },
+        {
+          label: '9873213',
+          value: '1'
+        }
+      ],
+      columns: [
+        {
+          text: '组织名称',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '支持井类型',
+          value: 'wellType',
+          align: 'center'
+        },
+        {
+          text: '支持设备类型',
+          value: 'deviceType',
+          align: 'center'
+        },
+        {
+          text: '地图默认中心经度',
+          value: 'lng',
+          align: 'center'
+        },
+        {
+          text: '地图默认中心纬度',
+          value: 'lat',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      deptList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDept(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/listDept.vue b/src/views/systemConfig/deptPermission/listDept.vue
deleted file mode 100644
index 738c5b1..0000000
--- a/src/views/systemConfig/deptPermission/listDept.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-select
-          v-model="listQuery.deptid"
-          placeholder="组织id"
-          clearable
-        >
-          <el-option
-            v-for="item in deptidList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="120" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-list-dept ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogListDept from '@/views/systemConfig/deptPermission/components/dialogListDept'
-import { deptList, delDept } from '@/api/systemConfig/deptPermission'
-
-export default {
-  name: 'ListDept',
-  components: { dialogListDept },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        deptid: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      deptidList: [
-        {
-          label: '3213213',
-          value: '0'
-        },
-        {
-          label: '9873213',
-          value: '1'
-        }
-      ],
-      columns: [
-        {
-          text: '组织名称',
-          value: 'deptName',
-          align: 'center'
-        },
-        {
-          text: '支持井类型',
-          value: 'wellType',
-          align: 'center'
-        },
-        {
-          text: '支持设备类型',
-          value: 'deviceType',
-          align: 'center'
-        },
-        {
-          text: '地图默认中心经度',
-          value: 'lng',
-          align: 'center'
-        },
-        {
-          text: '地图默认中心纬度',
-          value: 'lat',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      deptList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue b/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
deleted file mode 100644
index 7ca5297..0000000
--- a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
+++ /dev/null
@@ -1,347 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="通讯方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请选择支持通信方式"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="坐标系" prop="coordinateType">
-            <el-input
-              v-model="deviceForm.coordinateType"
-              placeholder="请输入数据默认坐标系"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="生成工单" prop="isJobGenerate">
-            <el-select
-              v-model="deviceForm.isJobGenerate"
-              clearable
-              placeholder="请选择是否生成工单"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in jobList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="APP推送" prop="isAppPush">
-            <el-select
-              v-model="deviceForm.isAppPush"
-              clearable
-              placeholder="请选择是否APP推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in appPushList"
-                :key="item.value"
-                :label="item.label"
-                :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="isMessagePush">
-            <el-select
-              v-model="deviceForm.isMessagePush"
-              clearable
-              placeholder="请选择是否短信推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in messagePushList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="项目id" prop="devcode">
-            <el-input
-              v-model="deviceForm.devcode"
-              clearable
-              disabled
-              placeholder="未知"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/tenantConfig'
-export default {
-  name: 'DialogListTenant',
-  data() {
-    return {
-      // 通讯方式
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 是否生成工单
-      jobList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启App推送
-      appPushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启短信推送
-      messagePushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        isMessagePush: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
-        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
-        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
-        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
-        isMessagePush: [{ required: true, message: '是否开启短信推送必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        isMessagePush: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          communication: row.communication.split(','),
-          coordinateType: row.coordinateType,
-          isJobGenerate: row.isJobGenerate,
-          isAppPush: row.isAppPush,
-          isMessagePush: row.isMessagePush,
-          devcode: row.tenentId
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
new file mode 100644
index 0000000..d1be724
--- /dev/null
+++ b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
@@ -0,0 +1,337 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="通讯方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              :disabled="dialogStatus === 'detail' ? true : false"
+              placeholder="请选择支持通信方式"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="坐标系" prop="coordinateType">
+            <el-input
+              v-model="deviceForm.coordinateType"
+              placeholder="请输入数据默认坐标系"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="生成工单" prop="isJobGenerate">
+            <el-select
+              v-model="deviceForm.isJobGenerate"
+              clearable
+              placeholder="请选择是否生成工单"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in jobList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="APP推送" prop="isAppPush">
+            <el-select
+              v-model="deviceForm.isAppPush"
+              clearable
+              placeholder="请选择是否APP推送"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in appPushList"
+                :key="item.value"
+                :label="item.label"
+                :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="isMessagePush">
+            <el-select
+              v-model="deviceForm.isMessagePush"
+              clearable
+              placeholder="请选择是否短信推送"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in messagePushList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="项目id" prop="devcode">
+            <el-input
+              v-model="deviceForm.devcode"
+              clearable
+              disabled
+              placeholder="未知"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { updateAlarmContent, addAlarmContent } from '@/api/systemConfig/tenantConfig'
+export default {
+  name: 'EditTenantConfig',
+  data() {
+    return {
+      // 通讯方式
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 是否生成工单
+      jobList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      // 是否开启App推送
+      appPushList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      // 是否开启短信推送
+      messagePushList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        isMessagePush: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
+        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
+        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
+        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
+        isMessagePush: [{ required: true, message: '是否开启短信推送必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        isMessagePush: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          communication: row.communication.split(','),
+          coordinateType: row.coordinateType,
+          isJobGenerate: row.isJobGenerate,
+          isAppPush: row.isAppPush,
+          isMessagePush: row.isMessagePush,
+          devcode: row.tenentId
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/systemConfig/tenantConfig/listTenant.vue b/src/views/systemConfig/tenantConfig/listTenant.vue
deleted file mode 100644
index 26ac194..0000000
--- a/src/views/systemConfig/tenantConfig/listTenant.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="120" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/systemConfig/tenantConfig/components/dialogListTenant'
-import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
-
-export default {
-  name: 'ListTenant',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '编号',
-          value: 'tenentId',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '支持通讯协议',
-          value: 'communication',
-          align: 'center'
-        },
-        {
-          text: '导入数据默认坐标系',
-          value: 'coordinateType',
-          align: 'center'
-        },
-        {
-          text: '是否需要生成工单',
-          value: 'isJobGenerate',
-          align: 'center'
-        },
-        {
-          text: '是否开启APP推送',
-          value: 'isAppPush',
-          align: 'center'
-        },
-        {
-          text: '是否开启短信推送',
-          value: 'isMessagePush',
-          align: 'center'
-        },
-        {
-          text: '报警推送规则',
-          value: 'alarmPushType',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      alarmTenantList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delAlarmTenant(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
new file mode 100644
index 0000000..58b9aac
--- /dev/null
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -0,0 +1,180 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="120" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/systemConfig/tenantConfig/components/editTenantConfig'
+import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
+
+export default {
+  name: 'TenantConfig',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '编号',
+          value: 'tenentId',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '支持通讯协议',
+          value: 'communication',
+          align: 'center'
+        },
+        {
+          text: '导入数据默认坐标系',
+          value: 'coordinateType',
+          align: 'center'
+        },
+        {
+          text: '是否需要生成工单',
+          value: 'isJobGenerate',
+          align: 'center'
+        },
+        {
+          text: '是否开启APP推送',
+          value: 'isAppPush',
+          align: 'center'
+        },
+        {
+          text: '是否开启短信推送',
+          value: 'isMessagePush',
+          align: 'center'
+        },
+        {
+          text: '报警推送规则',
+          value: 'alarmPushType',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      alarmTenantList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delAlarmTenant(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/warningManage/components/dialogListWarning.vue b/src/views/warningManage/components/dialogListWarning.vue
deleted file mode 100644
index 010a00e..0000000
--- a/src/views/warningManage/components/dialogListWarning.vue
+++ /dev/null
@@ -1,293 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入报警下限"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="报警上限" prop="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入报警上限"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="操作人姓名" prop="openAtor">
-            <el-input
-              v-model="deviceForm.openAtor"
-              placeholder="请输入操作人姓名"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="超时时间" prop="overTime">
-            <el-date-picker
-              v-model="deviceForm.overTime"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              clearable
-              placeholder="请选择超时时间"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="突然阈值" prop="saltaTion">
-            <el-input
-              v-model="deviceForm.saltaTion"
-              clearable
-              placeholder="请输入突然阈值"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="时间戳" prop="ts">
-            <el-date-picker
-              v-model="deviceForm.ts"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              clearable
-              placeholder="请选择时间戳"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="grade">
-            <el-select
-              v-model="deviceForm.grade"
-              placeholder="请选择报警等级"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in gradeList"
-                :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="sensorCode">
-            <el-input
-              v-model="deviceForm.sensorCode"
-              clearable
-              placeholder="请输入传感器编号"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devCode">
-            <el-input
-              v-model="deviceForm.devCode"
-              clearable
-              disabled
-              placeholder="请输入设备编号"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { updateWarningRule, addWarningRule } from '@/api/warning/warningRule'
-export default {
-  name: 'DialogListWarning',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 报警等级
-      gradeList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        highValue: '',
-        lowValue: '',
-        overTime: '',
-        saltaTion: '',
-        sensorCode: '',
-        grade: '',
-        ts: '',
-        openAtor: '',
-        devCode: ''
-      },
-      // 表单校验规则
-      rules: {
-        highValue: [{ required: true, message: '报警上限不能为空', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '报警下限不能为空', trigger: ['blur', 'change'] }],
-        overTime: [{ required: true, message: '超时时间必选', trigger: ['blur', 'change'] }],
-        saltaTion: [{ required: true, message: '突然阈值不能为空', trigger: ['blur', 'change'] }],
-        sensorCode: [{ required: true, message: '传感器编号不能为空', trigger: ['blur', 'change'] }],
-        grade: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        ts: [{ required: true, message: '时间戳必选', trigger: ['blur', 'change'] }],
-        openAtor: [{ required: true, message: '操作人姓名不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        highValue: '',
-        lowValue: '',
-        overTime: '',
-        saltaTion: '',
-        sensorCode: '',
-        grade: '',
-        ts: '',
-        openAtor: '',
-        devCode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          highValue: row.highValue,
-          lowValue: row.lowValue,
-          overTime: row.overTime,
-          saltaTion: row.saltaTion,
-          sensorCode: row.sensorCode,
-          grade: row.grade,
-          ts: row.ts,
-          openAtor: row.openAtor,
-          devCode: row.devCode
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateWarningRule(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addWarningRule(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/warningManage/components/editWarning.vue b/src/views/warningManage/components/editWarning.vue
new file mode 100644
index 0000000..3c8a081
--- /dev/null
+++ b/src/views/warningManage/components/editWarning.vue
@@ -0,0 +1,293 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警下限" prop="lowValue">
+            <el-input
+              v-model="deviceForm.lowValue"
+              placeholder="请输入报警下限"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="报警上限" prop="highValue">
+            <el-input
+              v-model="deviceForm.highValue"
+              placeholder="请输入报警上限"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="操作人姓名" prop="openAtor">
+            <el-input
+              v-model="deviceForm.openAtor"
+              placeholder="请输入操作人姓名"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="超时时间" prop="overTime">
+            <el-date-picker
+              v-model="deviceForm.overTime"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              clearable
+              placeholder="请选择超时时间"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="突然阈值" prop="saltaTion">
+            <el-input
+              v-model="deviceForm.saltaTion"
+              clearable
+              placeholder="请输入突然阈值"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="时间戳" prop="ts">
+            <el-date-picker
+              v-model="deviceForm.ts"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              clearable
+              placeholder="请选择时间戳"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警等级" prop="grade">
+            <el-select
+              v-model="deviceForm.grade"
+              placeholder="请选择报警等级"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in gradeList"
+                :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="sensorCode">
+            <el-input
+              v-model="deviceForm.sensorCode"
+              clearable
+              placeholder="请输入传感器编号"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devCode">
+            <el-input
+              v-model="deviceForm.devCode"
+              clearable
+              disabled
+              placeholder="请输入设备编号"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { updateWarningRule, addWarningRule } from '@/api/warning/warningRule'
+export default {
+  name: 'EditWarning',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 报警等级
+      gradeList: [
+        {
+          name: '一级报警',
+          value: '1'
+        },
+        {
+          name: '二级报警',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        highValue: '',
+        lowValue: '',
+        overTime: '',
+        saltaTion: '',
+        sensorCode: '',
+        grade: '',
+        ts: '',
+        openAtor: '',
+        devCode: ''
+      },
+      // 表单校验规则
+      rules: {
+        highValue: [{ required: true, message: '报警上限不能为空', trigger: ['blur', 'change'] }],
+        lowValue: [{ required: true, message: '报警下限不能为空', trigger: ['blur', 'change'] }],
+        overTime: [{ required: true, message: '超时时间必选', trigger: ['blur', 'change'] }],
+        saltaTion: [{ required: true, message: '突然阈值不能为空', trigger: ['blur', 'change'] }],
+        sensorCode: [{ required: true, message: '传感器编号不能为空', trigger: ['blur', 'change'] }],
+        grade: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
+        ts: [{ required: true, message: '时间戳必选', trigger: ['blur', 'change'] }],
+        openAtor: [{ required: true, message: '操作人姓名不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        highValue: '',
+        lowValue: '',
+        overTime: '',
+        saltaTion: '',
+        sensorCode: '',
+        grade: '',
+        ts: '',
+        openAtor: '',
+        devCode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          highValue: row.highValue,
+          lowValue: row.lowValue,
+          overTime: row.overTime,
+          saltaTion: row.saltaTion,
+          sensorCode: row.sensorCode,
+          grade: row.grade,
+          ts: row.ts,
+          openAtor: row.openAtor,
+          devCode: row.devCode
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateWarningRule(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addWarningRule(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/warningManage/warningRule.vue b/src/views/warningManage/warningRule.vue
index c09d63f..54c1f95 100644
--- a/src/views/warningManage/warningRule.vue
+++ b/src/views/warningManage/warningRule.vue
@@ -13,7 +13,7 @@
       <search-item>
         <el-input
           v-model="listQuery.devcode"
-          placeholder="设备编号"
+          placeholder="设备编号!!!"
           clearable
         />
       </search-item>
@@ -64,17 +64,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-list-warning ref="dialogAlarmContent" @watchChild="fetchData" />
+    <edit-list-warning ref="editAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import dialogListWarning from '@/views/warningManage/components/dialogListWarning'
+import editListWarning from '@/views/warningManage/components/editWarning'
 import { warningRuleList, delWarningRule, batchImportWarn } from '@/api/warning/warningRule'
 
 export default {
   name: 'WarningRule',
-  components: { dialogListWarning },
+  components: { editListWarning },
   data() {
     return {
       // 查询条件
@@ -181,15 +181,15 @@
     },
     // 新增
     add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
+      this.$refs.editAlarmContent.initDialog('create')
     },
     // 修改
     edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
+      this.$refs.editAlarmContent.initDialog('update', row)
     },
     // 详情
     detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
+      this.$refs.editAlarmContent.initDialog('detail', row)
     },
     // 批量导入报警规则
     uploadFile(param) {
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 113ee2b..17e54d5 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -280,6 +280,9 @@
     },
     qu() { // 获取区
       return this.wellForm.qu
+    },
+    area() { // 获取街道
+      return this.wellForm.area
     }
   },
   watch: {
@@ -298,10 +301,14 @@
           var lnglat = val.split(',')
           geocoder.getAddress(lnglat, function(status, result) {
             if (status === 'complete' && result.info === 'OK') {
+              _this.wellForm.qu = result.regeocode.addressComponent.district
+              _this.wellForm.area = result.regeocode.addressComponent.township
               _this.wellForm.position = result.regeocode.formattedAddress
             // result为对应的地理位置详细信息
             } else {
               _this.wellForm.position = ''
+              _this.wellForm.qu = ''
+              _this.wellForm.area = ''
             }
           })
         })
@@ -318,7 +325,7 @@
     },
     qu(val) { // 监控区变化
       if (val !== '') {
-        this.wellForm.area = ''
+        // this.wellForm.area = ''
         this.fetchArea2()
       }
     }
@@ -370,7 +377,7 @@
     },
     // 获取区域2
     fetchArea2() {
-      getAreaList(this.qu).then(response => {
+      getAreaList(this.wellForm.qu).then(response => {
         this.jiedaoList = response.data
       })
     },
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index 0e1ab12..1ce6848 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -159,6 +159,7 @@
 import { getWellType, updateWell } from '@/api/well/well'
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
+import AMapLoader from '@amap/amap-jsapi-loader'
 
 export default {
   name: 'EditWell',
@@ -268,9 +269,43 @@
     },
     qu() { // 获取区
       return this.wellForm.qu
+    },
+    area() { // 获取街道
+      return this.wellForm.area
+    },
+    lonLat() {
+      return this.wellForm.coordinateX + ',' + this.wellForm.coordinateY
     }
   },
   watch: {
+    lonLat(val) {
+      var _this = this
+      window._AMapSecurityConfig = {
+        securityJsCode: this.$store.getters.amapSecurityCode
+      }
+      AMapLoader.load({
+        key: this.$store.getters.amapKey // 秘钥，从store中取
+      }).then((AMap) => {
+        AMap.plugin('AMap.Geocoder', function() {
+          var geocoder = new AMap.Geocoder({
+            city: ''
+          })
+          var lnglat = val.split(',')
+          geocoder.getAddress(lnglat, function(status, result) {
+            if (status === 'complete' && result.info === 'OK') {
+              _this.wellForm.qu = result.regeocode.addressComponent.district
+              _this.wellForm.area = result.regeocode.addressComponent.township
+              _this.wellForm.position = result.regeocode.formattedAddress
+            // result为对应的地理位置详细信息
+            } else {
+              _this.wellForm.position = ''
+              _this.wellForm.qu = ''
+              _this.wellForm.area = ''
+            }
+          })
+        })
+      })
+    },
     'wellForm.deptid'(val, oldVal) { // 监控权属单位变化
       if (oldVal !== '' && val !== '') {
         this.wellForm.responsibleDept = ''
@@ -509,8 +544,6 @@
     .el-dialog {
       width: 900px;
       margin-top: 10vh !important;
-      .el-dialog__body {
-      }
       .el-scrollbar {
         height: 410px;
         width: 100%;

diff --git a/mock/system/user.js b/mock/system/user.js
index 9fd5637..8287626 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -89,6 +89,7 @@
     { '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': 'warningList', 'icon': '', 'id': '1138634759749795842', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
@@ -98,8 +99,6 @@
     { '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': 'device', 'icon': 'icon-alarm', 'id': '1138378229630761985', 'ismenu': '1', 'levels': 1, 'name': '报警管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning' },
-    { 'code': 'concentrator_manage', 'icon': '', 'id': '1138693302442582017', 'ismenu': '1', 'levels': 1, 'name': '报警规则管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/warning/rule' },
     { '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' },
     { 'code': 'liquid_gas_data_list', 'icon': '', 'id': '1426002745902108673', 'ismenu': '0', 'levels': 2, 'name': '燃气一体化数据查询', 'num': 0, 'parentId': '1138702379389775873', 'resourceType': '04', 'url': '/liquidGasData/list' },
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
index 9afa04e..7f23ab1 100644
--- a/src/api/systemConfig/tenantConfig.js
+++ b/src/api/systemConfig/tenantConfig.js
@@ -14,7 +14,7 @@
 }
 
 // 添加项目配置
-export function addAlarmTenant(params) {
+export function addAlarmContent(params) {
   return request({
     url: 'tenantConfig/add',
     method: 'post',
@@ -22,7 +22,7 @@
   })
 }
 // 修改项目配置
-export function updateAlarmTenant(params) {
+export function updateAlarmContent(params) {
   return request({
     url: 'tenantConfig/update',
     method: 'post',
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 07fcc53..2dd9311 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -27,7 +27,7 @@
     {
       path: '/tenantConfig',
       name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
       meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     },
     {
@@ -39,7 +39,7 @@
     {
       path: '/deptPermission',
       name: 'DeptPermission',
-      component: () => import('@/views/systemConfig/deptPermission/listDept'),
+      component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index 1b1f112..e2f5127 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -19,6 +19,12 @@
       meta: { title: '资源管理', icon: 'function', permission: ['/sys/resource'] }
     },
     {
+      path: '/tenantList',
+      component: () => import('@/views/system/tenant/tenantList'), // Parent router-view
+      name: 'TenantList',
+      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
+    },
+    {
       path: '/dict',
       name: 'Dict',
       component: () => import('@/views/system/dict/listDict'),
@@ -65,12 +71,6 @@
       component: () => import('@/views/system/log/loginLog'), // Parent router-view
       name: 'LoginLog',
       meta: { title: '登录日志', permission: ['/sys/loginLog/list'] }
-    },
-    {
-      path: '/tenantList',
-      component: () => import('@/views/system/tenant/tenantSystList'), // Parent router-view
-      name: 'TenantList',
-      meta: { title: '项目管理', permission: ['/sys/tenantSys/list'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 605a7c0..583526c 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -50,18 +50,6 @@
         meta: { title: '告警工单', icon: 'icon-config', keepAlive: true, permission: ['/job/list'] }
       },
       {
-        path: '/listOvertimeGetJob',
-        name: 'ListJobOvertimeGet',
-        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
-        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
-      },
-      {
-        path: '/listOvertimeHandleJob',
-        name: 'ListJobOvertimeHandle',
-        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
-        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
-      },
-      {
         path: '/detailJob/:id(\\d+)',
         name: 'DetailJob',
         component: () => import('@/views/jobManage/detailJob'),
@@ -73,6 +61,24 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/alarmRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule/list'] }
+      },
+      {
+        path: '/warningList',
+        name: 'warningList',
+        component: () => import('@/views/warningManage/warningRule'),
+        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
+      },
+      {
+        path: '/listOvertimeGetJob',
+        name: 'ListJobOvertimeGet',
+        component: () => import('@/views/jobManage/listJobsOverTimeGet'),
+        meta: { title: '超时未接收工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeGetList'] }
+      },
+      {
+        path: '/listOvertimeHandleJob',
+        name: 'ListJobOvertimeHandle',
+        component: () => import('@/views/jobManage/listJobsOverTimeHandle'),
+        meta: { title: '超时未处理工单', icon: 'icon-config', keepAlive: true, permission: ['/job/overtimeHandleList'] }
       }
     ]
   },
@@ -161,26 +167,6 @@
     ]
   },
   {
-    path: 'warningManage',
-    component: Layout,
-    redirect: '/warningList',
-    name: 'WarningManage',
-    alwaysShow: true,
-    meta: {
-      title: '报警管理',
-      icon: 'icon-alarm', // 图标
-      permission: ['/warning']// 权限名称
-    },
-    children: [
-      {
-        path: '/warningList',
-        name: 'warningList',
-        component: () => import('@/views/warningManage/warningRule'),
-        meta: { title: '报警规则管理', icon: 'icon-config', permission: ['/warning/rule'] }
-      }
-    ]
-  },
-  {
     path: 'data',
     component: Layout,
     redirect: '/dataManage',
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
deleted file mode 100644
index f2694ca..0000000
--- a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<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="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="IMEI号" prop="imei">
-            <el-input
-              v-model.trim="deviceForm.imei"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="SIM卡号" prop="iccid">
-            <el-input
-              v-model.trim="deviceForm.iccid"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
-export default {
-  name: 'DialogDeviceImei',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          devcode: row.devcode,
-          imei: row.imei,
-          iccid: row.iccid
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceImei(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceImei(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
new file mode 100644
index 0000000..75aa9d5
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
@@ -0,0 +1,174 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'EditDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceImei(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceImei(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 6972054..1cb97f2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -118,17 +118,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
 import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
   name: 'DeviceImei',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -162,8 +162,7 @@
       fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -225,15 +224,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     },
     // 批量导入集中器
     uploadFile(param) {
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
deleted file mode 100644
index 7e32e6d..0000000
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceTypeList: [],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice(this.listQuery).then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(row)
-        this.deviceForm = {
-          modelName: row.deviceTypeName,
-          deviceType: row.modelName,
-          communication: row.communication.split(','),
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceModel/components/editDeviceModel.vue b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
new file mode 100644
index 0000000..0ca37b4
--- /dev/null
+++ b/src/views/deviceManage/deviceModel/components/editDeviceModel.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'EditDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(row)
+        this.deviceForm = {
+          modelName: row.deviceTypeName,
+          deviceType: row.modelName,
+          communication: row.communication.split(','),
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 87ce8d2..e018d0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -120,17 +120,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import editDevice from '@/views/deviceManage/deviceModel/components/editDeviceModel'
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
   name: 'DeviceModel',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -187,8 +187,7 @@
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      listLoading: true // 加载动画
     }
   },
   created() {
@@ -257,15 +256,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
deleted file mode 100644
index e195efb..0000000
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="typeName">
-            <el-select
-              v-model="deviceForm.typeName"
-              clearable
-              placeholder="请选择设备类型"
-              :disabled="dialogStatus === 'create' ? false : true"
-            >
-              <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="valid">
-            <el-select
-              v-model.trim="deviceForm.valid"
-              placeholder="请选择是否启用"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            >
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备描述" prop="typeDescription">
-            <el-input
-              v-model.trim="deviceForm.typeDescription"
-              type="text"
-              placeholder="非必填"
-              clearable
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="监控内容" prop="watchType">
-            <el-input
-              v-model.trim="deviceForm.watchType"
-              type="text"
-              clearable
-              placeholder="请输入监控内容"
-              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
-export default {
-  name: 'DialogDeviceType',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      },
-      // 表单校验规则
-      rules: {
-        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
-        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        devcode: '',
-        typeName: '',
-        typeDescription: '',
-        valid: '',
-        watchType: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          devcode: row.id,
-          typeName: row.typeName,
-          typeDescription: row.typeDescription,
-          valid: row.valid,
-          watchType: row.watchType
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDeviceType(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDeviceType(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
diff --git a/src/views/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
new file mode 100644
index 0000000..c05674f
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/editDeviceType.vue
@@ -0,0 +1,234 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="text"
+              placeholder="非必填"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="text"
+              clearable
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'EditDeviceType',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDeviceType(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index d079f06..0133850 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -116,17 +116,17 @@
         </el-table-column>
       </el-table>
     </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+    <edit-device ref="editDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
   name: 'DeviceType',
-  components: { dialogDevice },
+  components: { editDevice },
   data() {
     return {
       listQuery: {
@@ -246,15 +246,15 @@
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
+      this.$refs.editDevice.initDialog('detail', row)
     },
     // 新增设备
     add() {
-      this.$refs.dialogDevice.initDialog('create')
+      this.$refs.editDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.editDevice.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/system/tenant/components/dialogSysTenant.vue b/src/views/system/tenant/components/dialogSysTenant.vue
deleted file mode 100644
index 0b2d1c1..0000000
--- a/src/views/system/tenant/components/dialogSysTenant.vue
+++ /dev/null
@@ -1,273 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目编码" prop="tenantCode">
-            <el-input
-              v-model="deviceForm.tenantCode"
-              clearable
-              placeholder="请输入与项目编码"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目名称" prop="tenantName">
-            <el-input
-              v-model="deviceForm.tenantName"
-              placeholder="请输入项目名称"
-              clearable
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="项目联系人" prop="linkPerson">
-            <el-input
-              v-model="deviceForm.linkPerson"
-              placeholder="请输入项目联系人"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="联系人电话" prop="tel">
-            <el-input
-              v-model="deviceForm.tel"
-              placeholder="请输入联系人电话"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="历史保存天数" prop="clearDay">
-            <el-input
-              v-model="deviceForm.clearDay"
-              placeholder="请输入历史数据保存天数"
-              clearable
-              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
-          <el-form-item label="组织名称" prop="deptName">
-            <el-select
-              v-model="deviceForm.deptName"
-              placeholder="请选择关联组织名称"
-              clearable
-            >
-              <el-option
-                v-for="item in deptNameList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
-export default {
-  name: 'DialogSysTenant',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情',
-        makeDep: '项目绑定组织'
-      },
-      // 组织关系列表
-      deptNameList: [
-        {
-          name: '组织名称一',
-          value: '0'
-        },
-        {
-          name: '组织名称二',
-          value: '1'
-        },
-        {
-          name: '组织名称三',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      },
-      // 表单校验规则
-      rules: {
-        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
-        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
-        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
-        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
-        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        tenantCode: '',
-        tenantName: '',
-        linkPerson: '',
-        tel: '',
-        clearDay: '',
-        deptName: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
-        this.deviceForm = {
-          tenantCode: row.tenantCode,
-          tenantName: row.tenantName,
-          linkPerson: row.linkPerson,
-          tel: row.tel,
-          clearDay: row.clearDay,
-          deptName: row.deptName
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      } else if (this.dialogStatus === 'makeDep') {
-        this.makeDept()
-      }
-    },
-    // 绑定组织关系
-    makeDept() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          deptTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('绑定成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateTenantSys(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addTenantSys(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/system/tenant/components/editTenant.vue b/src/views/system/tenant/components/editTenant.vue
new file mode 100644
index 0000000..13e311c
--- /dev/null
+++ b/src/views/system/tenant/components/editTenant.vue
@@ -0,0 +1,273 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目编码" prop="tenantCode">
+            <el-input
+              v-model="deviceForm.tenantCode"
+              clearable
+              placeholder="请输入与项目编码"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="项目名称" prop="tenantName">
+            <el-input
+              v-model="deviceForm.tenantName"
+              placeholder="请输入项目名称"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="项目联系人" prop="linkPerson">
+            <el-input
+              v-model="deviceForm.linkPerson"
+              placeholder="请输入项目联系人"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人电话" prop="tel">
+            <el-input
+              v-model="deviceForm.tel"
+              placeholder="请输入联系人电话"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="历史保存天数" prop="clearDay">
+            <el-input
+              v-model="deviceForm.clearDay"
+              placeholder="请输入历史数据保存天数"
+              clearable
+              :disabled="dialogStatus === 'detail' || dialogStatus === 'makeDep' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'makeDep' ? true : false" :span="12">
+          <el-form-item label="组织名称" prop="deptName">
+            <el-select
+              v-model="deviceForm.deptName"
+              placeholder="请选择关联组织名称"
+              clearable
+            >
+              <el-option
+                v-for="item in deptNameList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateTenantSys, addTenantSys, deptTenantSys } from '@/api/system/tenant'
+export default {
+  name: 'EditSysTenant',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情',
+        makeDep: '项目绑定组织'
+      },
+      // 组织关系列表
+      deptNameList: [
+        {
+          name: '组织名称一',
+          value: '0'
+        },
+        {
+          name: '组织名称二',
+          value: '1'
+        },
+        {
+          name: '组织名称三',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      },
+      // 表单校验规则
+      rules: {
+        tenantCode: [{ required: true, message: '项目编码不能为空', trigger: ['blur', 'change'] }],
+        tenantName: [{ required: true, message: '项目名称不能为空', trigger: ['blur', 'change'] }],
+        linkPerson: [{ required: true, message: '项目联系人不能为空', trigger: ['blur', 'change'] }],
+        tel: [{ required: true, message: '联系人电话不能为空', trigger: ['blur', 'change'] }],
+        deptName: [{ required: true, message: '	关联组织名称必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        tenantCode: '',
+        tenantName: '',
+        linkPerson: '',
+        tel: '',
+        clearDay: '',
+        deptName: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail' || this.dialogStatus === 'makeDep') {
+        this.deviceForm = {
+          tenantCode: row.tenantCode,
+          tenantName: row.tenantName,
+          linkPerson: row.linkPerson,
+          tel: row.tel,
+          clearDay: row.clearDay,
+          deptName: row.deptName
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      } else if (this.dialogStatus === 'makeDep') {
+        this.makeDept()
+      }
+    },
+    // 绑定组织关系
+    makeDept() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          deptTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('绑定成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateTenantSys(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addTenantSys(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantList.vue b/src/views/system/tenant/tenantList.vue
new file mode 100644
index 0000000..408328c
--- /dev/null
+++ b/src/views/system/tenant/tenantList.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="140" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+            <el-button type="text" size="small" @click="makeDep(scope.row)">
+              组织
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/system/tenant/components/editTenant'
+import { tenantSysList, delTenantSys } from '@/api/system/tenant'
+
+export default {
+  name: 'TenantList',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '项目编码',
+          value: 'tenantCode',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '项目联系人',
+          value: 'linkPerson',
+          align: 'center'
+        },
+        {
+          text: '联系人电话',
+          value: 'tel',
+          align: 'center'
+        },
+        {
+          text: '历史数据保存天数',
+          value: 'clearDay',
+          align: 'center'
+        },
+        {
+          text: '关联组织',
+          value: 'deptId',
+          align: 'center'
+        },
+        {
+          text: '关联组织名称',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      tenantSysList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delTenantSys(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    },
+    // 绑定组织
+    makeDep(row) {
+      this.$refs.editAlarmContent.initDialog('makeDep', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/system/tenant/tenantSystList.vue b/src/views/system/tenant/tenantSystList.vue
deleted file mode 100644
index 61149b2..0000000
--- a/src/views/system/tenant/tenantSystList.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="140" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" size="small" @click="makeDep(scope.row)">
-              组织
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/system/tenant/components/dialogSysTenant'
-import { tenantSysList, delTenantSys } from '@/api/system/tenant'
-
-export default {
-  name: 'TenantSystList',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '项目编码',
-          value: 'tenantCode',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '项目联系人',
-          value: 'linkPerson',
-          align: 'center'
-        },
-        {
-          text: '联系人电话',
-          value: 'tel',
-          align: 'center'
-        },
-        {
-          text: '历史数据保存天数',
-          value: 'clearDay',
-          align: 'center'
-        },
-        {
-          text: '关联组织',
-          value: 'deptId',
-          align: 'center'
-        },
-        {
-          text: '关联组织名称',
-          value: 'deptName',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      tenantSysList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delTenantSys(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    },
-    // 绑定组织
-    makeDep(row) {
-      this.$refs.dialogAlarmContent.initDialog('makeDep', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
deleted file mode 100644
index 0ea149c..0000000
--- a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="告警内容" prop="alarmContent">
-            <el-input
-              v-model.trim="deviceForm.alarmContent"
-              type="text"
-              clearable
-              placeholder="请输入告警内容"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警类型" prop="alarmType">
-            <el-select
-              v-model="deviceForm.alarmType"
-              placeholder="告警类型"
-              clearable
-            >
-              <el-option
-                v-for="item in alarmTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              clearable
-              multiple
-              placeholder="请选择设备类型"
-            >
-              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              placeholder="未知"
-              disabled
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
-export default {
-  name: 'DialogAlarmContent',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
-        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deviceType: [],
-        alarmType: '',
-        alarmContent: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        console.log(row)
-        this.deviceForm = {
-          alarmType: row.alarmType,
-          alarmContent: row.alarmContent,
-          devcode: row.id,
-          deviceType: row.deviceType.split(',')
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmContent/components/editAlarmContent.vue b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
new file mode 100644
index 0000000..96e56f2
--- /dev/null
+++ b/src/views/systemConfig/alarmContent/components/editAlarmContent.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="告警内容" prop="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
+              clearable
+              placeholder="请输入告警内容"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警类型" prop="alarmType">
+            <el-select
+              v-model="deviceForm.alarmType"
+              placeholder="告警类型"
+              clearable
+            >
+              <el-option
+                v-for="item in alarmTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              clearable
+              multiple
+              placeholder="请选择设备类型"
+            >
+              <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 v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              placeholder="未知"
+              disabled
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/alarmContent'
+export default {
+  name: 'EditAlarmContent',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        alarmType: [{ required: true, message: '告警类型必选', trigger: ['blur', 'change'] }],
+        alarmContent: [{ required: true, message: '告警内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deviceType: [],
+        alarmType: '',
+        alarmContent: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        console.log(row)
+        this.deviceForm = {
+          alarmType: row.alarmType,
+          alarmContent: row.alarmContent,
+          devcode: row.id,
+          deviceType: row.deviceType.split(',')
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.deviceType = this.deviceForm.deviceType.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index f203f26..b7d9dab 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -73,17 +73,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import dialogAlarmContent from '@/views/systemConfig/alarmContent/components/dialogAlarmContent'
+import editAlarmContent from '@/views/systemConfig/alarmContent/components/editAlarmContent'
 import { getDevice, alarmContentList, delAlarmContent } from '@/api/systemConfig/alarmContent'
 
 export default {
   name: 'ListContent',
-  components: { dialogAlarmContent },
+  components: { editAlarmContent },
   data() {
     return {
       // 查询条件
@@ -183,11 +183,11 @@
     },
     // 新增
     add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
+      this.$refs.editAlarmContent.initDialog('create')
     },
     // 修改
     edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
+      this.$refs.editAlarmContent.initDialog('update', row)
     }
   }
 }
diff --git a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
deleted file mode 100644
index bfb0c1d..0000000
--- a/src/views/systemConfig/alarmLevel/components/dialogAlarmLevel.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.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-col>
-        <el-col :span="12">
-          <el-form-item label="监测指标" prop="name">
-            <el-input
-              v-model="deviceForm.name"
-              clearable
-              placeholder="请输入监测指标名称"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="开启报警" prop="openAlarm">
-            <el-select
-              v-model="deviceForm.openAlarm"
-              placeholder="请选择是否开启报警"
-              clearable
-            >
-              <el-option
-                v-for="item in openAlarmList"
-                :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="openJob">
-            <el-select
-              v-model="deviceForm.openJob"
-              placeholder="请选择是否开启工单"
-              clearable
-            >
-              <el-option
-                v-for="item in openJobList"
-                :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="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入告警上限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="告警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入告警下限"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="level">
-            <el-select
-              v-model="deviceForm.level"
-              placeholder="请选择报警等级"
-              clearable
-            >
-              <el-option
-                v-for="item in levelList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
-export default {
-  name: 'DialogAlarmLevel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: '', // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否开启报警
-      openAlarmList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 是否开启工单
-      openJobList: [
-        {
-          name: '是',
-          value: '1'
-        },
-        {
-          name: '否',
-          value: '0'
-        }
-      ],
-      // 报警等级
-      levelList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        },
-        {
-          name: '三级报警',
-          value: '3'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deviceType: '',
-        name: '',
-        openAlarm: '',
-        openJob: '',
-        level: '',
-        lowValue: '',
-        highValue: ''
-      },
-      // 表单校验规则
-      rules: {
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
-        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
-        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
-        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
-        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmLevel(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
new file mode 100644
index 0000000..4db04c2
--- /dev/null
+++ b/src/views/systemConfig/alarmLevel/components/editAlarmLevel.vue
@@ -0,0 +1,281 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.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-col>
+        <el-col :span="12">
+          <el-form-item label="监测指标" prop="name">
+            <el-input
+              v-model="deviceForm.name"
+              clearable
+              placeholder="请输入监测指标名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="开启报警" prop="openAlarm">
+            <el-select
+              v-model="deviceForm.openAlarm"
+              placeholder="请选择是否开启报警"
+              clearable
+            >
+              <el-option
+                v-for="item in openAlarmList"
+                :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="openJob">
+            <el-select
+              v-model="deviceForm.openJob"
+              placeholder="请选择是否开启工单"
+              clearable
+            >
+              <el-option
+                v-for="item in openJobList"
+                :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="highValue">
+            <el-input
+              v-model="deviceForm.highValue"
+              placeholder="请输入告警上限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="告警下限" prop="lowValue">
+            <el-input
+              v-model="deviceForm.lowValue"
+              placeholder="请输入告警下限"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警等级" prop="level">
+            <el-select
+              v-model="deviceForm.level"
+              placeholder="请选择报警等级"
+              clearable
+            >
+              <el-option
+                v-for="item in levelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, addAlarmLevel } from '@/api/systemConfig/alarmLevel'
+export default {
+  name: 'EditAlarmLevel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: '', // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否开启报警
+      openAlarmList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 是否开启工单
+      openJobList: [
+        {
+          name: '是',
+          value: '1'
+        },
+        {
+          name: '否',
+          value: '0'
+        }
+      ],
+      // 报警等级
+      levelList: [
+        {
+          name: '一级报警',
+          value: '1'
+        },
+        {
+          name: '二级报警',
+          value: '2'
+        },
+        {
+          name: '三级报警',
+          value: '3'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deviceType: '',
+        name: '',
+        openAlarm: '',
+        openJob: '',
+        level: '',
+        lowValue: '',
+        highValue: ''
+      },
+      // 表单校验规则
+      rules: {
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        name: [{ required: true, message: '监测指标名称不能为空', trigger: ['blur', 'change'] }],
+        openAlarm: [{ required: true, message: '是否开启报警必选', trigger: ['blur', 'change'] }],
+        openJob: [{ required: true, message: '是否开启工单必选', trigger: ['blur', 'change'] }],
+        level: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
+        lowValue: [{ required: true, message: '告警下限不能为空', trigger: ['blur', 'change'] }],
+        highValue: [{ required: true, message: '告警上限不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmLevel(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index 193f00f..708efea 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -73,11 +73,11 @@
 import EditH2sLevel from './components/editH2sLevel'
 import EditHumiLevel from './components/editHumiLevel'
 import EditO2Level from './components/editO2Level'
-import dialogAlarmLevel from './components/dialogAlarmLevel'
+import editAlarmLevel from './components/editAlarmLevel'
 
 export default {
   name: 'ListLevel',
-  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, dialogAlarmLevel },
+  components: { EditO2Level, EditHumiLevel, EditCOLevel, EditCh4Level, EditH2sLevel, editLiquidLevel, editDigLevel, editGasLevel, editTempLevel, infoWell, editAlarmLevel },
   data() {
     return {
       selectedTenant: {
@@ -181,7 +181,7 @@
     },
     // 新增
     add() {
-      this.cmpName = 'dialog-alarm-level'
+      this.cmpName = 'edit-alarm-level'
       setTimeout(() => {
         this.$refs.editdialog.initDialog('create')
       }, 100)
diff --git a/src/views/systemConfig/deptPermission/components/dialogListDept.vue b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
deleted file mode 100644
index 5d75707..0000000
--- a/src/views/systemConfig/deptPermission/components/dialogListDept.vue
+++ /dev/null
@@ -1,238 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select
-              v-model="deviceForm.deviceType"
-              placeholder="请选择设备类型"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <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="wellType">
-            <el-select
-              v-model="deviceForm.wellType"
-              clearable
-              placeholder="请选择支持井类型"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in wellTypeList"
-                :key="item.value"
-                :label="item.label"
-                :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="lng">
-            <el-input
-              v-model="deviceForm.lng"
-              clearable
-              placeholder="请输入经度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="纬度" prop="lat">
-            <el-input
-              v-model="deviceForm.lat"
-              clearable
-              placeholder="请输入纬度"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="组织id" prop="deptid">
-            <el-input
-              v-model="deviceForm.deptid"
-              clearable
-              disabled
-              placeholder="请输入组织id"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
-export default {
-  name: 'DialogListDept',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 支持井类型
-      wellTypeList: [
-        {
-          label: '井类型一',
-          value: '1'
-        },
-        {
-          label: '井类型二',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      },
-      // 表单校验规则
-      rules: {
-        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
-        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
-        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
-        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          deptid: row.deptid,
-          wellType: row.wellType,
-          deviceType: row.deviceType,
-          lng: row.lng,
-          lat: row.lat
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDept(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDept(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
new file mode 100644
index 0000000..429076f
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <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="wellType">
+            <el-select
+              v-model="deviceForm.wellType"
+              clearable
+              placeholder="请选择支持井类型"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in wellTypeList"
+                :key="item.value"
+                :label="item.label"
+                :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="lng">
+            <el-input
+              v-model="deviceForm.lng"
+              clearable
+              placeholder="请输入经度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="纬度" prop="lat">
+            <el-input
+              v-model="deviceForm.lat"
+              clearable
+              placeholder="请输入纬度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="组织id" prop="deptid">
+            <el-input
+              v-model="deviceForm.deptid"
+              clearable
+              disabled
+              placeholder="请输入组织id"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
+export default {
+  name: 'EditDeptPermission',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 支持井类型
+      wellTypeList: [
+        {
+          label: '井类型一',
+          value: '1'
+        },
+        {
+          label: '井类型二',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      },
+      // 表单校验规则
+      rules: {
+        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
+        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDept(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDept(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
new file mode 100644
index 0000000..4305f54
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -0,0 +1,182 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-select
+          v-model="listQuery.deptid"
+          placeholder="组织id"
+          clearable
+        >
+          <el-option
+            v-for="item in deptidList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="120" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-list-dept ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editListDept from '@/views/systemConfig/deptPermission/components/editDeptPermission'
+import { deptList, delDept } from '@/api/systemConfig/deptPermission'
+
+export default {
+  name: 'DeptPermission',
+  components: { editListDept },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        deptid: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      deptidList: [
+        {
+          label: '3213213',
+          value: '0'
+        },
+        {
+          label: '9873213',
+          value: '1'
+        }
+      ],
+      columns: [
+        {
+          text: '组织名称',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '支持井类型',
+          value: 'wellType',
+          align: 'center'
+        },
+        {
+          text: '支持设备类型',
+          value: 'deviceType',
+          align: 'center'
+        },
+        {
+          text: '地图默认中心经度',
+          value: 'lng',
+          align: 'center'
+        },
+        {
+          text: '地图默认中心纬度',
+          value: 'lat',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      deptList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDept(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/listDept.vue b/src/views/systemConfig/deptPermission/listDept.vue
deleted file mode 100644
index 738c5b1..0000000
--- a/src/views/systemConfig/deptPermission/listDept.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-select
-          v-model="listQuery.deptid"
-          placeholder="组织id"
-          clearable
-        >
-          <el-option
-            v-for="item in deptidList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="120" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-list-dept ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogListDept from '@/views/systemConfig/deptPermission/components/dialogListDept'
-import { deptList, delDept } from '@/api/systemConfig/deptPermission'
-
-export default {
-  name: 'ListDept',
-  components: { dialogListDept },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        deptid: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      deptidList: [
-        {
-          label: '3213213',
-          value: '0'
-        },
-        {
-          label: '9873213',
-          value: '1'
-        }
-      ],
-      columns: [
-        {
-          text: '组织名称',
-          value: 'deptName',
-          align: 'center'
-        },
-        {
-          text: '支持井类型',
-          value: 'wellType',
-          align: 'center'
-        },
-        {
-          text: '支持设备类型',
-          value: 'deviceType',
-          align: 'center'
-        },
-        {
-          text: '地图默认中心经度',
-          value: 'lng',
-          align: 'center'
-        },
-        {
-          text: '地图默认中心纬度',
-          value: 'lat',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      deptList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delDept(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue b/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
deleted file mode 100644
index 7ca5297..0000000
--- a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
+++ /dev/null
@@ -1,347 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="通讯方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              :disabled="dialogStatus === 'detail' ? true : false"
-              placeholder="请选择支持通信方式"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="坐标系" prop="coordinateType">
-            <el-input
-              v-model="deviceForm.coordinateType"
-              placeholder="请输入数据默认坐标系"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="生成工单" prop="isJobGenerate">
-            <el-select
-              v-model="deviceForm.isJobGenerate"
-              clearable
-              placeholder="请选择是否生成工单"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in jobList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="APP推送" prop="isAppPush">
-            <el-select
-              v-model="deviceForm.isAppPush"
-              clearable
-              placeholder="请选择是否APP推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in appPushList"
-                :key="item.value"
-                :label="item.label"
-                :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="isMessagePush">
-            <el-select
-              v-model="deviceForm.isMessagePush"
-              clearable
-              placeholder="请选择是否短信推送"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in messagePushList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="项目id" prop="devcode">
-            <el-input
-              v-model="deviceForm.devcode"
-              clearable
-              disabled
-              placeholder="未知"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/tenantConfig'
-export default {
-  name: 'DialogListTenant',
-  data() {
-    return {
-      // 通讯方式
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 是否生成工单
-      jobList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启App推送
-      appPushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      // 是否开启短信推送
-      messagePushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
-      dialogFormVisible: false, // 对话框显示隐藏
-      deviceTypeList: [], // 设备类型
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 是否启用
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        isMessagePush: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
-        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
-        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
-        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
-        isMessagePush: [{ required: true, message: '是否开启短信推送必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  methods: {
-    // 获取设备类型
-    fetchDeviceType() {
-      getDevice().then(response => {
-        this.deviceTypeList = response.data
-      })
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        communication: [],
-        coordinateType: '',
-        isJobGenerate: '',
-        isAppPush: '',
-        isMessagePush: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          communication: row.communication.split(','),
-          coordinateType: row.coordinateType,
-          isJobGenerate: row.isJobGenerate,
-          isAppPush: row.isAppPush,
-          isMessagePush: row.isMessagePush,
-          devcode: row.tenentId
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateAlarmContent(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addAlarmContent(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
new file mode 100644
index 0000000..d1be724
--- /dev/null
+++ b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
@@ -0,0 +1,337 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="通讯方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              :disabled="dialogStatus === 'detail' ? true : false"
+              placeholder="请选择支持通信方式"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="坐标系" prop="coordinateType">
+            <el-input
+              v-model="deviceForm.coordinateType"
+              placeholder="请输入数据默认坐标系"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="生成工单" prop="isJobGenerate">
+            <el-select
+              v-model="deviceForm.isJobGenerate"
+              clearable
+              placeholder="请选择是否生成工单"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in jobList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="APP推送" prop="isAppPush">
+            <el-select
+              v-model="deviceForm.isAppPush"
+              clearable
+              placeholder="请选择是否APP推送"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in appPushList"
+                :key="item.value"
+                :label="item.label"
+                :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="isMessagePush">
+            <el-select
+              v-model="deviceForm.isMessagePush"
+              clearable
+              placeholder="请选择是否短信推送"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in messagePushList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
+          <el-form-item label="项目id" prop="devcode">
+            <el-input
+              v-model="deviceForm.devcode"
+              clearable
+              disabled
+              placeholder="未知"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { updateAlarmContent, addAlarmContent } from '@/api/systemConfig/tenantConfig'
+export default {
+  name: 'EditTenantConfig',
+  data() {
+    return {
+      // 通讯方式
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 是否生成工单
+      jobList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      // 是否开启App推送
+      appPushList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      // 是否开启短信推送
+      messagePushList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        isMessagePush: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
+        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
+        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
+        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
+        isMessagePush: [{ required: true, message: '是否开启短信推送必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        isMessagePush: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          communication: row.communication.split(','),
+          coordinateType: row.coordinateType,
+          isJobGenerate: row.isJobGenerate,
+          isAppPush: row.isAppPush,
+          isMessagePush: row.isMessagePush,
+          devcode: row.tenentId
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/systemConfig/tenantConfig/listTenant.vue b/src/views/systemConfig/tenantConfig/listTenant.vue
deleted file mode 100644
index 26ac194..0000000
--- a/src/views/systemConfig/tenantConfig/listTenant.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-<template>
-  <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="120" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <dialog-alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
-  </app-container>
-</template>
-
-<script>
-import dialogAlarmContent from '@/views/systemConfig/tenantConfig/components/dialogListTenant'
-import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
-
-export default {
-  name: 'ListTenant',
-  components: { dialogAlarmContent },
-  data() {
-    return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
-      },
-      columns: [
-        {
-          text: '编号',
-          value: 'tenentId',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '支持通讯协议',
-          value: 'communication',
-          align: 'center'
-        },
-        {
-          text: '导入数据默认坐标系',
-          value: 'coordinateType',
-          align: 'center'
-        },
-        {
-          text: '是否需要生成工单',
-          value: 'isJobGenerate',
-          align: 'center'
-        },
-        {
-          text: '是否开启APP推送',
-          value: 'isAppPush',
-          align: 'center'
-        },
-        {
-          text: '是否开启短信推送',
-          value: 'isMessagePush',
-          align: 'center'
-        },
-        {
-          text: '报警推送规则',
-          value: 'alarmPushType',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    // 获取数据列表
-    fetchData() {
-      this.listLoading = true
-      alarmTenantList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delAlarmTenant(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
-    },
-    // 修改
-    edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
-    },
-    // 详情
-    detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
-  }
-</style>
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
new file mode 100644
index 0000000..58b9aac
--- /dev/null
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -0,0 +1,180 @@
+<template>
+  <app-container>
+    <search-area
+      class="searchBottom"
+      :need-clear="false"
+      :need-search-more="false"
+      type="seperate"
+      size="small"
+      search-more-type="default"
+      @search="fetchData"
+    >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="120" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import editAlarmContent from '@/views/systemConfig/tenantConfig/components/editTenantConfig'
+import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
+
+export default {
+  name: 'TenantConfig',
+  components: { editAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '编号',
+          value: 'tenentId',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '支持通讯协议',
+          value: 'communication',
+          align: 'center'
+        },
+        {
+          text: '导入数据默认坐标系',
+          value: 'coordinateType',
+          align: 'center'
+        },
+        {
+          text: '是否需要生成工单',
+          value: 'isJobGenerate',
+          align: 'center'
+        },
+        {
+          text: '是否开启APP推送',
+          value: 'isAppPush',
+          align: 'center'
+        },
+        {
+          text: '是否开启短信推送',
+          value: 'isMessagePush',
+          align: 'center'
+        },
+        {
+          text: '报警推送规则',
+          value: 'alarmPushType',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      alarmTenantList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delAlarmTenant(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.editAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>
diff --git a/src/views/warningManage/components/dialogListWarning.vue b/src/views/warningManage/components/dialogListWarning.vue
deleted file mode 100644
index 010a00e..0000000
--- a/src/views/warningManage/components/dialogListWarning.vue
+++ /dev/null
@@ -1,293 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警下限" prop="lowValue">
-            <el-input
-              v-model="deviceForm.lowValue"
-              placeholder="请输入报警下限"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="报警上限" prop="highValue">
-            <el-input
-              v-model="deviceForm.highValue"
-              placeholder="请输入报警上限"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="操作人姓名" prop="openAtor">
-            <el-input
-              v-model="deviceForm.openAtor"
-              placeholder="请输入操作人姓名"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="超时时间" prop="overTime">
-            <el-date-picker
-              v-model="deviceForm.overTime"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              clearable
-              placeholder="请选择超时时间"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="突然阈值" prop="saltaTion">
-            <el-input
-              v-model="deviceForm.saltaTion"
-              clearable
-              placeholder="请输入突然阈值"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="时间戳" prop="ts">
-            <el-date-picker
-              v-model="deviceForm.ts"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              clearable
-              placeholder="请选择时间戳"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="报警等级" prop="grade">
-            <el-select
-              v-model="deviceForm.grade"
-              placeholder="请选择报警等级"
-              clearable
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in gradeList"
-                :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="sensorCode">
-            <el-input
-              v-model="deviceForm.sensorCode"
-              clearable
-              placeholder="请输入传感器编号"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devCode">
-            <el-input
-              v-model="deviceForm.devCode"
-              clearable
-              disabled
-              placeholder="请输入设备编号"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { updateWarningRule, addWarningRule } from '@/api/warning/warningRule'
-export default {
-  name: 'DialogListWarning',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      // 报警等级
-      gradeList: [
-        {
-          name: '一级报警',
-          value: '1'
-        },
-        {
-          name: '二级报警',
-          value: '2'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        highValue: '',
-        lowValue: '',
-        overTime: '',
-        saltaTion: '',
-        sensorCode: '',
-        grade: '',
-        ts: '',
-        openAtor: '',
-        devCode: ''
-      },
-      // 表单校验规则
-      rules: {
-        highValue: [{ required: true, message: '报警上限不能为空', trigger: ['blur', 'change'] }],
-        lowValue: [{ required: true, message: '报警下限不能为空', trigger: ['blur', 'change'] }],
-        overTime: [{ required: true, message: '超时时间必选', trigger: ['blur', 'change'] }],
-        saltaTion: [{ required: true, message: '突然阈值不能为空', trigger: ['blur', 'change'] }],
-        sensorCode: [{ required: true, message: '传感器编号不能为空', trigger: ['blur', 'change'] }],
-        grade: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
-        ts: [{ required: true, message: '时间戳必选', trigger: ['blur', 'change'] }],
-        openAtor: [{ required: true, message: '操作人姓名不能为空', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        highValue: '',
-        lowValue: '',
-        overTime: '',
-        saltaTion: '',
-        sensorCode: '',
-        grade: '',
-        ts: '',
-        openAtor: '',
-        devCode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        this.deviceForm = {
-          highValue: row.highValue,
-          lowValue: row.lowValue,
-          overTime: row.overTime,
-          saltaTion: row.saltaTion,
-          sensorCode: row.sensorCode,
-          grade: row.grade,
-          ts: row.ts,
-          openAtor: row.openAtor,
-          devCode: row.devCode
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateWarningRule(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addWarningRule(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
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-  .el-select__tags {
-    flex-wrap: inherit !important;
-    overflow-x: auto !important;
-  }
-  ::-webkit-scrollbar {
-    height: 4px;
-  }
-  /* //滚动条的滑块 */
-  ::-webkit-scrollbar-thumb {
-    background-color: #eaecf1;
-    border-radius: 3px;
-  }
-</style>
diff --git a/src/views/warningManage/components/editWarning.vue b/src/views/warningManage/components/editWarning.vue
new file mode 100644
index 0000000..3c8a081
--- /dev/null
+++ b/src/views/warningManage/components/editWarning.vue
@@ -0,0 +1,293 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警下限" prop="lowValue">
+            <el-input
+              v-model="deviceForm.lowValue"
+              placeholder="请输入报警下限"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="报警上限" prop="highValue">
+            <el-input
+              v-model="deviceForm.highValue"
+              placeholder="请输入报警上限"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="操作人姓名" prop="openAtor">
+            <el-input
+              v-model="deviceForm.openAtor"
+              placeholder="请输入操作人姓名"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="超时时间" prop="overTime">
+            <el-date-picker
+              v-model="deviceForm.overTime"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              clearable
+              placeholder="请选择超时时间"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="突然阈值" prop="saltaTion">
+            <el-input
+              v-model="deviceForm.saltaTion"
+              clearable
+              placeholder="请输入突然阈值"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="时间戳" prop="ts">
+            <el-date-picker
+              v-model="deviceForm.ts"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              clearable
+              placeholder="请选择时间戳"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警等级" prop="grade">
+            <el-select
+              v-model="deviceForm.grade"
+              placeholder="请选择报警等级"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in gradeList"
+                :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="sensorCode">
+            <el-input
+              v-model="deviceForm.sensorCode"
+              clearable
+              placeholder="请输入传感器编号"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devCode">
+            <el-input
+              v-model="deviceForm.devCode"
+              clearable
+              disabled
+              placeholder="请输入设备编号"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { updateWarningRule, addWarningRule } from '@/api/warning/warningRule'
+export default {
+  name: 'EditWarning',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 报警等级
+      gradeList: [
+        {
+          name: '一级报警',
+          value: '1'
+        },
+        {
+          name: '二级报警',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        highValue: '',
+        lowValue: '',
+        overTime: '',
+        saltaTion: '',
+        sensorCode: '',
+        grade: '',
+        ts: '',
+        openAtor: '',
+        devCode: ''
+      },
+      // 表单校验规则
+      rules: {
+        highValue: [{ required: true, message: '报警上限不能为空', trigger: ['blur', 'change'] }],
+        lowValue: [{ required: true, message: '报警下限不能为空', trigger: ['blur', 'change'] }],
+        overTime: [{ required: true, message: '超时时间必选', trigger: ['blur', 'change'] }],
+        saltaTion: [{ required: true, message: '突然阈值不能为空', trigger: ['blur', 'change'] }],
+        sensorCode: [{ required: true, message: '传感器编号不能为空', trigger: ['blur', 'change'] }],
+        grade: [{ required: true, message: '报警等级必选', trigger: ['blur', 'change'] }],
+        ts: [{ required: true, message: '时间戳必选', trigger: ['blur', 'change'] }],
+        openAtor: [{ required: true, message: '操作人姓名不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        highValue: '',
+        lowValue: '',
+        overTime: '',
+        saltaTion: '',
+        sensorCode: '',
+        grade: '',
+        ts: '',
+        openAtor: '',
+        devCode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          highValue: row.highValue,
+          lowValue: row.lowValue,
+          overTime: row.overTime,
+          saltaTion: row.saltaTion,
+          sensorCode: row.sensorCode,
+          grade: row.grade,
+          ts: row.ts,
+          openAtor: row.openAtor,
+          devCode: row.devCode
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateWarningRule(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addWarningRule(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
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/warningManage/warningRule.vue b/src/views/warningManage/warningRule.vue
index c09d63f..54c1f95 100644
--- a/src/views/warningManage/warningRule.vue
+++ b/src/views/warningManage/warningRule.vue
@@ -13,7 +13,7 @@
       <search-item>
         <el-input
           v-model="listQuery.devcode"
-          placeholder="设备编号"
+          placeholder="设备编号!!!"
           clearable
         />
       </search-item>
@@ -64,17 +64,17 @@
         </el-table-column>
       </template>
     </normal-table>
-    <dialog-list-warning ref="dialogAlarmContent" @watchChild="fetchData" />
+    <edit-list-warning ref="editAlarmContent" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import dialogListWarning from '@/views/warningManage/components/dialogListWarning'
+import editListWarning from '@/views/warningManage/components/editWarning'
 import { warningRuleList, delWarningRule, batchImportWarn } from '@/api/warning/warningRule'
 
 export default {
   name: 'WarningRule',
-  components: { dialogListWarning },
+  components: { editListWarning },
   data() {
     return {
       // 查询条件
@@ -181,15 +181,15 @@
     },
     // 新增
     add() {
-      this.$refs.dialogAlarmContent.initDialog('create')
+      this.$refs.editAlarmContent.initDialog('create')
     },
     // 修改
     edit(row) {
-      this.$refs.dialogAlarmContent.initDialog('update', row)
+      this.$refs.editAlarmContent.initDialog('update', row)
     },
     // 详情
     detail(row) {
-      this.$refs.dialogAlarmContent.initDialog('detail', row)
+      this.$refs.editAlarmContent.initDialog('detail', row)
     },
     // 批量导入报警规则
     uploadFile(param) {
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 113ee2b..17e54d5 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -280,6 +280,9 @@
     },
     qu() { // 获取区
       return this.wellForm.qu
+    },
+    area() { // 获取街道
+      return this.wellForm.area
     }
   },
   watch: {
@@ -298,10 +301,14 @@
           var lnglat = val.split(',')
           geocoder.getAddress(lnglat, function(status, result) {
             if (status === 'complete' && result.info === 'OK') {
+              _this.wellForm.qu = result.regeocode.addressComponent.district
+              _this.wellForm.area = result.regeocode.addressComponent.township
               _this.wellForm.position = result.regeocode.formattedAddress
             // result为对应的地理位置详细信息
             } else {
               _this.wellForm.position = ''
+              _this.wellForm.qu = ''
+              _this.wellForm.area = ''
             }
           })
         })
@@ -318,7 +325,7 @@
     },
     qu(val) { // 监控区变化
       if (val !== '') {
-        this.wellForm.area = ''
+        // this.wellForm.area = ''
         this.fetchArea2()
       }
     }
@@ -370,7 +377,7 @@
     },
     // 获取区域2
     fetchArea2() {
-      getAreaList(this.qu).then(response => {
+      getAreaList(this.wellForm.qu).then(response => {
         this.jiedaoList = response.data
       })
     },
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index 0e1ab12..1ce6848 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -159,6 +159,7 @@
 import { getWellType, updateWell } from '@/api/well/well'
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
+import AMapLoader from '@amap/amap-jsapi-loader'
 
 export default {
   name: 'EditWell',
@@ -268,9 +269,43 @@
     },
     qu() { // 获取区
       return this.wellForm.qu
+    },
+    area() { // 获取街道
+      return this.wellForm.area
+    },
+    lonLat() {
+      return this.wellForm.coordinateX + ',' + this.wellForm.coordinateY
     }
   },
   watch: {
+    lonLat(val) {
+      var _this = this
+      window._AMapSecurityConfig = {
+        securityJsCode: this.$store.getters.amapSecurityCode
+      }
+      AMapLoader.load({
+        key: this.$store.getters.amapKey // 秘钥，从store中取
+      }).then((AMap) => {
+        AMap.plugin('AMap.Geocoder', function() {
+          var geocoder = new AMap.Geocoder({
+            city: ''
+          })
+          var lnglat = val.split(',')
+          geocoder.getAddress(lnglat, function(status, result) {
+            if (status === 'complete' && result.info === 'OK') {
+              _this.wellForm.qu = result.regeocode.addressComponent.district
+              _this.wellForm.area = result.regeocode.addressComponent.township
+              _this.wellForm.position = result.regeocode.formattedAddress
+            // result为对应的地理位置详细信息
+            } else {
+              _this.wellForm.position = ''
+              _this.wellForm.qu = ''
+              _this.wellForm.area = ''
+            }
+          })
+        })
+      })
+    },
     'wellForm.deptid'(val, oldVal) { // 监控权属单位变化
       if (oldVal !== '' && val !== '') {
         this.wellForm.responsibleDept = ''
@@ -509,8 +544,6 @@
     .el-dialog {
       width: 900px;
       margin-top: 10vh !important;
-      .el-dialog__body {
-      }
       .el-scrollbar {
         height: 410px;
         width: 100%;
diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue
index 31b2cd6..fd450b1 100644
--- a/src/views/wellManage/listWell.vue
+++ b/src/views/wellManage/listWell.vue
@@ -127,7 +127,6 @@
 import { getWellList, getWellType, delWell, batchImportWell, batchExportWell, batchBfcf, bfcf } from '@/api/well/well'
 import DeptSelect from '@/components/DeptSelect'
 import DownloadTemplate from '@/components/DownloadTemplate/index'
-import AMapLoader from '@amap/amap-jsapi-loader'
 
 export default {
   name: 'ListWell',
@@ -455,31 +454,6 @@
         this.listQuery.offset = 1
       }
       getWellList(this.listQuery).then(response => {
-        window._AMapSecurityConfig = {
-          securityJsCode: this.$store.getters.amapSecurityCode
-        }
-        AMapLoader.load({
-          key: this.$store.getters.amapKey // 秘钥，从store中取
-        }).then((AMap) => {
-          AMap.plugin('AMap.Geocoder', function() {
-            var geocoder = new AMap.Geocoder({
-              city: ''
-            })
-            var lnglat = []
-            response.data.rows.forEach((item, index) => {
-              lnglat = item.position.split(',')
-            })
-            geocoder.getAddress(lnglat, function(status, result) {
-              if (status === 'complete' && result.info === 'OK') {
-                response.data.rows.forEach((item, index) => {
-                  item.position = result.regeocode.formattedAddress
-                })
-                // console.log(result.regeocode.formattedAddress, '======result======')
-              // result为对应的地理位置详细信息
-              }
-            })
-          })
-        })
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false