diff --git a/mock/index.js b/mock/index.js
index e13b51e..6646246 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -20,6 +20,7 @@
 const tenantConfig = require('./systemConfig/tenantConfig')
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
+const warningRule = require('./warning/warningRule')
 
 const mocks = [
   ...user,
@@ -40,7 +41,8 @@
   ...alarmContent,
   ...tenantConfig,
   ...deptPermission,
-  ...tenant
+  ...tenant,
+  ...warningRule
 ]
 
 // for front mock

diff --git a/mock/index.js b/mock/index.js
index e13b51e..6646246 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -20,6 +20,7 @@
 const tenantConfig = require('./systemConfig/tenantConfig')
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
+const warningRule = require('./warning/warningRule')
 
 const mocks = [
   ...user,
@@ -40,7 +41,8 @@
   ...alarmContent,
   ...tenantConfig,
   ...deptPermission,
-  ...tenant
+  ...tenant,
+  ...warningRule
 ]
 
 // for front mock
diff --git a/mock/system/user.js b/mock/system/user.js
index f3aaad6..9fd5637 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -98,6 +98,8 @@
     { '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/index.js b/mock/index.js
index e13b51e..6646246 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -20,6 +20,7 @@
 const tenantConfig = require('./systemConfig/tenantConfig')
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
+const warningRule = require('./warning/warningRule')
 
 const mocks = [
   ...user,
@@ -40,7 +41,8 @@
   ...alarmContent,
   ...tenantConfig,
   ...deptPermission,
-  ...tenant
+  ...tenant,
+  ...warningRule
 ]
 
 // for front mock
diff --git a/mock/system/user.js b/mock/system/user.js
index f3aaad6..9fd5637 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -98,6 +98,8 @@
     { '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/warning/warningRule.js b/mock/warning/warningRule.js
new file mode 100644
index 0000000..7706647
--- /dev/null
+++ b/mock/warning/warningRule.js
@@ -0,0 +1,40 @@
+const alarmRuleList = [
+  {
+    'devCode': '4324324234',
+    'highValue': '123',
+    'lowValue': '10',
+    'overTime': '2021/12/20 17:23:13',
+    'saltaTion': '22',
+    'sensorCode': 'fd2131213',
+    'grade': '一级报警',
+    'ts': '2021/12/20 13:23:13',
+    'openAtor': '张三'
+  },
+  {
+    'devCode': '1564324234',
+    'highValue': '100',
+    'lowValue': '20',
+    'overTime': '2021/12/20 11:23:13',
+    'saltaTion': '22',
+    'sensorCode': 'fd2131213',
+    'grade': '二级报警',
+    'ts': '2021/12/20 10:23:13',
+    'openAtor': '李四'
+  }
+
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/alarmRule/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmRuleList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]

diff --git a/mock/index.js b/mock/index.js
index e13b51e..6646246 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -20,6 +20,7 @@
 const tenantConfig = require('./systemConfig/tenantConfig')
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
+const warningRule = require('./warning/warningRule')
 
 const mocks = [
   ...user,
@@ -40,7 +41,8 @@
   ...alarmContent,
   ...tenantConfig,
   ...deptPermission,
-  ...tenant
+  ...tenant,
+  ...warningRule
 ]
 
 // for front mock
diff --git a/mock/system/user.js b/mock/system/user.js
index f3aaad6..9fd5637 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -98,6 +98,8 @@
     { '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/warning/warningRule.js b/mock/warning/warningRule.js
new file mode 100644
index 0000000..7706647
--- /dev/null
+++ b/mock/warning/warningRule.js
@@ -0,0 +1,40 @@
+const alarmRuleList = [
+  {
+    'devCode': '4324324234',
+    'highValue': '123',
+    'lowValue': '10',
+    'overTime': '2021/12/20 17:23:13',
+    'saltaTion': '22',
+    'sensorCode': 'fd2131213',
+    'grade': '一级报警',
+    'ts': '2021/12/20 13:23:13',
+    'openAtor': '张三'
+  },
+  {
+    'devCode': '1564324234',
+    'highValue': '100',
+    'lowValue': '20',
+    'overTime': '2021/12/20 11:23:13',
+    'saltaTion': '22',
+    'sensorCode': 'fd2131213',
+    'grade': '二级报警',
+    'ts': '2021/12/20 10:23:13',
+    'openAtor': '李四'
+  }
+
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/alarmRule/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmRuleList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/warning/warningRule.js b/src/api/warning/warningRule.js
new file mode 100644
index 0000000..c0b91b0
--- /dev/null
+++ b/src/api/warning/warningRule.js
@@ -0,0 +1,56 @@
+/*
+ * 报警规则管理配置接口
+*/
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 报警规则管理配置查询
+export function warningRuleList(params) {
+  return request({
+    url: 'alarmRule/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加报警规则管理
+export function addWarningRule(params) {
+  return request({
+    url: 'alarmRule/add',
+    method: 'post',
+    params
+  })
+}
+// 修改报警规则管理
+export function updateWarningRule(params) {
+  return request({
+    url: 'alarmRule/update',
+    method: 'post',
+    params
+  })
+}
+// 删除报警规则管理
+export function delWarningRule(ids) {
+  return request({
+    url: 'alarmRule/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导入
+export function batchImportWarn(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'alarmRule/batchImport',
+    method: 'post',
+    timeout: 240000,
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}

diff --git a/mock/index.js b/mock/index.js
index e13b51e..6646246 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -20,6 +20,7 @@
 const tenantConfig = require('./systemConfig/tenantConfig')
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
+const warningRule = require('./warning/warningRule')
 
 const mocks = [
   ...user,
@@ -40,7 +41,8 @@
   ...alarmContent,
   ...tenantConfig,
   ...deptPermission,
-  ...tenant
+  ...tenant,
+  ...warningRule
 ]
 
 // for front mock
diff --git a/mock/system/user.js b/mock/system/user.js
index f3aaad6..9fd5637 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -98,6 +98,8 @@
     { '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/warning/warningRule.js b/mock/warning/warningRule.js
new file mode 100644
index 0000000..7706647
--- /dev/null
+++ b/mock/warning/warningRule.js
@@ -0,0 +1,40 @@
+const alarmRuleList = [
+  {
+    'devCode': '4324324234',
+    'highValue': '123',
+    'lowValue': '10',
+    'overTime': '2021/12/20 17:23:13',
+    'saltaTion': '22',
+    'sensorCode': 'fd2131213',
+    'grade': '一级报警',
+    'ts': '2021/12/20 13:23:13',
+    'openAtor': '张三'
+  },
+  {
+    'devCode': '1564324234',
+    'highValue': '100',
+    'lowValue': '20',
+    'overTime': '2021/12/20 11:23:13',
+    'saltaTion': '22',
+    'sensorCode': 'fd2131213',
+    'grade': '二级报警',
+    'ts': '2021/12/20 10:23:13',
+    'openAtor': '李四'
+  }
+
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/alarmRule/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmRuleList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/warning/warningRule.js b/src/api/warning/warningRule.js
new file mode 100644
index 0000000..c0b91b0
--- /dev/null
+++ b/src/api/warning/warningRule.js
@@ -0,0 +1,56 @@
+/*
+ * 报警规则管理配置接口
+*/
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 报警规则管理配置查询
+export function warningRuleList(params) {
+  return request({
+    url: 'alarmRule/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加报警规则管理
+export function addWarningRule(params) {
+  return request({
+    url: 'alarmRule/add',
+    method: 'post',
+    params
+  })
+}
+// 修改报警规则管理
+export function updateWarningRule(params) {
+  return request({
+    url: 'alarmRule/update',
+    method: 'post',
+    params
+  })
+}
+// 删除报警规则管理
+export function delWarningRule(ids) {
+  return request({
+    url: 'alarmRule/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导入
+export function batchImportWarn(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'alarmRule/batchImport',
+    method: 'post',
+    timeout: 240000,
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 85bdba6..07fcc53 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -25,22 +25,22 @@
       meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
     },
     {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+    },
+    {
       path: '/alarmContent',
       name: 'AlarmContent',
       component: () => import('@/views/systemConfig/alarmContent/listContent'),
       meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
     },
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/tenantConfig'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/listDept'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/deptPermission'] }
+      meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
 }]

diff --git a/mock/index.js b/mock/index.js
index e13b51e..6646246 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -20,6 +20,7 @@
 const tenantConfig = require('./systemConfig/tenantConfig')
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
+const warningRule = require('./warning/warningRule')
 
 const mocks = [
   ...user,
@@ -40,7 +41,8 @@
   ...alarmContent,
   ...tenantConfig,
   ...deptPermission,
-  ...tenant
+  ...tenant,
+  ...warningRule
 ]
 
 // for front mock
diff --git a/mock/system/user.js b/mock/system/user.js
index f3aaad6..9fd5637 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -98,6 +98,8 @@
     { '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/warning/warningRule.js b/mock/warning/warningRule.js
new file mode 100644
index 0000000..7706647
--- /dev/null
+++ b/mock/warning/warningRule.js
@@ -0,0 +1,40 @@
+const alarmRuleList = [
+  {
+    'devCode': '4324324234',
+    'highValue': '123',
+    'lowValue': '10',
+    'overTime': '2021/12/20 17:23:13',
+    'saltaTion': '22',
+    'sensorCode': 'fd2131213',
+    'grade': '一级报警',
+    'ts': '2021/12/20 13:23:13',
+    'openAtor': '张三'
+  },
+  {
+    'devCode': '1564324234',
+    'highValue': '100',
+    'lowValue': '20',
+    'overTime': '2021/12/20 11:23:13',
+    'saltaTion': '22',
+    'sensorCode': 'fd2131213',
+    'grade': '二级报警',
+    'ts': '2021/12/20 10:23:13',
+    'openAtor': '李四'
+  }
+
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/alarmRule/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmRuleList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/warning/warningRule.js b/src/api/warning/warningRule.js
new file mode 100644
index 0000000..c0b91b0
--- /dev/null
+++ b/src/api/warning/warningRule.js
@@ -0,0 +1,56 @@
+/*
+ * 报警规则管理配置接口
+*/
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 报警规则管理配置查询
+export function warningRuleList(params) {
+  return request({
+    url: 'alarmRule/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加报警规则管理
+export function addWarningRule(params) {
+  return request({
+    url: 'alarmRule/add',
+    method: 'post',
+    params
+  })
+}
+// 修改报警规则管理
+export function updateWarningRule(params) {
+  return request({
+    url: 'alarmRule/update',
+    method: 'post',
+    params
+  })
+}
+// 删除报警规则管理
+export function delWarningRule(ids) {
+  return request({
+    url: 'alarmRule/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导入
+export function batchImportWarn(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'alarmRule/batchImport',
+    method: 'post',
+    timeout: 240000,
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 85bdba6..07fcc53 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -25,22 +25,22 @@
       meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
     },
     {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+    },
+    {
       path: '/alarmContent',
       name: 'AlarmContent',
       component: () => import('@/views/systemConfig/alarmContent/listContent'),
       meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
     },
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/tenantConfig'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/listDept'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/deptPermission'] }
+      meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 98e4748..605a7c0 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -161,6 +161,26 @@
     ]
   },
   {
+    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/index.js b/mock/index.js
index e13b51e..6646246 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -20,6 +20,7 @@
 const tenantConfig = require('./systemConfig/tenantConfig')
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
+const warningRule = require('./warning/warningRule')
 
 const mocks = [
   ...user,
@@ -40,7 +41,8 @@
   ...alarmContent,
   ...tenantConfig,
   ...deptPermission,
-  ...tenant
+  ...tenant,
+  ...warningRule
 ]
 
 // for front mock
diff --git a/mock/system/user.js b/mock/system/user.js
index f3aaad6..9fd5637 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -98,6 +98,8 @@
     { '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/warning/warningRule.js b/mock/warning/warningRule.js
new file mode 100644
index 0000000..7706647
--- /dev/null
+++ b/mock/warning/warningRule.js
@@ -0,0 +1,40 @@
+const alarmRuleList = [
+  {
+    'devCode': '4324324234',
+    'highValue': '123',
+    'lowValue': '10',
+    'overTime': '2021/12/20 17:23:13',
+    'saltaTion': '22',
+    'sensorCode': 'fd2131213',
+    'grade': '一级报警',
+    'ts': '2021/12/20 13:23:13',
+    'openAtor': '张三'
+  },
+  {
+    'devCode': '1564324234',
+    'highValue': '100',
+    'lowValue': '20',
+    'overTime': '2021/12/20 11:23:13',
+    'saltaTion': '22',
+    'sensorCode': 'fd2131213',
+    'grade': '二级报警',
+    'ts': '2021/12/20 10:23:13',
+    'openAtor': '李四'
+  }
+
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/alarmRule/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmRuleList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/warning/warningRule.js b/src/api/warning/warningRule.js
new file mode 100644
index 0000000..c0b91b0
--- /dev/null
+++ b/src/api/warning/warningRule.js
@@ -0,0 +1,56 @@
+/*
+ * 报警规则管理配置接口
+*/
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 报警规则管理配置查询
+export function warningRuleList(params) {
+  return request({
+    url: 'alarmRule/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加报警规则管理
+export function addWarningRule(params) {
+  return request({
+    url: 'alarmRule/add',
+    method: 'post',
+    params
+  })
+}
+// 修改报警规则管理
+export function updateWarningRule(params) {
+  return request({
+    url: 'alarmRule/update',
+    method: 'post',
+    params
+  })
+}
+// 删除报警规则管理
+export function delWarningRule(ids) {
+  return request({
+    url: 'alarmRule/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导入
+export function batchImportWarn(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'alarmRule/batchImport',
+    method: 'post',
+    timeout: 240000,
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 85bdba6..07fcc53 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -25,22 +25,22 @@
       meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
     },
     {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+    },
+    {
       path: '/alarmContent',
       name: 'AlarmContent',
       component: () => import('@/views/systemConfig/alarmContent/listContent'),
       meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
     },
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/tenantConfig'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/listDept'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/deptPermission'] }
+      meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 98e4748..605a7c0 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -161,6 +161,26 @@
     ]
   },
   {
+    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/warningManage/components/dialogListWarning.vue b/src/views/warningManage/components/dialogListWarning.vue
new file mode 100644
index 0000000..010a00e
--- /dev/null
+++ b/src/views/warningManage/components/dialogListWarning.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: '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/index.js b/mock/index.js
index e13b51e..6646246 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -20,6 +20,7 @@
 const tenantConfig = require('./systemConfig/tenantConfig')
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
+const warningRule = require('./warning/warningRule')
 
 const mocks = [
   ...user,
@@ -40,7 +41,8 @@
   ...alarmContent,
   ...tenantConfig,
   ...deptPermission,
-  ...tenant
+  ...tenant,
+  ...warningRule
 ]
 
 // for front mock
diff --git a/mock/system/user.js b/mock/system/user.js
index f3aaad6..9fd5637 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -98,6 +98,8 @@
     { '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/warning/warningRule.js b/mock/warning/warningRule.js
new file mode 100644
index 0000000..7706647
--- /dev/null
+++ b/mock/warning/warningRule.js
@@ -0,0 +1,40 @@
+const alarmRuleList = [
+  {
+    'devCode': '4324324234',
+    'highValue': '123',
+    'lowValue': '10',
+    'overTime': '2021/12/20 17:23:13',
+    'saltaTion': '22',
+    'sensorCode': 'fd2131213',
+    'grade': '一级报警',
+    'ts': '2021/12/20 13:23:13',
+    'openAtor': '张三'
+  },
+  {
+    'devCode': '1564324234',
+    'highValue': '100',
+    'lowValue': '20',
+    'overTime': '2021/12/20 11:23:13',
+    'saltaTion': '22',
+    'sensorCode': 'fd2131213',
+    'grade': '二级报警',
+    'ts': '2021/12/20 10:23:13',
+    'openAtor': '李四'
+  }
+
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/alarmRule/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmRuleList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/warning/warningRule.js b/src/api/warning/warningRule.js
new file mode 100644
index 0000000..c0b91b0
--- /dev/null
+++ b/src/api/warning/warningRule.js
@@ -0,0 +1,56 @@
+/*
+ * 报警规则管理配置接口
+*/
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 报警规则管理配置查询
+export function warningRuleList(params) {
+  return request({
+    url: 'alarmRule/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加报警规则管理
+export function addWarningRule(params) {
+  return request({
+    url: 'alarmRule/add',
+    method: 'post',
+    params
+  })
+}
+// 修改报警规则管理
+export function updateWarningRule(params) {
+  return request({
+    url: 'alarmRule/update',
+    method: 'post',
+    params
+  })
+}
+// 删除报警规则管理
+export function delWarningRule(ids) {
+  return request({
+    url: 'alarmRule/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导入
+export function batchImportWarn(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'alarmRule/batchImport',
+    method: 'post',
+    timeout: 240000,
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index 85bdba6..07fcc53 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -25,22 +25,22 @@
       meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
     },
     {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+    },
+    {
       path: '/alarmContent',
       name: 'AlarmContent',
       component: () => import('@/views/systemConfig/alarmContent/listContent'),
       meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
     },
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/listTenant'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/tenantConfig'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/listDept'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/deptPermission'] }
+      meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission'] }
     }
   ]
 }]
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index 98e4748..605a7c0 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -161,6 +161,26 @@
     ]
   },
   {
+    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/warningManage/components/dialogListWarning.vue b/src/views/warningManage/components/dialogListWarning.vue
new file mode 100644
index 0000000..010a00e
--- /dev/null
+++ b/src/views/warningManage/components/dialogListWarning.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: '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/warningRule.vue b/src/views/warningManage/warningRule.vue
new file mode 100644
index 0000000..c09d63f
--- /dev/null
+++ b/src/views/warningManage/warningRule.vue
@@ -0,0 +1,232 @@
+<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.devcode"
+          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>
+        <el-button type="text">
+          <el-upload
+            v-if="hasPerm('/device/batchImport')"
+            :limit="1"
+            :show-file-list="false"
+            :http-request="uploadFile"
+            :file-list="fileList"
+            action="string"
+            accept=".xls,.xlsx"
+            class="edit_btn"
+          >
+            <el-button slot="trigger" size="small">
+              批量导入
+            </el-button>
+          </el-upload>
+        </el-button>
+      </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-warning ref="dialogAlarmContent" @watchChild="fetchData" />
+  </app-container>
+</template>
+
+<script>
+import dialogListWarning from '@/views/warningManage/components/dialogListWarning'
+import { warningRuleList, delWarningRule, batchImportWarn } from '@/api/warning/warningRule'
+
+export default {
+  name: 'WarningRule',
+  components: { dialogListWarning },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        devcode: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        // {
+        //   text: '设备编号',
+        //   value: 'devCode',
+        //   align: 'center'
+        // },
+        {
+          text: '报警上限',
+          value: 'highValue',
+          align: 'center'
+        },
+        {
+          text: '报警下限',
+          value: 'lowValue',
+          align: 'center'
+        },
+        {
+          text: '超时时间',
+          value: 'overTime',
+          align: 'center'
+        },
+        {
+          text: '突然阈值',
+          value: 'saltaTion',
+          align: 'center'
+        },
+        {
+          text: '传感器编号',
+          value: 'sensorCode',
+          align: 'center'
+        },
+        {
+          text: '报警等级',
+          value: 'grade',
+          align: 'center'
+        },
+        {
+          text: '时间戳',
+          value: 'ts',
+          align: 'center'
+        },
+        {
+          text: '操作人姓名',
+          value: 'openAtor',
+          align: 'center'
+        }
+      ], // 显示列
+      fileList: [],
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      warningRuleList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delWarningRule(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)
+    },
+    // 批量导入报警规则
+    uploadFile(param) {
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportWarn(_file).then(res => {
+        loading.close() // 关闭加载动画
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.fetchData()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        loading.close() // 关闭加载动画
+      })
+      this.fileList = []
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+</style>