diff --git a/mock/index.js b/mock/index.js
index 8eef48b..08fb33b 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -16,6 +16,7 @@
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
+const alarmContent = require('./systemConfig/alarmContent')
 
 const mocks = [
   ...user,
@@ -32,7 +33,8 @@
   ...deviceType,
   ...deviceModels,
   ...deviceImei,
-  ...alarmLevel
+  ...alarmLevel,
+  ...alarmContent
 ]
 
 // for front mock

diff --git a/mock/index.js b/mock/index.js
index 8eef48b..08fb33b 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -16,6 +16,7 @@
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
+const alarmContent = require('./systemConfig/alarmContent')
 
 const mocks = [
   ...user,
@@ -32,7 +33,8 @@
   ...deviceType,
   ...deviceModels,
   ...deviceImei,
-  ...alarmLevel
+  ...alarmLevel,
+  ...alarmContent
 ]
 
 // for front mock
diff --git a/mock/systemConfig/alarmContent.js b/mock/systemConfig/alarmContent.js
new file mode 100644
index 0000000..f247a3f
--- /dev/null
+++ b/mock/systemConfig/alarmContent.js
@@ -0,0 +1,85 @@
+// 设备类型列表
+const deviceTypeList = [
+  {
+    'name': '井盖状态检测仪',
+    'value': '10'
+  },
+  {
+    'name': '液位检测仪',
+    'value': '11'
+  },
+  {
+    'name': '有害气体检测仪',
+    'value': '12'
+  },
+  {
+    'name': '燃气智能检测终端',
+    'value': '13'
+  },
+  {
+    'name': '温湿度检测仪',
+    'value': '14'
+  },
+  {
+    'name': '开挖检测仪',
+    'value': '15'
+  },
+  {
+    'name': '井盖定位检测仪',
+    'value': '16'
+  },
+  {
+    'name': '噪声记录仪',
+    'value': '17'
+  },
+  {
+    'name': '燃气智能检测终端(一体化)',
+    'value': '18'
+  },
+  {
+    'name': '管盯',
+    'value': '19'
+  }
+]
+const alarmContentList = [
+  {
+    'id': '4324324234',
+    'alarmType': '告警类型一',
+    'deviceType': '井盖状态检测仪,燃气智能检测终端',
+    'alarmContent': '泄露'
+  },
+  {
+    'id': '4312344234',
+    'alarmType': '告警类型二',
+    'deviceType': '噪声记录仪,温湿度检测仪',
+    'alarmContent': '太高'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  // 设备类型
+  {
+    url: '/device/type',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTypeList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  },
+  {
+    url: '/alarmContent/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmContentList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]

diff --git a/mock/index.js b/mock/index.js
index 8eef48b..08fb33b 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -16,6 +16,7 @@
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
+const alarmContent = require('./systemConfig/alarmContent')
 
 const mocks = [
   ...user,
@@ -32,7 +33,8 @@
   ...deviceType,
   ...deviceModels,
   ...deviceImei,
-  ...alarmLevel
+  ...alarmLevel,
+  ...alarmContent
 ]
 
 // for front mock
diff --git a/mock/systemConfig/alarmContent.js b/mock/systemConfig/alarmContent.js
new file mode 100644
index 0000000..f247a3f
--- /dev/null
+++ b/mock/systemConfig/alarmContent.js
@@ -0,0 +1,85 @@
+// 设备类型列表
+const deviceTypeList = [
+  {
+    'name': '井盖状态检测仪',
+    'value': '10'
+  },
+  {
+    'name': '液位检测仪',
+    'value': '11'
+  },
+  {
+    'name': '有害气体检测仪',
+    'value': '12'
+  },
+  {
+    'name': '燃气智能检测终端',
+    'value': '13'
+  },
+  {
+    'name': '温湿度检测仪',
+    'value': '14'
+  },
+  {
+    'name': '开挖检测仪',
+    'value': '15'
+  },
+  {
+    'name': '井盖定位检测仪',
+    'value': '16'
+  },
+  {
+    'name': '噪声记录仪',
+    'value': '17'
+  },
+  {
+    'name': '燃气智能检测终端(一体化)',
+    'value': '18'
+  },
+  {
+    'name': '管盯',
+    'value': '19'
+  }
+]
+const alarmContentList = [
+  {
+    'id': '4324324234',
+    'alarmType': '告警类型一',
+    'deviceType': '井盖状态检测仪,燃气智能检测终端',
+    'alarmContent': '泄露'
+  },
+  {
+    'id': '4312344234',
+    'alarmType': '告警类型二',
+    'deviceType': '噪声记录仪,温湿度检测仪',
+    'alarmContent': '太高'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  // 设备类型
+  {
+    url: '/device/type',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTypeList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  },
+  {
+    url: '/alarmContent/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmContentList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
new file mode 100644
index 0000000..bdefe72
--- /dev/null
+++ b/src/api/systemConfig/alarmContent.js
@@ -0,0 +1,52 @@
+/*
+ * 告警内容配置接口
+*/
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 设备类别
+export function getDevice(params) {
+  return request({
+    url: 'device/type',
+    method: 'get',
+    params
+  })
+}
+// 告警内容配置查询
+export function alarmContentList(params) {
+  return request({
+    url: 'alarmContent/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加告警内容
+export function addAlarmContent(params) {
+  return request({
+    url: 'device/simManage/add',
+    method: 'post',
+    params
+  })
+}
+// 修改告警内容
+export function updateAlarmContent(params) {
+  return request({
+    url: 'device/simManage/update',
+    method: 'post',
+    params
+  })
+}
+// 删除告警内容
+export function delAlarmContent(ids) {
+  return request({
+    url: 'device/simManage/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}

diff --git a/mock/index.js b/mock/index.js
index 8eef48b..08fb33b 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -16,6 +16,7 @@
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
+const alarmContent = require('./systemConfig/alarmContent')
 
 const mocks = [
   ...user,
@@ -32,7 +33,8 @@
   ...deviceType,
   ...deviceModels,
   ...deviceImei,
-  ...alarmLevel
+  ...alarmLevel,
+  ...alarmContent
 ]
 
 // for front mock
diff --git a/mock/systemConfig/alarmContent.js b/mock/systemConfig/alarmContent.js
new file mode 100644
index 0000000..f247a3f
--- /dev/null
+++ b/mock/systemConfig/alarmContent.js
@@ -0,0 +1,85 @@
+// 设备类型列表
+const deviceTypeList = [
+  {
+    'name': '井盖状态检测仪',
+    'value': '10'
+  },
+  {
+    'name': '液位检测仪',
+    'value': '11'
+  },
+  {
+    'name': '有害气体检测仪',
+    'value': '12'
+  },
+  {
+    'name': '燃气智能检测终端',
+    'value': '13'
+  },
+  {
+    'name': '温湿度检测仪',
+    'value': '14'
+  },
+  {
+    'name': '开挖检测仪',
+    'value': '15'
+  },
+  {
+    'name': '井盖定位检测仪',
+    'value': '16'
+  },
+  {
+    'name': '噪声记录仪',
+    'value': '17'
+  },
+  {
+    'name': '燃气智能检测终端(一体化)',
+    'value': '18'
+  },
+  {
+    'name': '管盯',
+    'value': '19'
+  }
+]
+const alarmContentList = [
+  {
+    'id': '4324324234',
+    'alarmType': '告警类型一',
+    'deviceType': '井盖状态检测仪,燃气智能检测终端',
+    'alarmContent': '泄露'
+  },
+  {
+    'id': '4312344234',
+    'alarmType': '告警类型二',
+    'deviceType': '噪声记录仪,温湿度检测仪',
+    'alarmContent': '太高'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  // 设备类型
+  {
+    url: '/device/type',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTypeList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  },
+  {
+    url: '/alarmContent/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmContentList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
new file mode 100644
index 0000000..bdefe72
--- /dev/null
+++ b/src/api/systemConfig/alarmContent.js
@@ -0,0 +1,52 @@
+/*
+ * 告警内容配置接口
+*/
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 设备类别
+export function getDevice(params) {
+  return request({
+    url: 'device/type',
+    method: 'get',
+    params
+  })
+}
+// 告警内容配置查询
+export function alarmContentList(params) {
+  return request({
+    url: 'alarmContent/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加告警内容
+export function addAlarmContent(params) {
+  return request({
+    url: 'device/simManage/add',
+    method: 'post',
+    params
+  })
+}
+// 修改告警内容
+export function updateAlarmContent(params) {
+  return request({
+    url: 'device/simManage/update',
+    method: 'post',
+    params
+  })
+}
+// 删除告警内容
+export function delAlarmContent(ids) {
+  return request({
+    url: 'device/simManage/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index f99e960..1496914 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -1,7 +1,6 @@
 /*
  * 告警等级配置接口
 */
-
 import request from '@/utils/request'
 // 告警等级列表查询
 export function getAlarmLevelList(params) {

diff --git a/mock/index.js b/mock/index.js
index 8eef48b..08fb33b 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -16,6 +16,7 @@
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
+const alarmContent = require('./systemConfig/alarmContent')
 
 const mocks = [
   ...user,
@@ -32,7 +33,8 @@
   ...deviceType,
   ...deviceModels,
   ...deviceImei,
-  ...alarmLevel
+  ...alarmLevel,
+  ...alarmContent
 ]
 
 // for front mock
diff --git a/mock/systemConfig/alarmContent.js b/mock/systemConfig/alarmContent.js
new file mode 100644
index 0000000..f247a3f
--- /dev/null
+++ b/mock/systemConfig/alarmContent.js
@@ -0,0 +1,85 @@
+// 设备类型列表
+const deviceTypeList = [
+  {
+    'name': '井盖状态检测仪',
+    'value': '10'
+  },
+  {
+    'name': '液位检测仪',
+    'value': '11'
+  },
+  {
+    'name': '有害气体检测仪',
+    'value': '12'
+  },
+  {
+    'name': '燃气智能检测终端',
+    'value': '13'
+  },
+  {
+    'name': '温湿度检测仪',
+    'value': '14'
+  },
+  {
+    'name': '开挖检测仪',
+    'value': '15'
+  },
+  {
+    'name': '井盖定位检测仪',
+    'value': '16'
+  },
+  {
+    'name': '噪声记录仪',
+    'value': '17'
+  },
+  {
+    'name': '燃气智能检测终端(一体化)',
+    'value': '18'
+  },
+  {
+    'name': '管盯',
+    'value': '19'
+  }
+]
+const alarmContentList = [
+  {
+    'id': '4324324234',
+    'alarmType': '告警类型一',
+    'deviceType': '井盖状态检测仪,燃气智能检测终端',
+    'alarmContent': '泄露'
+  },
+  {
+    'id': '4312344234',
+    'alarmType': '告警类型二',
+    'deviceType': '噪声记录仪,温湿度检测仪',
+    'alarmContent': '太高'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  // 设备类型
+  {
+    url: '/device/type',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTypeList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  },
+  {
+    url: '/alarmContent/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmContentList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
new file mode 100644
index 0000000..bdefe72
--- /dev/null
+++ b/src/api/systemConfig/alarmContent.js
@@ -0,0 +1,52 @@
+/*
+ * 告警内容配置接口
+*/
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 设备类别
+export function getDevice(params) {
+  return request({
+    url: 'device/type',
+    method: 'get',
+    params
+  })
+}
+// 告警内容配置查询
+export function alarmContentList(params) {
+  return request({
+    url: 'alarmContent/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加告警内容
+export function addAlarmContent(params) {
+  return request({
+    url: 'device/simManage/add',
+    method: 'post',
+    params
+  })
+}
+// 修改告警内容
+export function updateAlarmContent(params) {
+  return request({
+    url: 'device/simManage/update',
+    method: 'post',
+    params
+  })
+}
+// 删除告警内容
+export function delAlarmContent(ids) {
+  return request({
+    url: 'device/simManage/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index f99e960..1496914 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -1,7 +1,6 @@
 /*
  * 告警等级配置接口
 */
-
 import request from '@/utils/request'
 // 告警等级列表查询
 export function getAlarmLevelList(params) {
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9d3b68d..9e23838 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -151,10 +151,10 @@
         return []
       }
     }, // 列
-    pagination: {
-      type: Boolean,
-      default: true
-    }, // 是否分页
+    // pagination: {
+    //   type: Boolean,
+    //   default: true
+    // }, // 是否分页
     options: {
       type: Object,
       default: function() {
@@ -189,7 +189,8 @@
       columnsFiltered: [], // 过滤后的列情况
       columnsChecked: [], // 显示列选择情况
       visible: false, // 弹窗显示情况
-      animateClass: '' // 按钮动画效果
+      animateClass: '', // 按钮动画效果
+      pagination: false // 是否显示分页
     }
   },
   watch: {
@@ -205,7 +206,12 @@
   },
   methods: {
     // 初始化显示列状态
-    initColumnsState() {
+    initColumnsState(paginationStatus) {
+      if (paginationStatus === true || paginationStatus === undefined) {
+        this.pagination = true
+      } else {
+        this.pagination = false
+      }
       this.columnsChecked = []
       for (const column of this.columns) {
         if (column.show === false) {

diff --git a/mock/index.js b/mock/index.js
index 8eef48b..08fb33b 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -16,6 +16,7 @@
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
+const alarmContent = require('./systemConfig/alarmContent')
 
 const mocks = [
   ...user,
@@ -32,7 +33,8 @@
   ...deviceType,
   ...deviceModels,
   ...deviceImei,
-  ...alarmLevel
+  ...alarmLevel,
+  ...alarmContent
 ]
 
 // for front mock
diff --git a/mock/systemConfig/alarmContent.js b/mock/systemConfig/alarmContent.js
new file mode 100644
index 0000000..f247a3f
--- /dev/null
+++ b/mock/systemConfig/alarmContent.js
@@ -0,0 +1,85 @@
+// 设备类型列表
+const deviceTypeList = [
+  {
+    'name': '井盖状态检测仪',
+    'value': '10'
+  },
+  {
+    'name': '液位检测仪',
+    'value': '11'
+  },
+  {
+    'name': '有害气体检测仪',
+    'value': '12'
+  },
+  {
+    'name': '燃气智能检测终端',
+    'value': '13'
+  },
+  {
+    'name': '温湿度检测仪',
+    'value': '14'
+  },
+  {
+    'name': '开挖检测仪',
+    'value': '15'
+  },
+  {
+    'name': '井盖定位检测仪',
+    'value': '16'
+  },
+  {
+    'name': '噪声记录仪',
+    'value': '17'
+  },
+  {
+    'name': '燃气智能检测终端(一体化)',
+    'value': '18'
+  },
+  {
+    'name': '管盯',
+    'value': '19'
+  }
+]
+const alarmContentList = [
+  {
+    'id': '4324324234',
+    'alarmType': '告警类型一',
+    'deviceType': '井盖状态检测仪,燃气智能检测终端',
+    'alarmContent': '泄露'
+  },
+  {
+    'id': '4312344234',
+    'alarmType': '告警类型二',
+    'deviceType': '噪声记录仪,温湿度检测仪',
+    'alarmContent': '太高'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  // 设备类型
+  {
+    url: '/device/type',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTypeList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  },
+  {
+    url: '/alarmContent/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmContentList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
new file mode 100644
index 0000000..bdefe72
--- /dev/null
+++ b/src/api/systemConfig/alarmContent.js
@@ -0,0 +1,52 @@
+/*
+ * 告警内容配置接口
+*/
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 设备类别
+export function getDevice(params) {
+  return request({
+    url: 'device/type',
+    method: 'get',
+    params
+  })
+}
+// 告警内容配置查询
+export function alarmContentList(params) {
+  return request({
+    url: 'alarmContent/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加告警内容
+export function addAlarmContent(params) {
+  return request({
+    url: 'device/simManage/add',
+    method: 'post',
+    params
+  })
+}
+// 修改告警内容
+export function updateAlarmContent(params) {
+  return request({
+    url: 'device/simManage/update',
+    method: 'post',
+    params
+  })
+}
+// 删除告警内容
+export function delAlarmContent(ids) {
+  return request({
+    url: 'device/simManage/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index f99e960..1496914 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -1,7 +1,6 @@
 /*
  * 告警等级配置接口
 */
-
 import request from '@/utils/request'
 // 告警等级列表查询
 export function getAlarmLevelList(params) {
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9d3b68d..9e23838 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -151,10 +151,10 @@
         return []
       }
     }, // 列
-    pagination: {
-      type: Boolean,
-      default: true
-    }, // 是否分页
+    // pagination: {
+    //   type: Boolean,
+    //   default: true
+    // }, // 是否分页
     options: {
       type: Object,
       default: function() {
@@ -189,7 +189,8 @@
       columnsFiltered: [], // 过滤后的列情况
       columnsChecked: [], // 显示列选择情况
       visible: false, // 弹窗显示情况
-      animateClass: '' // 按钮动画效果
+      animateClass: '', // 按钮动画效果
+      pagination: false // 是否显示分页
     }
   },
   watch: {
@@ -205,7 +206,12 @@
   },
   methods: {
     // 初始化显示列状态
-    initColumnsState() {
+    initColumnsState(paginationStatus) {
+      if (paginationStatus === true || paginationStatus === undefined) {
+        this.pagination = true
+      } else {
+        this.pagination = false
+      }
       this.columnsChecked = []
       for (const column of this.columns) {
         if (column.show === false) {
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
new file mode 100644
index 0000000..a835d47
--- /dev/null
+++ b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
@@ -0,0 +1,237 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :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"
+              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 :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="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
+              clearable
+              placeholder="请输入告警内容"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'create' ? false : true" :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') {
+        this.deviceForm = {
+          alarmType: row.alarmType,
+          alarmContent: row.deviceType,
+          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/index.js b/mock/index.js
index 8eef48b..08fb33b 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -16,6 +16,7 @@
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
+const alarmContent = require('./systemConfig/alarmContent')
 
 const mocks = [
   ...user,
@@ -32,7 +33,8 @@
   ...deviceType,
   ...deviceModels,
   ...deviceImei,
-  ...alarmLevel
+  ...alarmLevel,
+  ...alarmContent
 ]
 
 // for front mock
diff --git a/mock/systemConfig/alarmContent.js b/mock/systemConfig/alarmContent.js
new file mode 100644
index 0000000..f247a3f
--- /dev/null
+++ b/mock/systemConfig/alarmContent.js
@@ -0,0 +1,85 @@
+// 设备类型列表
+const deviceTypeList = [
+  {
+    'name': '井盖状态检测仪',
+    'value': '10'
+  },
+  {
+    'name': '液位检测仪',
+    'value': '11'
+  },
+  {
+    'name': '有害气体检测仪',
+    'value': '12'
+  },
+  {
+    'name': '燃气智能检测终端',
+    'value': '13'
+  },
+  {
+    'name': '温湿度检测仪',
+    'value': '14'
+  },
+  {
+    'name': '开挖检测仪',
+    'value': '15'
+  },
+  {
+    'name': '井盖定位检测仪',
+    'value': '16'
+  },
+  {
+    'name': '噪声记录仪',
+    'value': '17'
+  },
+  {
+    'name': '燃气智能检测终端(一体化)',
+    'value': '18'
+  },
+  {
+    'name': '管盯',
+    'value': '19'
+  }
+]
+const alarmContentList = [
+  {
+    'id': '4324324234',
+    'alarmType': '告警类型一',
+    'deviceType': '井盖状态检测仪,燃气智能检测终端',
+    'alarmContent': '泄露'
+  },
+  {
+    'id': '4312344234',
+    'alarmType': '告警类型二',
+    'deviceType': '噪声记录仪,温湿度检测仪',
+    'alarmContent': '太高'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  // 设备类型
+  {
+    url: '/device/type',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTypeList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  },
+  {
+    url: '/alarmContent/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmContentList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/systemConfig/alarmContent.js b/src/api/systemConfig/alarmContent.js
new file mode 100644
index 0000000..bdefe72
--- /dev/null
+++ b/src/api/systemConfig/alarmContent.js
@@ -0,0 +1,52 @@
+/*
+ * 告警内容配置接口
+*/
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 设备类别
+export function getDevice(params) {
+  return request({
+    url: 'device/type',
+    method: 'get',
+    params
+  })
+}
+// 告警内容配置查询
+export function alarmContentList(params) {
+  return request({
+    url: 'alarmContent/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加告警内容
+export function addAlarmContent(params) {
+  return request({
+    url: 'device/simManage/add',
+    method: 'post',
+    params
+  })
+}
+// 修改告警内容
+export function updateAlarmContent(params) {
+  return request({
+    url: 'device/simManage/update',
+    method: 'post',
+    params
+  })
+}
+// 删除告警内容
+export function delAlarmContent(ids) {
+  return request({
+    url: 'device/simManage/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
index f99e960..1496914 100644
--- a/src/api/systemConfig/alarmLevel.js
+++ b/src/api/systemConfig/alarmLevel.js
@@ -1,7 +1,6 @@
 /*
  * 告警等级配置接口
 */
-
 import request from '@/utils/request'
 // 告警等级列表查询
 export function getAlarmLevelList(params) {
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index 9d3b68d..9e23838 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -151,10 +151,10 @@
         return []
       }
     }, // 列
-    pagination: {
-      type: Boolean,
-      default: true
-    }, // 是否分页
+    // pagination: {
+    //   type: Boolean,
+    //   default: true
+    // }, // 是否分页
     options: {
       type: Object,
       default: function() {
@@ -189,7 +189,8 @@
       columnsFiltered: [], // 过滤后的列情况
       columnsChecked: [], // 显示列选择情况
       visible: false, // 弹窗显示情况
-      animateClass: '' // 按钮动画效果
+      animateClass: '', // 按钮动画效果
+      pagination: false // 是否显示分页
     }
   },
   watch: {
@@ -205,7 +206,12 @@
   },
   methods: {
     // 初始化显示列状态
-    initColumnsState() {
+    initColumnsState(paginationStatus) {
+      if (paginationStatus === true || paginationStatus === undefined) {
+        this.pagination = true
+      } else {
+        this.pagination = false
+      }
       this.columnsChecked = []
       for (const column of this.columns) {
         if (column.show === false) {
diff --git a/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
new file mode 100644
index 0000000..a835d47
--- /dev/null
+++ b/src/views/systemConfig/alarmContent/components/dialogAlarmContent.vue
@@ -0,0 +1,237 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :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"
+              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 :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="alarmContent">
+            <el-input
+              v-model.trim="deviceForm.alarmContent"
+              type="text"
+              clearable
+              placeholder="请输入告警内容"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'create' ? false : true" :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') {
+        this.deviceForm = {
+          alarmType: row.alarmType,
+          alarmContent: row.deviceType,
+          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 6003687..6cbe81a 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -1,9 +1,233 @@
 <template>
-  <div>告警内容配置</div>
+  <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.modelName"
+          placeholder="设备类型"
+          clearable
+        >
+          <el-option
+            v-for="item in deviceModelList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.alarmType"
+          placeholder="告警类型"
+          clearable
+        >
+          <el-option
+            v-for="item in alarmTypeList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input
+          v-model="listQuery.alarmContent"
+          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="160" 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>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <dialog-Alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <script>
-export default {
+// 引用封装组件
+import dialogAlarmContent from '@/views/systemConfig/alarmContent/components/dialogAlarmContent'
+// 接口调用
+import { getDevice, alarmContentList, delAlarmContent } from '@/api/systemConfig/alarmContent'
 
+export default {
+  name: 'ListContent',
+  components: { dialogAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        modelName: '',
+        alarmType: '',
+        alarmContent: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      columns: [
+        {
+          text: '设备编号',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '告警类型',
+          value: 'alarmType',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceType',
+          align: 'center'
+        },
+        {
+          text: '告警内容',
+          value: 'alarmContent',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceModelList = response.data
+      })
+    },
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      alarmContentList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delAlarmContent(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)
+    }
+  }
 }
 </script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>