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

diff --git a/mock/index.js b/mock/index.js
index 8eef48b..a7d74ca 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -16,6 +16,9 @@
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
+const alarmContent = require('./systemConfig/alarmContent')
+const tenantConfig = require('./systemConfig/tenantConfig')
+const deptPermission = require('./systemConfig/deptPermission')
 
 const mocks = [
   ...user,
@@ -32,7 +35,10 @@
   ...deviceType,
   ...deviceModels,
   ...deviceImei,
-  ...alarmLevel
+  ...alarmLevel,
+  ...alarmContent,
+  ...tenantConfig,
+  ...deptPermission
 ]
 
 // 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..a7d74ca 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -16,6 +16,9 @@
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
+const alarmContent = require('./systemConfig/alarmContent')
+const tenantConfig = require('./systemConfig/tenantConfig')
+const deptPermission = require('./systemConfig/deptPermission')
 
 const mocks = [
   ...user,
@@ -32,7 +35,10 @@
   ...deviceType,
   ...deviceModels,
   ...deviceImei,
-  ...alarmLevel
+  ...alarmLevel,
+  ...alarmContent,
+  ...tenantConfig,
+  ...deptPermission
 ]
 
 // 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/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
new file mode 100644
index 0000000..8042352
--- /dev/null
+++ b/mock/systemConfig/deptPermission.js
@@ -0,0 +1,88 @@
+const deptPermissionList = [
+  {
+    'deptid': '4324324234',
+    'deptName': '组织名称一',
+    'wellType': '支持井类型一',
+    'deviceType': '支持设备类型二',
+    'lng': '123.122',
+    'lat': '23.3232'
+  },
+  {
+    'deptid': '4456324234',
+    'deptName': '组织名称二',
+    'wellType': '支持井类型二',
+    'deviceType': '支持设备类型二',
+    'lng': '143.423',
+    'lat': '56.1432'
+  }
+]
+// 设备类型列表
+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'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/type',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTypeList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  },
+  {
+    url: '/deptPermission/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deptPermissionList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]

diff --git a/mock/index.js b/mock/index.js
index 8eef48b..a7d74ca 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -16,6 +16,9 @@
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
+const alarmContent = require('./systemConfig/alarmContent')
+const tenantConfig = require('./systemConfig/tenantConfig')
+const deptPermission = require('./systemConfig/deptPermission')
 
 const mocks = [
   ...user,
@@ -32,7 +35,10 @@
   ...deviceType,
   ...deviceModels,
   ...deviceImei,
-  ...alarmLevel
+  ...alarmLevel,
+  ...alarmContent,
+  ...tenantConfig,
+  ...deptPermission
 ]
 
 // 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/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
new file mode 100644
index 0000000..8042352
--- /dev/null
+++ b/mock/systemConfig/deptPermission.js
@@ -0,0 +1,88 @@
+const deptPermissionList = [
+  {
+    'deptid': '4324324234',
+    'deptName': '组织名称一',
+    'wellType': '支持井类型一',
+    'deviceType': '支持设备类型二',
+    'lng': '123.122',
+    'lat': '23.3232'
+  },
+  {
+    'deptid': '4456324234',
+    'deptName': '组织名称二',
+    'wellType': '支持井类型二',
+    'deviceType': '支持设备类型二',
+    'lng': '143.423',
+    'lat': '56.1432'
+  }
+]
+// 设备类型列表
+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'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/type',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTypeList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  },
+  {
+    url: '/deptPermission/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deptPermissionList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
new file mode 100644
index 0000000..ca0a010
--- /dev/null
+++ b/mock/systemConfig/tenantConfig.js
@@ -0,0 +1,40 @@
+const alarmTenantList = [
+  {
+    'tenentId': '4324324234',
+    'tenantName': '项目名称一',
+    'communication': '联通移动NB,电信NB',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则一',
+    'alarmPushTypeName': '报警推送规则名称一'
+  },
+  {
+    'tenentId': '5674324234',
+    'tenantName': '项目名称二',
+    'communication': '3G,4G',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则二',
+    'alarmPushTypeName': '报警推送规则名称二'
+  }
+
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/tenantConfig/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmTenantList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]

diff --git a/mock/index.js b/mock/index.js
index 8eef48b..a7d74ca 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -16,6 +16,9 @@
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
+const alarmContent = require('./systemConfig/alarmContent')
+const tenantConfig = require('./systemConfig/tenantConfig')
+const deptPermission = require('./systemConfig/deptPermission')
 
 const mocks = [
   ...user,
@@ -32,7 +35,10 @@
   ...deviceType,
   ...deviceModels,
   ...deviceImei,
-  ...alarmLevel
+  ...alarmLevel,
+  ...alarmContent,
+  ...tenantConfig,
+  ...deptPermission
 ]
 
 // 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/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
new file mode 100644
index 0000000..8042352
--- /dev/null
+++ b/mock/systemConfig/deptPermission.js
@@ -0,0 +1,88 @@
+const deptPermissionList = [
+  {
+    'deptid': '4324324234',
+    'deptName': '组织名称一',
+    'wellType': '支持井类型一',
+    'deviceType': '支持设备类型二',
+    'lng': '123.122',
+    'lat': '23.3232'
+  },
+  {
+    'deptid': '4456324234',
+    'deptName': '组织名称二',
+    'wellType': '支持井类型二',
+    'deviceType': '支持设备类型二',
+    'lng': '143.423',
+    'lat': '56.1432'
+  }
+]
+// 设备类型列表
+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'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/type',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTypeList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  },
+  {
+    url: '/deptPermission/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deptPermissionList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
new file mode 100644
index 0000000..ca0a010
--- /dev/null
+++ b/mock/systemConfig/tenantConfig.js
@@ -0,0 +1,40 @@
+const alarmTenantList = [
+  {
+    'tenentId': '4324324234',
+    'tenantName': '项目名称一',
+    'communication': '联通移动NB,电信NB',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则一',
+    'alarmPushTypeName': '报警推送规则名称一'
+  },
+  {
+    'tenentId': '5674324234',
+    'tenantName': '项目名称二',
+    'communication': '3G,4G',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则二',
+    'alarmPushTypeName': '报警推送规则名称二'
+  }
+
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/tenantConfig/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmTenantList,
+        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..a7d74ca 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -16,6 +16,9 @@
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
+const alarmContent = require('./systemConfig/alarmContent')
+const tenantConfig = require('./systemConfig/tenantConfig')
+const deptPermission = require('./systemConfig/deptPermission')
 
 const mocks = [
   ...user,
@@ -32,7 +35,10 @@
   ...deviceType,
   ...deviceModels,
   ...deviceImei,
-  ...alarmLevel
+  ...alarmLevel,
+  ...alarmContent,
+  ...tenantConfig,
+  ...deptPermission
 ]
 
 // 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/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
new file mode 100644
index 0000000..8042352
--- /dev/null
+++ b/mock/systemConfig/deptPermission.js
@@ -0,0 +1,88 @@
+const deptPermissionList = [
+  {
+    'deptid': '4324324234',
+    'deptName': '组织名称一',
+    'wellType': '支持井类型一',
+    'deviceType': '支持设备类型二',
+    'lng': '123.122',
+    'lat': '23.3232'
+  },
+  {
+    'deptid': '4456324234',
+    'deptName': '组织名称二',
+    'wellType': '支持井类型二',
+    'deviceType': '支持设备类型二',
+    'lng': '143.423',
+    'lat': '56.1432'
+  }
+]
+// 设备类型列表
+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'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/type',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTypeList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  },
+  {
+    url: '/deptPermission/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deptPermissionList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
new file mode 100644
index 0000000..ca0a010
--- /dev/null
+++ b/mock/systemConfig/tenantConfig.js
@@ -0,0 +1,40 @@
+const alarmTenantList = [
+  {
+    'tenentId': '4324324234',
+    'tenantName': '项目名称一',
+    'communication': '联通移动NB,电信NB',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则一',
+    'alarmPushTypeName': '报警推送规则名称一'
+  },
+  {
+    'tenentId': '5674324234',
+    'tenantName': '项目名称二',
+    'communication': '3G,4G',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则二',
+    'alarmPushTypeName': '报警推送规则名称二'
+  }
+
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/tenantConfig/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmTenantList,
+        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..a7d74ca 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -16,6 +16,9 @@
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
+const alarmContent = require('./systemConfig/alarmContent')
+const tenantConfig = require('./systemConfig/tenantConfig')
+const deptPermission = require('./systemConfig/deptPermission')
 
 const mocks = [
   ...user,
@@ -32,7 +35,10 @@
   ...deviceType,
   ...deviceModels,
   ...deviceImei,
-  ...alarmLevel
+  ...alarmLevel,
+  ...alarmContent,
+  ...tenantConfig,
+  ...deptPermission
 ]
 
 // 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/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
new file mode 100644
index 0000000..8042352
--- /dev/null
+++ b/mock/systemConfig/deptPermission.js
@@ -0,0 +1,88 @@
+const deptPermissionList = [
+  {
+    'deptid': '4324324234',
+    'deptName': '组织名称一',
+    'wellType': '支持井类型一',
+    'deviceType': '支持设备类型二',
+    'lng': '123.122',
+    'lat': '23.3232'
+  },
+  {
+    'deptid': '4456324234',
+    'deptName': '组织名称二',
+    'wellType': '支持井类型二',
+    'deviceType': '支持设备类型二',
+    'lng': '143.423',
+    'lat': '56.1432'
+  }
+]
+// 设备类型列表
+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'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/type',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTypeList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  },
+  {
+    url: '/deptPermission/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deptPermissionList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
new file mode 100644
index 0000000..ca0a010
--- /dev/null
+++ b/mock/systemConfig/tenantConfig.js
@@ -0,0 +1,40 @@
+const alarmTenantList = [
+  {
+    'tenentId': '4324324234',
+    'tenantName': '项目名称一',
+    'communication': '联通移动NB,电信NB',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则一',
+    'alarmPushTypeName': '报警推送规则名称一'
+  },
+  {
+    'tenentId': '5674324234',
+    'tenantName': '项目名称二',
+    'communication': '3G,4G',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则二',
+    'alarmPushTypeName': '报警推送规则名称二'
+  }
+
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/tenantConfig/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmTenantList,
+        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/api/systemConfig/deptPermission.js b/src/api/systemConfig/deptPermission.js
new file mode 100644
index 0000000..9b58c07
--- /dev/null
+++ b/src/api/systemConfig/deptPermission.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 deptList(params) {
+  return request({
+    url: 'deptPermission/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加组织权限配置
+export function addDept(params) {
+  return request({
+    url: 'deptPermission/add',
+    method: 'post',
+    params
+  })
+}
+// 修改组织权限配置
+export function updateDept(params) {
+  return request({
+    url: 'deptPermission/update',
+    method: 'post',
+    params
+  })
+}
+// 删除组织权限配置
+export function delDept(ids) {
+  return request({
+    url: 'deptPermission/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..a7d74ca 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -16,6 +16,9 @@
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
+const alarmContent = require('./systemConfig/alarmContent')
+const tenantConfig = require('./systemConfig/tenantConfig')
+const deptPermission = require('./systemConfig/deptPermission')
 
 const mocks = [
   ...user,
@@ -32,7 +35,10 @@
   ...deviceType,
   ...deviceModels,
   ...deviceImei,
-  ...alarmLevel
+  ...alarmLevel,
+  ...alarmContent,
+  ...tenantConfig,
+  ...deptPermission
 ]
 
 // 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/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
new file mode 100644
index 0000000..8042352
--- /dev/null
+++ b/mock/systemConfig/deptPermission.js
@@ -0,0 +1,88 @@
+const deptPermissionList = [
+  {
+    'deptid': '4324324234',
+    'deptName': '组织名称一',
+    'wellType': '支持井类型一',
+    'deviceType': '支持设备类型二',
+    'lng': '123.122',
+    'lat': '23.3232'
+  },
+  {
+    'deptid': '4456324234',
+    'deptName': '组织名称二',
+    'wellType': '支持井类型二',
+    'deviceType': '支持设备类型二',
+    'lng': '143.423',
+    'lat': '56.1432'
+  }
+]
+// 设备类型列表
+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'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/type',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTypeList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  },
+  {
+    url: '/deptPermission/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deptPermissionList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
new file mode 100644
index 0000000..ca0a010
--- /dev/null
+++ b/mock/systemConfig/tenantConfig.js
@@ -0,0 +1,40 @@
+const alarmTenantList = [
+  {
+    'tenentId': '4324324234',
+    'tenantName': '项目名称一',
+    'communication': '联通移动NB,电信NB',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则一',
+    'alarmPushTypeName': '报警推送规则名称一'
+  },
+  {
+    'tenentId': '5674324234',
+    'tenantName': '项目名称二',
+    'communication': '3G,4G',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则二',
+    'alarmPushTypeName': '报警推送规则名称二'
+  }
+
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/tenantConfig/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmTenantList,
+        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/api/systemConfig/deptPermission.js b/src/api/systemConfig/deptPermission.js
new file mode 100644
index 0000000..9b58c07
--- /dev/null
+++ b/src/api/systemConfig/deptPermission.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 deptList(params) {
+  return request({
+    url: 'deptPermission/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加组织权限配置
+export function addDept(params) {
+  return request({
+    url: 'deptPermission/add',
+    method: 'post',
+    params
+  })
+}
+// 修改组织权限配置
+export function updateDept(params) {
+  return request({
+    url: 'deptPermission/update',
+    method: 'post',
+    params
+  })
+}
+// 删除组织权限配置
+export function delDept(ids) {
+  return request({
+    url: 'deptPermission/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
new file mode 100644
index 0000000..9afa04e
--- /dev/null
+++ b/src/api/systemConfig/tenantConfig.js
@@ -0,0 +1,44 @@
+/*
+ * 项目配置配置接口
+*/
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 项目配置配置查询
+export function alarmTenantList(params) {
+  return request({
+    url: 'tenantConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加项目配置
+export function addAlarmTenant(params) {
+  return request({
+    url: 'tenantConfig/add',
+    method: 'post',
+    params
+  })
+}
+// 修改项目配置
+export function updateAlarmTenant(params) {
+  return request({
+    url: 'tenantConfig/update',
+    method: 'post',
+    params
+  })
+}
+// 删除项目配置
+export function delAlarmTenant(ids) {
+  return request({
+    url: 'tenantConfig/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..a7d74ca 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -16,6 +16,9 @@
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
+const alarmContent = require('./systemConfig/alarmContent')
+const tenantConfig = require('./systemConfig/tenantConfig')
+const deptPermission = require('./systemConfig/deptPermission')
 
 const mocks = [
   ...user,
@@ -32,7 +35,10 @@
   ...deviceType,
   ...deviceModels,
   ...deviceImei,
-  ...alarmLevel
+  ...alarmLevel,
+  ...alarmContent,
+  ...tenantConfig,
+  ...deptPermission
 ]
 
 // 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/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
new file mode 100644
index 0000000..8042352
--- /dev/null
+++ b/mock/systemConfig/deptPermission.js
@@ -0,0 +1,88 @@
+const deptPermissionList = [
+  {
+    'deptid': '4324324234',
+    'deptName': '组织名称一',
+    'wellType': '支持井类型一',
+    'deviceType': '支持设备类型二',
+    'lng': '123.122',
+    'lat': '23.3232'
+  },
+  {
+    'deptid': '4456324234',
+    'deptName': '组织名称二',
+    'wellType': '支持井类型二',
+    'deviceType': '支持设备类型二',
+    'lng': '143.423',
+    'lat': '56.1432'
+  }
+]
+// 设备类型列表
+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'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/type',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTypeList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  },
+  {
+    url: '/deptPermission/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deptPermissionList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
new file mode 100644
index 0000000..ca0a010
--- /dev/null
+++ b/mock/systemConfig/tenantConfig.js
@@ -0,0 +1,40 @@
+const alarmTenantList = [
+  {
+    'tenentId': '4324324234',
+    'tenantName': '项目名称一',
+    'communication': '联通移动NB,电信NB',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则一',
+    'alarmPushTypeName': '报警推送规则名称一'
+  },
+  {
+    'tenentId': '5674324234',
+    'tenantName': '项目名称二',
+    'communication': '3G,4G',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则二',
+    'alarmPushTypeName': '报警推送规则名称二'
+  }
+
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/tenantConfig/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmTenantList,
+        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/api/systemConfig/deptPermission.js b/src/api/systemConfig/deptPermission.js
new file mode 100644
index 0000000..9b58c07
--- /dev/null
+++ b/src/api/systemConfig/deptPermission.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 deptList(params) {
+  return request({
+    url: 'deptPermission/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加组织权限配置
+export function addDept(params) {
+  return request({
+    url: 'deptPermission/add',
+    method: 'post',
+    params
+  })
+}
+// 修改组织权限配置
+export function updateDept(params) {
+  return request({
+    url: 'deptPermission/update',
+    method: 'post',
+    params
+  })
+}
+// 删除组织权限配置
+export function delDept(ids) {
+  return request({
+    url: 'deptPermission/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
new file mode 100644
index 0000000..9afa04e
--- /dev/null
+++ b/src/api/systemConfig/tenantConfig.js
@@ -0,0 +1,44 @@
+/*
+ * 项目配置配置接口
+*/
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 项目配置配置查询
+export function alarmTenantList(params) {
+  return request({
+    url: 'tenantConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加项目配置
+export function addAlarmTenant(params) {
+  return request({
+    url: 'tenantConfig/add',
+    method: 'post',
+    params
+  })
+}
+// 修改项目配置
+export function updateAlarmTenant(params) {
+  return request({
+    url: 'tenantConfig/update',
+    method: 'post',
+    params
+  })
+}
+// 删除项目配置
+export function delAlarmTenant(ids) {
+  return request({
+    url: 'tenantConfig/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
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..a7d74ca 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -16,6 +16,9 @@
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
+const alarmContent = require('./systemConfig/alarmContent')
+const tenantConfig = require('./systemConfig/tenantConfig')
+const deptPermission = require('./systemConfig/deptPermission')
 
 const mocks = [
   ...user,
@@ -32,7 +35,10 @@
   ...deviceType,
   ...deviceModels,
   ...deviceImei,
-  ...alarmLevel
+  ...alarmLevel,
+  ...alarmContent,
+  ...tenantConfig,
+  ...deptPermission
 ]
 
 // 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/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
new file mode 100644
index 0000000..8042352
--- /dev/null
+++ b/mock/systemConfig/deptPermission.js
@@ -0,0 +1,88 @@
+const deptPermissionList = [
+  {
+    'deptid': '4324324234',
+    'deptName': '组织名称一',
+    'wellType': '支持井类型一',
+    'deviceType': '支持设备类型二',
+    'lng': '123.122',
+    'lat': '23.3232'
+  },
+  {
+    'deptid': '4456324234',
+    'deptName': '组织名称二',
+    'wellType': '支持井类型二',
+    'deviceType': '支持设备类型二',
+    'lng': '143.423',
+    'lat': '56.1432'
+  }
+]
+// 设备类型列表
+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'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/type',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTypeList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  },
+  {
+    url: '/deptPermission/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deptPermissionList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
new file mode 100644
index 0000000..ca0a010
--- /dev/null
+++ b/mock/systemConfig/tenantConfig.js
@@ -0,0 +1,40 @@
+const alarmTenantList = [
+  {
+    'tenentId': '4324324234',
+    'tenantName': '项目名称一',
+    'communication': '联通移动NB,电信NB',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则一',
+    'alarmPushTypeName': '报警推送规则名称一'
+  },
+  {
+    'tenentId': '5674324234',
+    'tenantName': '项目名称二',
+    'communication': '3G,4G',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则二',
+    'alarmPushTypeName': '报警推送规则名称二'
+  }
+
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/tenantConfig/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmTenantList,
+        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/api/systemConfig/deptPermission.js b/src/api/systemConfig/deptPermission.js
new file mode 100644
index 0000000..9b58c07
--- /dev/null
+++ b/src/api/systemConfig/deptPermission.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 deptList(params) {
+  return request({
+    url: 'deptPermission/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加组织权限配置
+export function addDept(params) {
+  return request({
+    url: 'deptPermission/add',
+    method: 'post',
+    params
+  })
+}
+// 修改组织权限配置
+export function updateDept(params) {
+  return request({
+    url: 'deptPermission/update',
+    method: 'post',
+    params
+  })
+}
+// 删除组织权限配置
+export function delDept(ids) {
+  return request({
+    url: 'deptPermission/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
new file mode 100644
index 0000000..9afa04e
--- /dev/null
+++ b/src/api/systemConfig/tenantConfig.js
@@ -0,0 +1,44 @@
+/*
+ * 项目配置配置接口
+*/
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 项目配置配置查询
+export function alarmTenantList(params) {
+  return request({
+    url: 'tenantConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加项目配置
+export function addAlarmTenant(params) {
+  return request({
+    url: 'tenantConfig/add',
+    method: 'post',
+    params
+  })
+}
+// 修改项目配置
+export function updateAlarmTenant(params) {
+  return request({
+    url: 'tenantConfig/update',
+    method: 'post',
+    params
+  })
+}
+// 删除项目配置
+export function delAlarmTenant(ids) {
+  return request({
+    url: 'tenantConfig/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
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..a7d74ca 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -16,6 +16,9 @@
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
+const alarmContent = require('./systemConfig/alarmContent')
+const tenantConfig = require('./systemConfig/tenantConfig')
+const deptPermission = require('./systemConfig/deptPermission')
 
 const mocks = [
   ...user,
@@ -32,7 +35,10 @@
   ...deviceType,
   ...deviceModels,
   ...deviceImei,
-  ...alarmLevel
+  ...alarmLevel,
+  ...alarmContent,
+  ...tenantConfig,
+  ...deptPermission
 ]
 
 // 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/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
new file mode 100644
index 0000000..8042352
--- /dev/null
+++ b/mock/systemConfig/deptPermission.js
@@ -0,0 +1,88 @@
+const deptPermissionList = [
+  {
+    'deptid': '4324324234',
+    'deptName': '组织名称一',
+    'wellType': '支持井类型一',
+    'deviceType': '支持设备类型二',
+    'lng': '123.122',
+    'lat': '23.3232'
+  },
+  {
+    'deptid': '4456324234',
+    'deptName': '组织名称二',
+    'wellType': '支持井类型二',
+    'deviceType': '支持设备类型二',
+    'lng': '143.423',
+    'lat': '56.1432'
+  }
+]
+// 设备类型列表
+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'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/type',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTypeList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  },
+  {
+    url: '/deptPermission/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deptPermissionList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
new file mode 100644
index 0000000..ca0a010
--- /dev/null
+++ b/mock/systemConfig/tenantConfig.js
@@ -0,0 +1,40 @@
+const alarmTenantList = [
+  {
+    'tenentId': '4324324234',
+    'tenantName': '项目名称一',
+    'communication': '联通移动NB,电信NB',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则一',
+    'alarmPushTypeName': '报警推送规则名称一'
+  },
+  {
+    'tenentId': '5674324234',
+    'tenantName': '项目名称二',
+    'communication': '3G,4G',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则二',
+    'alarmPushTypeName': '报警推送规则名称二'
+  }
+
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/tenantConfig/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmTenantList,
+        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/api/systemConfig/deptPermission.js b/src/api/systemConfig/deptPermission.js
new file mode 100644
index 0000000..9b58c07
--- /dev/null
+++ b/src/api/systemConfig/deptPermission.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 deptList(params) {
+  return request({
+    url: 'deptPermission/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加组织权限配置
+export function addDept(params) {
+  return request({
+    url: 'deptPermission/add',
+    method: 'post',
+    params
+  })
+}
+// 修改组织权限配置
+export function updateDept(params) {
+  return request({
+    url: 'deptPermission/update',
+    method: 'post',
+    params
+  })
+}
+// 删除组织权限配置
+export function delDept(ids) {
+  return request({
+    url: 'deptPermission/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
new file mode 100644
index 0000000..9afa04e
--- /dev/null
+++ b/src/api/systemConfig/tenantConfig.js
@@ -0,0 +1,44 @@
+/*
+ * 项目配置配置接口
+*/
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 项目配置配置查询
+export function alarmTenantList(params) {
+  return request({
+    url: 'tenantConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加项目配置
+export function addAlarmTenant(params) {
+  return request({
+    url: 'tenantConfig/add',
+    method: 'post',
+    params
+  })
+}
+// 修改项目配置
+export function updateAlarmTenant(params) {
+  return request({
+    url: 'tenantConfig/update',
+    method: 'post',
+    params
+  })
+}
+// 删除项目配置
+export function delAlarmTenant(ids) {
+  return request({
+    url: 'tenantConfig/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
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>

diff --git a/mock/index.js b/mock/index.js
index 8eef48b..a7d74ca 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -16,6 +16,9 @@
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
+const alarmContent = require('./systemConfig/alarmContent')
+const tenantConfig = require('./systemConfig/tenantConfig')
+const deptPermission = require('./systemConfig/deptPermission')
 
 const mocks = [
   ...user,
@@ -32,7 +35,10 @@
   ...deviceType,
   ...deviceModels,
   ...deviceImei,
-  ...alarmLevel
+  ...alarmLevel,
+  ...alarmContent,
+  ...tenantConfig,
+  ...deptPermission
 ]
 
 // 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/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
new file mode 100644
index 0000000..8042352
--- /dev/null
+++ b/mock/systemConfig/deptPermission.js
@@ -0,0 +1,88 @@
+const deptPermissionList = [
+  {
+    'deptid': '4324324234',
+    'deptName': '组织名称一',
+    'wellType': '支持井类型一',
+    'deviceType': '支持设备类型二',
+    'lng': '123.122',
+    'lat': '23.3232'
+  },
+  {
+    'deptid': '4456324234',
+    'deptName': '组织名称二',
+    'wellType': '支持井类型二',
+    'deviceType': '支持设备类型二',
+    'lng': '143.423',
+    'lat': '56.1432'
+  }
+]
+// 设备类型列表
+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'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/type',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTypeList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  },
+  {
+    url: '/deptPermission/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deptPermissionList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
new file mode 100644
index 0000000..ca0a010
--- /dev/null
+++ b/mock/systemConfig/tenantConfig.js
@@ -0,0 +1,40 @@
+const alarmTenantList = [
+  {
+    'tenentId': '4324324234',
+    'tenantName': '项目名称一',
+    'communication': '联通移动NB,电信NB',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则一',
+    'alarmPushTypeName': '报警推送规则名称一'
+  },
+  {
+    'tenentId': '5674324234',
+    'tenantName': '项目名称二',
+    'communication': '3G,4G',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则二',
+    'alarmPushTypeName': '报警推送规则名称二'
+  }
+
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/tenantConfig/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmTenantList,
+        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/api/systemConfig/deptPermission.js b/src/api/systemConfig/deptPermission.js
new file mode 100644
index 0000000..9b58c07
--- /dev/null
+++ b/src/api/systemConfig/deptPermission.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 deptList(params) {
+  return request({
+    url: 'deptPermission/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加组织权限配置
+export function addDept(params) {
+  return request({
+    url: 'deptPermission/add',
+    method: 'post',
+    params
+  })
+}
+// 修改组织权限配置
+export function updateDept(params) {
+  return request({
+    url: 'deptPermission/update',
+    method: 'post',
+    params
+  })
+}
+// 删除组织权限配置
+export function delDept(ids) {
+  return request({
+    url: 'deptPermission/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
new file mode 100644
index 0000000..9afa04e
--- /dev/null
+++ b/src/api/systemConfig/tenantConfig.js
@@ -0,0 +1,44 @@
+/*
+ * 项目配置配置接口
+*/
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 项目配置配置查询
+export function alarmTenantList(params) {
+  return request({
+    url: 'tenantConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加项目配置
+export function addAlarmTenant(params) {
+  return request({
+    url: 'tenantConfig/add',
+    method: 'post',
+    params
+  })
+}
+// 修改项目配置
+export function updateAlarmTenant(params) {
+  return request({
+    url: 'tenantConfig/update',
+    method: 'post',
+    params
+  })
+}
+// 删除项目配置
+export function delAlarmTenant(ids) {
+  return request({
+    url: 'tenantConfig/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
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>
diff --git a/src/views/systemConfig/deptPermission/components/dialogDeviceModel.vue b/src/views/systemConfig/deptPermission/components/dialogDeviceModel.vue
deleted file mode 100644
index ad70b2f..0000000
--- a/src/views/systemConfig/deptPermission/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,240 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="型号名称" prop="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="类型主键" prop="deviceType">
-            <el-input
-              v-model.trim="deviceForm.deviceType"
-              type="text"
-              clearable
-              placeholder="请输入类型主键"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备名称" prop="deviceTypeName">
-            <el-input
-              v-model.trim="deviceForm.deviceTypeName"
-              type="text"
-              clearable
-              placeholder="请输入设备名称"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'create' ? false : true" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        deviceTypeName: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        deviceTypeName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        deviceTypeName: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          modelName: row.modelName,
-          deviceType: row.deviceType,
-          communication: row.communication.split(','),
-          deviceTypeName: row.deviceTypeName,
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                })
-              }).catch(() => {
-                this.$emit('watchChild') // 刷新父组件数据列表
-                this.dialogFormVisible = false
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>

diff --git a/mock/index.js b/mock/index.js
index 8eef48b..a7d74ca 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -16,6 +16,9 @@
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
+const alarmContent = require('./systemConfig/alarmContent')
+const tenantConfig = require('./systemConfig/tenantConfig')
+const deptPermission = require('./systemConfig/deptPermission')
 
 const mocks = [
   ...user,
@@ -32,7 +35,10 @@
   ...deviceType,
   ...deviceModels,
   ...deviceImei,
-  ...alarmLevel
+  ...alarmLevel,
+  ...alarmContent,
+  ...tenantConfig,
+  ...deptPermission
 ]
 
 // 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/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
new file mode 100644
index 0000000..8042352
--- /dev/null
+++ b/mock/systemConfig/deptPermission.js
@@ -0,0 +1,88 @@
+const deptPermissionList = [
+  {
+    'deptid': '4324324234',
+    'deptName': '组织名称一',
+    'wellType': '支持井类型一',
+    'deviceType': '支持设备类型二',
+    'lng': '123.122',
+    'lat': '23.3232'
+  },
+  {
+    'deptid': '4456324234',
+    'deptName': '组织名称二',
+    'wellType': '支持井类型二',
+    'deviceType': '支持设备类型二',
+    'lng': '143.423',
+    'lat': '56.1432'
+  }
+]
+// 设备类型列表
+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'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/type',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTypeList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  },
+  {
+    url: '/deptPermission/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deptPermissionList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
new file mode 100644
index 0000000..ca0a010
--- /dev/null
+++ b/mock/systemConfig/tenantConfig.js
@@ -0,0 +1,40 @@
+const alarmTenantList = [
+  {
+    'tenentId': '4324324234',
+    'tenantName': '项目名称一',
+    'communication': '联通移动NB,电信NB',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则一',
+    'alarmPushTypeName': '报警推送规则名称一'
+  },
+  {
+    'tenentId': '5674324234',
+    'tenantName': '项目名称二',
+    'communication': '3G,4G',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则二',
+    'alarmPushTypeName': '报警推送规则名称二'
+  }
+
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/tenantConfig/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmTenantList,
+        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/api/systemConfig/deptPermission.js b/src/api/systemConfig/deptPermission.js
new file mode 100644
index 0000000..9b58c07
--- /dev/null
+++ b/src/api/systemConfig/deptPermission.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 deptList(params) {
+  return request({
+    url: 'deptPermission/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加组织权限配置
+export function addDept(params) {
+  return request({
+    url: 'deptPermission/add',
+    method: 'post',
+    params
+  })
+}
+// 修改组织权限配置
+export function updateDept(params) {
+  return request({
+    url: 'deptPermission/update',
+    method: 'post',
+    params
+  })
+}
+// 删除组织权限配置
+export function delDept(ids) {
+  return request({
+    url: 'deptPermission/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
new file mode 100644
index 0000000..9afa04e
--- /dev/null
+++ b/src/api/systemConfig/tenantConfig.js
@@ -0,0 +1,44 @@
+/*
+ * 项目配置配置接口
+*/
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 项目配置配置查询
+export function alarmTenantList(params) {
+  return request({
+    url: 'tenantConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加项目配置
+export function addAlarmTenant(params) {
+  return request({
+    url: 'tenantConfig/add',
+    method: 'post',
+    params
+  })
+}
+// 修改项目配置
+export function updateAlarmTenant(params) {
+  return request({
+    url: 'tenantConfig/update',
+    method: 'post',
+    params
+  })
+}
+// 删除项目配置
+export function delAlarmTenant(ids) {
+  return request({
+    url: 'tenantConfig/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
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>
diff --git a/src/views/systemConfig/deptPermission/components/dialogDeviceModel.vue b/src/views/systemConfig/deptPermission/components/dialogDeviceModel.vue
deleted file mode 100644
index ad70b2f..0000000
--- a/src/views/systemConfig/deptPermission/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,240 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="型号名称" prop="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="类型主键" prop="deviceType">
-            <el-input
-              v-model.trim="deviceForm.deviceType"
-              type="text"
-              clearable
-              placeholder="请输入类型主键"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备名称" prop="deviceTypeName">
-            <el-input
-              v-model.trim="deviceForm.deviceTypeName"
-              type="text"
-              clearable
-              placeholder="请输入设备名称"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'create' ? false : true" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        deviceTypeName: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        deviceTypeName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        deviceTypeName: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          modelName: row.modelName,
-          deviceType: row.deviceType,
-          communication: row.communication.split(','),
-          deviceTypeName: row.deviceTypeName,
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                })
-              }).catch(() => {
-                this.$emit('watchChild') // 刷新父组件数据列表
-                this.dialogFormVisible = false
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/deptPermission/components/dialogListDept.vue b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
new file mode 100644
index 0000000..40fef65
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="井类型" prop="wellType">
+            <el-select
+              v-model="deviceForm.wellType"
+              clearable
+              placeholder="请选择支持井类型"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in wellTypeList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="经度" prop="lng">
+            <el-input
+              v-model="deviceForm.lng"
+              clearable
+              placeholder="请输入经度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="纬度" prop="lat">
+            <el-input
+              v-model="deviceForm.lat"
+              clearable
+              placeholder="请输入纬度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' || dialogStatus === 'update' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="组织id" prop="deptid">
+            <el-input
+              v-model="deviceForm.deptid"
+              clearable
+              disabled
+              placeholder="请输入组织id"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
+export default {
+  name: 'DialogListDept',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 支持井类型
+      wellTypeList: [
+        {
+          label: '井类型一',
+          value: '1'
+        },
+        {
+          label: '井类型二',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      },
+      // 表单校验规则
+      rules: {
+        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
+        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDept(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDept(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild') // 刷新父组件数据列表
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>

diff --git a/mock/index.js b/mock/index.js
index 8eef48b..a7d74ca 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -16,6 +16,9 @@
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
+const alarmContent = require('./systemConfig/alarmContent')
+const tenantConfig = require('./systemConfig/tenantConfig')
+const deptPermission = require('./systemConfig/deptPermission')
 
 const mocks = [
   ...user,
@@ -32,7 +35,10 @@
   ...deviceType,
   ...deviceModels,
   ...deviceImei,
-  ...alarmLevel
+  ...alarmLevel,
+  ...alarmContent,
+  ...tenantConfig,
+  ...deptPermission
 ]
 
 // 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/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
new file mode 100644
index 0000000..8042352
--- /dev/null
+++ b/mock/systemConfig/deptPermission.js
@@ -0,0 +1,88 @@
+const deptPermissionList = [
+  {
+    'deptid': '4324324234',
+    'deptName': '组织名称一',
+    'wellType': '支持井类型一',
+    'deviceType': '支持设备类型二',
+    'lng': '123.122',
+    'lat': '23.3232'
+  },
+  {
+    'deptid': '4456324234',
+    'deptName': '组织名称二',
+    'wellType': '支持井类型二',
+    'deviceType': '支持设备类型二',
+    'lng': '143.423',
+    'lat': '56.1432'
+  }
+]
+// 设备类型列表
+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'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/type',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTypeList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  },
+  {
+    url: '/deptPermission/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deptPermissionList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
new file mode 100644
index 0000000..ca0a010
--- /dev/null
+++ b/mock/systemConfig/tenantConfig.js
@@ -0,0 +1,40 @@
+const alarmTenantList = [
+  {
+    'tenentId': '4324324234',
+    'tenantName': '项目名称一',
+    'communication': '联通移动NB,电信NB',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则一',
+    'alarmPushTypeName': '报警推送规则名称一'
+  },
+  {
+    'tenentId': '5674324234',
+    'tenantName': '项目名称二',
+    'communication': '3G,4G',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则二',
+    'alarmPushTypeName': '报警推送规则名称二'
+  }
+
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/tenantConfig/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmTenantList,
+        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/api/systemConfig/deptPermission.js b/src/api/systemConfig/deptPermission.js
new file mode 100644
index 0000000..9b58c07
--- /dev/null
+++ b/src/api/systemConfig/deptPermission.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 deptList(params) {
+  return request({
+    url: 'deptPermission/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加组织权限配置
+export function addDept(params) {
+  return request({
+    url: 'deptPermission/add',
+    method: 'post',
+    params
+  })
+}
+// 修改组织权限配置
+export function updateDept(params) {
+  return request({
+    url: 'deptPermission/update',
+    method: 'post',
+    params
+  })
+}
+// 删除组织权限配置
+export function delDept(ids) {
+  return request({
+    url: 'deptPermission/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
new file mode 100644
index 0000000..9afa04e
--- /dev/null
+++ b/src/api/systemConfig/tenantConfig.js
@@ -0,0 +1,44 @@
+/*
+ * 项目配置配置接口
+*/
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 项目配置配置查询
+export function alarmTenantList(params) {
+  return request({
+    url: 'tenantConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加项目配置
+export function addAlarmTenant(params) {
+  return request({
+    url: 'tenantConfig/add',
+    method: 'post',
+    params
+  })
+}
+// 修改项目配置
+export function updateAlarmTenant(params) {
+  return request({
+    url: 'tenantConfig/update',
+    method: 'post',
+    params
+  })
+}
+// 删除项目配置
+export function delAlarmTenant(ids) {
+  return request({
+    url: 'tenantConfig/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
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>
diff --git a/src/views/systemConfig/deptPermission/components/dialogDeviceModel.vue b/src/views/systemConfig/deptPermission/components/dialogDeviceModel.vue
deleted file mode 100644
index ad70b2f..0000000
--- a/src/views/systemConfig/deptPermission/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,240 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="型号名称" prop="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="类型主键" prop="deviceType">
-            <el-input
-              v-model.trim="deviceForm.deviceType"
-              type="text"
-              clearable
-              placeholder="请输入类型主键"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备名称" prop="deviceTypeName">
-            <el-input
-              v-model.trim="deviceForm.deviceTypeName"
-              type="text"
-              clearable
-              placeholder="请输入设备名称"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'create' ? false : true" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        deviceTypeName: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        deviceTypeName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        deviceTypeName: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          modelName: row.modelName,
-          deviceType: row.deviceType,
-          communication: row.communication.split(','),
-          deviceTypeName: row.deviceTypeName,
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                })
-              }).catch(() => {
-                this.$emit('watchChild') // 刷新父组件数据列表
-                this.dialogFormVisible = false
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/deptPermission/components/dialogListDept.vue b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
new file mode 100644
index 0000000..40fef65
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="井类型" prop="wellType">
+            <el-select
+              v-model="deviceForm.wellType"
+              clearable
+              placeholder="请选择支持井类型"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in wellTypeList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="经度" prop="lng">
+            <el-input
+              v-model="deviceForm.lng"
+              clearable
+              placeholder="请输入经度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="纬度" prop="lat">
+            <el-input
+              v-model="deviceForm.lat"
+              clearable
+              placeholder="请输入纬度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' || dialogStatus === 'update' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="组织id" prop="deptid">
+            <el-input
+              v-model="deviceForm.deptid"
+              clearable
+              disabled
+              placeholder="请输入组织id"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
+export default {
+  name: 'DialogListDept',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 支持井类型
+      wellTypeList: [
+        {
+          label: '井类型一',
+          value: '1'
+        },
+        {
+          label: '井类型二',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      },
+      // 表单校验规则
+      rules: {
+        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
+        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDept(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDept(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild') // 刷新父组件数据列表
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/listDept.vue b/src/views/systemConfig/deptPermission/listDept.vue
index 37d3277..30f4f06 100644
--- a/src/views/systemConfig/deptPermission/listDept.vue
+++ b/src/views/systemConfig/deptPermission/listDept.vue
@@ -1,224 +1,165 @@
 <template>
-  <div class="app-container">
-    <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item">
-            <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>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.communication" placeholder="通信方式" clearable>
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
-            搜索
-          </el-button>
-        </el-row>
-      </el-form>
-    </div>
-    <!--查询结果Table显示-->
-    <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button class="edit_btn" size="small" @click="del">
-            删除
-          </el-button>
-          <el-button class="edit_btn" size="small" @click="add">
-            新增
-          </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55" />
-        <el-table-column align="center" type="index" label="序号" width="55" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+  <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.deptid"
+          placeholder="组织id"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="120" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button type="text" @click="edit(scope.row)">
-              编辑
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <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>
-      </el-table>
-    </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
-  </div>
+      </template>
+    </normal-table>
+    <dialog-list-dept ref="dialogAlarmContent" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
-import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
+// 引用封装组件
+import dialogListDept from '@/views/systemConfig/deptPermission/components/dialogListDept'
+// 接口调用
+import { deptList, delDept } from '@/api/systemConfig/deptPermission'
 
 export default {
   name: 'ListDept',
-  components: { dialogDevice },
+  components: { dialogListDept },
   data() {
     return {
+      // 查询条件
       listQuery: {
-        modelName: '',
-        communication: '',
+        deptid: '',
         offset: 1,
         sort: 'id',
         order: 'asc'
-      }, // 查询条件
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
+      },
       columns: [
         {
-          text: '设备型号编号',
-          value: 'id',
+          text: '组织id',
+          value: 'deptid',
           align: 'center'
         },
         {
-          text: '型号名称',
-          value: 'modelName',
+          text: '组织名称',
+          value: 'deptName',
           align: 'center'
         },
         {
-          text: '设备类型主键',
+          text: '支持井类型',
+          value: 'wellType',
+          align: 'center'
+        },
+        {
+          text: '支持设备类型',
           value: 'deviceType',
           align: 'center'
         },
         {
-          text: '设备类型名称',
-          value: 'deviceTypeName',
+          text: '经度',
+          value: 'lng',
           align: 'center'
         },
         {
-          text: '通信方式',
-          value: 'communication',
+          text: '纬度',
+          value: 'lat',
           align: 'center'
         }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
-      list: [], // 列表数据
+      listLoading: false,
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      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
-      })
-    },
-    // 查询数据
-    search() {
-      this.fetchData(false)
-    },
-    // 数据列表
+    // 获取数据列表
     fetchData() {
       this.listLoading = true
-      getDeviceModelList(this.listQuery).then(response => {
+      deptList(this.listQuery).then(response => {
         this.list = response.data
         this.listLoading = false
       })
     },
-    // table表格每行多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 检查选择情况
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
-    // 删除设备
-    del() {
-      if (this.checkSelection()) {
-        const deviceIds = []
-        const deviceIndex = []
-        this.multipleSelection.forEach(function(value, index) {
-          deviceIds.push(value.id)
-          deviceIndex.push(index)
-        })
-        this.$confirm(
-          '确定要删除所选设备吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDept(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
           }
-        ).then(() => {
-          delDeviceModel(deviceIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
         })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.dialogAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.dialogAlarmContent.initDialog('update', row)
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
-    },
-    // 新增设备
-    add() {
-      this.$refs.dialogDevice.initDialog('create')
-    },
-    // 编辑设备信息
-    edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.dialogAlarmContent.initDialog('detail', row)
     }
   }
 }
@@ -229,6 +170,9 @@
   .table{
     margin-bottom: 20px;
   }
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
   .pagination-container{
     margin-bottom: 50px;
   }

diff --git a/mock/index.js b/mock/index.js
index 8eef48b..a7d74ca 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -16,6 +16,9 @@
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
+const alarmContent = require('./systemConfig/alarmContent')
+const tenantConfig = require('./systemConfig/tenantConfig')
+const deptPermission = require('./systemConfig/deptPermission')
 
 const mocks = [
   ...user,
@@ -32,7 +35,10 @@
   ...deviceType,
   ...deviceModels,
   ...deviceImei,
-  ...alarmLevel
+  ...alarmLevel,
+  ...alarmContent,
+  ...tenantConfig,
+  ...deptPermission
 ]
 
 // 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/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
new file mode 100644
index 0000000..8042352
--- /dev/null
+++ b/mock/systemConfig/deptPermission.js
@@ -0,0 +1,88 @@
+const deptPermissionList = [
+  {
+    'deptid': '4324324234',
+    'deptName': '组织名称一',
+    'wellType': '支持井类型一',
+    'deviceType': '支持设备类型二',
+    'lng': '123.122',
+    'lat': '23.3232'
+  },
+  {
+    'deptid': '4456324234',
+    'deptName': '组织名称二',
+    'wellType': '支持井类型二',
+    'deviceType': '支持设备类型二',
+    'lng': '143.423',
+    'lat': '56.1432'
+  }
+]
+// 设备类型列表
+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'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/type',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTypeList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  },
+  {
+    url: '/deptPermission/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deptPermissionList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
new file mode 100644
index 0000000..ca0a010
--- /dev/null
+++ b/mock/systemConfig/tenantConfig.js
@@ -0,0 +1,40 @@
+const alarmTenantList = [
+  {
+    'tenentId': '4324324234',
+    'tenantName': '项目名称一',
+    'communication': '联通移动NB,电信NB',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则一',
+    'alarmPushTypeName': '报警推送规则名称一'
+  },
+  {
+    'tenentId': '5674324234',
+    'tenantName': '项目名称二',
+    'communication': '3G,4G',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则二',
+    'alarmPushTypeName': '报警推送规则名称二'
+  }
+
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/tenantConfig/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmTenantList,
+        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/api/systemConfig/deptPermission.js b/src/api/systemConfig/deptPermission.js
new file mode 100644
index 0000000..9b58c07
--- /dev/null
+++ b/src/api/systemConfig/deptPermission.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 deptList(params) {
+  return request({
+    url: 'deptPermission/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加组织权限配置
+export function addDept(params) {
+  return request({
+    url: 'deptPermission/add',
+    method: 'post',
+    params
+  })
+}
+// 修改组织权限配置
+export function updateDept(params) {
+  return request({
+    url: 'deptPermission/update',
+    method: 'post',
+    params
+  })
+}
+// 删除组织权限配置
+export function delDept(ids) {
+  return request({
+    url: 'deptPermission/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
new file mode 100644
index 0000000..9afa04e
--- /dev/null
+++ b/src/api/systemConfig/tenantConfig.js
@@ -0,0 +1,44 @@
+/*
+ * 项目配置配置接口
+*/
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 项目配置配置查询
+export function alarmTenantList(params) {
+  return request({
+    url: 'tenantConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加项目配置
+export function addAlarmTenant(params) {
+  return request({
+    url: 'tenantConfig/add',
+    method: 'post',
+    params
+  })
+}
+// 修改项目配置
+export function updateAlarmTenant(params) {
+  return request({
+    url: 'tenantConfig/update',
+    method: 'post',
+    params
+  })
+}
+// 删除项目配置
+export function delAlarmTenant(ids) {
+  return request({
+    url: 'tenantConfig/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
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>
diff --git a/src/views/systemConfig/deptPermission/components/dialogDeviceModel.vue b/src/views/systemConfig/deptPermission/components/dialogDeviceModel.vue
deleted file mode 100644
index ad70b2f..0000000
--- a/src/views/systemConfig/deptPermission/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,240 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="型号名称" prop="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="类型主键" prop="deviceType">
-            <el-input
-              v-model.trim="deviceForm.deviceType"
-              type="text"
-              clearable
-              placeholder="请输入类型主键"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备名称" prop="deviceTypeName">
-            <el-input
-              v-model.trim="deviceForm.deviceTypeName"
-              type="text"
-              clearable
-              placeholder="请输入设备名称"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'create' ? false : true" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        deviceTypeName: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        deviceTypeName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        deviceTypeName: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          modelName: row.modelName,
-          deviceType: row.deviceType,
-          communication: row.communication.split(','),
-          deviceTypeName: row.deviceTypeName,
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                })
-              }).catch(() => {
-                this.$emit('watchChild') // 刷新父组件数据列表
-                this.dialogFormVisible = false
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/deptPermission/components/dialogListDept.vue b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
new file mode 100644
index 0000000..40fef65
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="井类型" prop="wellType">
+            <el-select
+              v-model="deviceForm.wellType"
+              clearable
+              placeholder="请选择支持井类型"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in wellTypeList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="经度" prop="lng">
+            <el-input
+              v-model="deviceForm.lng"
+              clearable
+              placeholder="请输入经度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="纬度" prop="lat">
+            <el-input
+              v-model="deviceForm.lat"
+              clearable
+              placeholder="请输入纬度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' || dialogStatus === 'update' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="组织id" prop="deptid">
+            <el-input
+              v-model="deviceForm.deptid"
+              clearable
+              disabled
+              placeholder="请输入组织id"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
+export default {
+  name: 'DialogListDept',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 支持井类型
+      wellTypeList: [
+        {
+          label: '井类型一',
+          value: '1'
+        },
+        {
+          label: '井类型二',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      },
+      // 表单校验规则
+      rules: {
+        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
+        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDept(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDept(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild') // 刷新父组件数据列表
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/listDept.vue b/src/views/systemConfig/deptPermission/listDept.vue
index 37d3277..30f4f06 100644
--- a/src/views/systemConfig/deptPermission/listDept.vue
+++ b/src/views/systemConfig/deptPermission/listDept.vue
@@ -1,224 +1,165 @@
 <template>
-  <div class="app-container">
-    <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item">
-            <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>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.communication" placeholder="通信方式" clearable>
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
-            搜索
-          </el-button>
-        </el-row>
-      </el-form>
-    </div>
-    <!--查询结果Table显示-->
-    <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button class="edit_btn" size="small" @click="del">
-            删除
-          </el-button>
-          <el-button class="edit_btn" size="small" @click="add">
-            新增
-          </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55" />
-        <el-table-column align="center" type="index" label="序号" width="55" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+  <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.deptid"
+          placeholder="组织id"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="120" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button type="text" @click="edit(scope.row)">
-              编辑
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <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>
-      </el-table>
-    </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
-  </div>
+      </template>
+    </normal-table>
+    <dialog-list-dept ref="dialogAlarmContent" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
-import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
+// 引用封装组件
+import dialogListDept from '@/views/systemConfig/deptPermission/components/dialogListDept'
+// 接口调用
+import { deptList, delDept } from '@/api/systemConfig/deptPermission'
 
 export default {
   name: 'ListDept',
-  components: { dialogDevice },
+  components: { dialogListDept },
   data() {
     return {
+      // 查询条件
       listQuery: {
-        modelName: '',
-        communication: '',
+        deptid: '',
         offset: 1,
         sort: 'id',
         order: 'asc'
-      }, // 查询条件
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
+      },
       columns: [
         {
-          text: '设备型号编号',
-          value: 'id',
+          text: '组织id',
+          value: 'deptid',
           align: 'center'
         },
         {
-          text: '型号名称',
-          value: 'modelName',
+          text: '组织名称',
+          value: 'deptName',
           align: 'center'
         },
         {
-          text: '设备类型主键',
+          text: '支持井类型',
+          value: 'wellType',
+          align: 'center'
+        },
+        {
+          text: '支持设备类型',
           value: 'deviceType',
           align: 'center'
         },
         {
-          text: '设备类型名称',
-          value: 'deviceTypeName',
+          text: '经度',
+          value: 'lng',
           align: 'center'
         },
         {
-          text: '通信方式',
-          value: 'communication',
+          text: '纬度',
+          value: 'lat',
           align: 'center'
         }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
-      list: [], // 列表数据
+      listLoading: false,
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      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
-      })
-    },
-    // 查询数据
-    search() {
-      this.fetchData(false)
-    },
-    // 数据列表
+    // 获取数据列表
     fetchData() {
       this.listLoading = true
-      getDeviceModelList(this.listQuery).then(response => {
+      deptList(this.listQuery).then(response => {
         this.list = response.data
         this.listLoading = false
       })
     },
-    // table表格每行多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 检查选择情况
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
-    // 删除设备
-    del() {
-      if (this.checkSelection()) {
-        const deviceIds = []
-        const deviceIndex = []
-        this.multipleSelection.forEach(function(value, index) {
-          deviceIds.push(value.id)
-          deviceIndex.push(index)
-        })
-        this.$confirm(
-          '确定要删除所选设备吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDept(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
           }
-        ).then(() => {
-          delDeviceModel(deviceIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
         })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.dialogAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.dialogAlarmContent.initDialog('update', row)
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
-    },
-    // 新增设备
-    add() {
-      this.$refs.dialogDevice.initDialog('create')
-    },
-    // 编辑设备信息
-    edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.dialogAlarmContent.initDialog('detail', row)
     }
   }
 }
@@ -229,6 +170,9 @@
   .table{
     margin-bottom: 20px;
   }
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
   .pagination-container{
     margin-bottom: 50px;
   }
diff --git a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue b/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
new file mode 100644
index 0000000..ab7432e
--- /dev/null
+++ b/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
@@ -0,0 +1,338 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="通讯方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              :disabled="dialogStatus === 'detail' ? true : false"
+              placeholder="请选择支持通信方式"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="坐标系" prop="coordinateType">
+            <el-input
+              v-model="deviceForm.coordinateType"
+              placeholder="请输入数据默认坐标系"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="生成工单" prop="isJobGenerate">
+            <el-select
+              v-model="deviceForm.isJobGenerate"
+              clearable
+              placeholder="请选择是否生成工单"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in jobList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="APP推送" prop="isAppPush">
+            <el-select
+              v-model="deviceForm.isAppPush"
+              clearable
+              placeholder="请选择是否APP推送"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in appPushList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="短信推送" prop="isMessagePush">
+            <el-select
+              v-model="deviceForm.isMessagePush"
+              clearable
+              placeholder="请选择是否短信推送"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in messagePushList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' || dialogStatus === 'update' ? true : false" :span="12">
+          <el-form-item label="项目id" prop="devcode">
+            <el-input
+              v-model="deviceForm.devcode"
+              clearable
+              disabled
+              placeholder="未知"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/tenantConfig'
+export default {
+  name: 'DialogListTenant',
+  data() {
+    return {
+      // 通讯方式
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 是否生成工单
+      jobList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      // 是否开启App推送
+      appPushList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      // 是否开启短信推送
+      messagePushList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        isMessagePush: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
+        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
+        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
+        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
+        isMessagePush: [{ required: true, message: '是否开启短信推送必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        isMessagePush: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        this.deviceForm = {
+          communication: row.communication.split(','),
+          coordinateType: row.coordinateType,
+          isJobGenerate: row.isJobGenerate,
+          isAppPush: row.isAppPush,
+          isMessagePush: row.isMessagePush,
+          devcode: row.tenentId
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild') // 刷新父组件数据列表
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>

diff --git a/mock/index.js b/mock/index.js
index 8eef48b..a7d74ca 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -16,6 +16,9 @@
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
+const alarmContent = require('./systemConfig/alarmContent')
+const tenantConfig = require('./systemConfig/tenantConfig')
+const deptPermission = require('./systemConfig/deptPermission')
 
 const mocks = [
   ...user,
@@ -32,7 +35,10 @@
   ...deviceType,
   ...deviceModels,
   ...deviceImei,
-  ...alarmLevel
+  ...alarmLevel,
+  ...alarmContent,
+  ...tenantConfig,
+  ...deptPermission
 ]
 
 // 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/systemConfig/deptPermission.js b/mock/systemConfig/deptPermission.js
new file mode 100644
index 0000000..8042352
--- /dev/null
+++ b/mock/systemConfig/deptPermission.js
@@ -0,0 +1,88 @@
+const deptPermissionList = [
+  {
+    'deptid': '4324324234',
+    'deptName': '组织名称一',
+    'wellType': '支持井类型一',
+    'deviceType': '支持设备类型二',
+    'lng': '123.122',
+    'lat': '23.3232'
+  },
+  {
+    'deptid': '4456324234',
+    'deptName': '组织名称二',
+    'wellType': '支持井类型二',
+    'deviceType': '支持设备类型二',
+    'lng': '143.423',
+    'lat': '56.1432'
+  }
+]
+// 设备类型列表
+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'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/type',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTypeList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  },
+  {
+    url: '/deptPermission/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deptPermissionList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/mock/systemConfig/tenantConfig.js b/mock/systemConfig/tenantConfig.js
new file mode 100644
index 0000000..ca0a010
--- /dev/null
+++ b/mock/systemConfig/tenantConfig.js
@@ -0,0 +1,40 @@
+const alarmTenantList = [
+  {
+    'tenentId': '4324324234',
+    'tenantName': '项目名称一',
+    'communication': '联通移动NB,电信NB',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则一',
+    'alarmPushTypeName': '报警推送规则名称一'
+  },
+  {
+    'tenentId': '5674324234',
+    'tenantName': '项目名称二',
+    'communication': '3G,4G',
+    'coordinateType': 'WGS84,BD09,GCJ02',
+    'isJobGenerate': '是',
+    'isAppPush': '是',
+    'isMessagePush': '是',
+    'alarmPushType': '报警推送规则二',
+    'alarmPushTypeName': '报警推送规则名称二'
+  }
+
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/tenantConfig/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmTenantList,
+        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/api/systemConfig/deptPermission.js b/src/api/systemConfig/deptPermission.js
new file mode 100644
index 0000000..9b58c07
--- /dev/null
+++ b/src/api/systemConfig/deptPermission.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 deptList(params) {
+  return request({
+    url: 'deptPermission/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加组织权限配置
+export function addDept(params) {
+  return request({
+    url: 'deptPermission/add',
+    method: 'post',
+    params
+  })
+}
+// 修改组织权限配置
+export function updateDept(params) {
+  return request({
+    url: 'deptPermission/update',
+    method: 'post',
+    params
+  })
+}
+// 删除组织权限配置
+export function delDept(ids) {
+  return request({
+    url: 'deptPermission/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/api/systemConfig/tenantConfig.js b/src/api/systemConfig/tenantConfig.js
new file mode 100644
index 0000000..9afa04e
--- /dev/null
+++ b/src/api/systemConfig/tenantConfig.js
@@ -0,0 +1,44 @@
+/*
+ * 项目配置配置接口
+*/
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 项目配置配置查询
+export function alarmTenantList(params) {
+  return request({
+    url: 'tenantConfig/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加项目配置
+export function addAlarmTenant(params) {
+  return request({
+    url: 'tenantConfig/add',
+    method: 'post',
+    params
+  })
+}
+// 修改项目配置
+export function updateAlarmTenant(params) {
+  return request({
+    url: 'tenantConfig/update',
+    method: 'post',
+    params
+  })
+}
+// 删除项目配置
+export function delAlarmTenant(ids) {
+  return request({
+    url: 'tenantConfig/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
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>
diff --git a/src/views/systemConfig/deptPermission/components/dialogDeviceModel.vue b/src/views/systemConfig/deptPermission/components/dialogDeviceModel.vue
deleted file mode 100644
index ad70b2f..0000000
--- a/src/views/systemConfig/deptPermission/components/dialogDeviceModel.vue
+++ /dev/null
@@ -1,240 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="型号名称" prop="modelName">
-            <el-input
-              v-model.trim="deviceForm.modelName"
-              type="text"
-              :disabled="dialogStatus === 'create' ? false : true"
-              clearable
-              placeholder="请输入型号名称"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="类型主键" prop="deviceType">
-            <el-input
-              v-model.trim="deviceForm.deviceType"
-              type="text"
-              clearable
-              placeholder="请输入类型主键"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备名称" prop="deviceTypeName">
-            <el-input
-              v-model.trim="deviceForm.deviceTypeName"
-              type="text"
-              clearable
-              placeholder="请输入设备名称"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="通信方式" prop="communication">
-            <el-select
-              v-model="deviceForm.communication"
-              clearable
-              multiple
-              placeholder="请选择通信方式"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'create' ? false : true" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              type="text"
-              clearable
-              devcode
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="dialogFormVisible = false">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
-export default {
-  name: 'DialogDeviceModel',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框显示隐藏
-      dialogStatus: '', // 对话框类型：create,update,detail
-      // 对话框标题
-      textMap: {
-        update: '编辑',
-        create: '新增',
-        detail: '详情'
-      },
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
-      // 表单内容
-      deviceForm: {
-        modelName: '',
-        deviceType: '',
-        communication: [],
-        deviceTypeName: '',
-        devcode: ''
-      },
-      // 表单校验规则
-      rules: {
-        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        deviceTypeName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
-        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        modelName: '',
-        deviceType: '',
-        communication: '',
-        deviceTypeName: '',
-        devcode: ''
-      }
-    },
-    // 父子组件通信
-    initDialog(dialogStatus, row = null) {
-      console.log(row, '====21==')
-      this.dialogFormVisible = true
-      this.dialogStatus = dialogStatus
-      if (this.dialogStatus === 'create') {
-        this.resetForm()
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
-        console.log(typeof row.communication)
-        this.deviceForm = {
-          modelName: row.modelName,
-          deviceType: row.deviceType,
-          communication: row.communication.split(','),
-          deviceTypeName: row.deviceTypeName,
-          devcode: row.id
-        }
-      }
-    },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 修改数据
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          updateDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          this.deviceForm.communication = this.deviceForm.communication.toString()
-          addDeviceModel(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$confirm('新增成功，是否继续新增?', '提示', {
-                confirmButtonText: '是',
-                cancelButtonText: '否',
-                type: 'info'
-              }).then(() => {
-                this.resetForm()
-                this.$nextTick(() => {
-                  this.$refs['dataForm'].clearValidate()
-                })
-              }).catch(() => {
-                this.$emit('watchChild') // 刷新父组件数据列表
-                this.dialogFormVisible = false
-              })
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/systemConfig/deptPermission/components/dialogListDept.vue b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
new file mode 100644
index 0000000..40fef65
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/components/dialogListDept.vue
@@ -0,0 +1,238 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="井类型" prop="wellType">
+            <el-select
+              v-model="deviceForm.wellType"
+              clearable
+              placeholder="请选择支持井类型"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in wellTypeList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="经度" prop="lng">
+            <el-input
+              v-model="deviceForm.lng"
+              clearable
+              placeholder="请输入经度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="纬度" prop="lat">
+            <el-input
+              v-model="deviceForm.lat"
+              clearable
+              placeholder="请输入纬度"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'detail' || dialogStatus === 'update' ? true : false" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="组织id" prop="deptid">
+            <el-input
+              v-model="deviceForm.deptid"
+              clearable
+              disabled
+              placeholder="请输入组织id"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
+export default {
+  name: 'DialogListDept',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 支持井类型
+      wellTypeList: [
+        {
+          label: '井类型一',
+          value: '1'
+        },
+        {
+          label: '井类型二',
+          value: '2'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      },
+      // 表单校验规则
+      rules: {
+        deptid: [{ required: true, message: '组织id不能为空', trigger: ['blur', 'change'] }],
+        wellType: [{ required: true, message: '支持井类型必选', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '支持设备类型必选', trigger: ['blur', 'change'] }],
+        lng: [{ required: true, message: '经度不能为空', trigger: ['blur', 'change'] }],
+        lat: [{ required: true, message: '纬度不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        deptid: '',
+        wellType: '',
+        deviceType: '',
+        lng: '',
+        lat: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        this.deviceForm = {
+          deptid: row.deptid,
+          wellType: row.wellType,
+          deviceType: row.deviceType,
+          lng: row.lng,
+          lat: row.lat
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDept(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addDept(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild') // 刷新父组件数据列表
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/listDept.vue b/src/views/systemConfig/deptPermission/listDept.vue
index 37d3277..30f4f06 100644
--- a/src/views/systemConfig/deptPermission/listDept.vue
+++ b/src/views/systemConfig/deptPermission/listDept.vue
@@ -1,224 +1,165 @@
 <template>
-  <div class="app-container">
-    <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item">
-            <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>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.communication" placeholder="通信方式" clearable>
-              <el-option
-                v-for="item in commuList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
-            搜索
-          </el-button>
-        </el-row>
-      </el-form>
-    </div>
-    <!--查询结果Table显示-->
-    <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button class="edit_btn" size="small" @click="del">
-            删除
-          </el-button>
-          <el-button class="edit_btn" size="small" @click="add">
-            新增
-          </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55" />
-        <el-table-column align="center" type="index" label="序号" width="55" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+  <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.deptid"
+          placeholder="组织id"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="120" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button type="text" @click="edit(scope.row)">
-              编辑
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <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>
-      </el-table>
-    </div>
-    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
-  </div>
+      </template>
+    </normal-table>
+    <dialog-list-dept ref="dialogAlarmContent" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <script>
-import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
-import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
+// 引用封装组件
+import dialogListDept from '@/views/systemConfig/deptPermission/components/dialogListDept'
+// 接口调用
+import { deptList, delDept } from '@/api/systemConfig/deptPermission'
 
 export default {
   name: 'ListDept',
-  components: { dialogDevice },
+  components: { dialogListDept },
   data() {
     return {
+      // 查询条件
       listQuery: {
-        modelName: '',
-        communication: '',
+        deptid: '',
         offset: 1,
         sort: 'id',
         order: 'asc'
-      }, // 查询条件
-      commuList: [
-        {
-          label: 'LORA',
-          value: '0'
-        },
-        {
-          label: '3G',
-          value: '1'
-        },
-        {
-          label: '4G',
-          value: '2'
-        },
-        {
-          label: '联通移动NB',
-          value: '3'
-        },
-        {
-          label: '电信NB',
-          value: '4'
-        }
-      ],
+      },
       columns: [
         {
-          text: '设备型号编号',
-          value: 'id',
+          text: '组织id',
+          value: 'deptid',
           align: 'center'
         },
         {
-          text: '型号名称',
-          value: 'modelName',
+          text: '组织名称',
+          value: 'deptName',
           align: 'center'
         },
         {
-          text: '设备类型主键',
+          text: '支持井类型',
+          value: 'wellType',
+          align: 'center'
+        },
+        {
+          text: '支持设备类型',
           value: 'deviceType',
           align: 'center'
         },
         {
-          text: '设备类型名称',
-          value: 'deviceTypeName',
+          text: '经度',
+          value: 'lng',
           align: 'center'
         },
         {
-          text: '通信方式',
-          value: 'communication',
+          text: '纬度',
+          value: 'lat',
           align: 'center'
         }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
-      list: [], // 列表数据
+      listLoading: false,
       deviceModelList: [], // 设备类型列表
-      listLoading: true, // 加载动画
-      dialogShow: false // 是否显示对话框
+      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
-      })
-    },
-    // 查询数据
-    search() {
-      this.fetchData(false)
-    },
-    // 数据列表
+    // 获取数据列表
     fetchData() {
       this.listLoading = true
-      getDeviceModelList(this.listQuery).then(response => {
+      deptList(this.listQuery).then(response => {
         this.list = response.data
         this.listLoading = false
       })
     },
-    // table表格每行多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    // 检查选择情况
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
-    // 删除设备
-    del() {
-      if (this.checkSelection()) {
-        const deviceIds = []
-        const deviceIndex = []
-        this.multipleSelection.forEach(function(value, index) {
-          deviceIds.push(value.id)
-          deviceIndex.push(index)
-        })
-        this.$confirm(
-          '确定要删除所选设备吗？',
-          '确认操作',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delDept(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
           }
-        ).then(() => {
-          delDeviceModel(deviceIds).then(response => {
-            if (response.code === 200) {
-              this.$message.success('删除成功')
-              this.fetchData()
-            }
-          })
         })
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.dialogAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.dialogAlarmContent.initDialog('update', row)
     },
     // 详情
     detail(row) {
-      this.$refs.dialogDevice.initDialog('detail', row)
-    },
-    // 新增设备
-    add() {
-      this.$refs.dialogDevice.initDialog('create')
-    },
-    // 编辑设备信息
-    edit(row) {
-      this.$refs.dialogDevice.initDialog('update', row)
+      this.$refs.dialogAlarmContent.initDialog('detail', row)
     }
   }
 }
@@ -229,6 +170,9 @@
   .table{
     margin-bottom: 20px;
   }
+  .searchBottom{
+    border-bottom: 12px solid #ebebeb;
+  }
   .pagination-container{
     margin-bottom: 50px;
   }
diff --git a/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue b/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
new file mode 100644
index 0000000..ab7432e
--- /dev/null
+++ b/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
@@ -0,0 +1,338 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="通讯方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              :disabled="dialogStatus === 'detail' ? true : false"
+              placeholder="请选择支持通信方式"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="坐标系" prop="coordinateType">
+            <el-input
+              v-model="deviceForm.coordinateType"
+              placeholder="请输入数据默认坐标系"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="生成工单" prop="isJobGenerate">
+            <el-select
+              v-model="deviceForm.isJobGenerate"
+              clearable
+              placeholder="请选择是否生成工单"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in jobList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="APP推送" prop="isAppPush">
+            <el-select
+              v-model="deviceForm.isAppPush"
+              clearable
+              placeholder="请选择是否APP推送"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in appPushList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="短信推送" prop="isMessagePush">
+            <el-select
+              v-model="deviceForm.isMessagePush"
+              clearable
+              placeholder="请选择是否短信推送"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in messagePushList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-show="dialogStatus === 'detail' || dialogStatus === 'update' ? true : false" :span="12">
+          <el-form-item label="项目id" prop="devcode">
+            <el-input
+              v-model="deviceForm.devcode"
+              clearable
+              disabled
+              placeholder="未知"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDevice, updateAlarmContent, addAlarmContent } from '@/api/systemConfig/tenantConfig'
+export default {
+  name: 'DialogListTenant',
+  data() {
+    return {
+      // 通讯方式
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 是否生成工单
+      jobList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      // 是否开启App推送
+      appPushList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      // 是否开启短信推送
+      messagePushList: [
+        {
+          label: '否',
+          value: '0'
+        },
+        {
+          label: '是',
+          value: '1'
+        }
+      ],
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 告警类型列表
+      alarmTypeList: [
+        {
+          label: '告警类型一',
+          value: '0'
+        },
+        {
+          label: '告警类型二',
+          value: '1'
+        },
+        {
+          label: '告警类型三',
+          value: '2'
+        }
+      ],
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        isMessagePush: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        communication: [{ required: true, message: '支持通讯方式必选', trigger: ['blur', 'change'] }],
+        coordinateType: [{ required: true, message: '坐标系不能为空', trigger: ['blur', 'change'] }],
+        isJobGenerate: [{ required: true, message: '是否生成工单必选', trigger: ['blur', 'change'] }],
+        isAppPush: [{ required: true, message: '是否开启APP推送必选', trigger: ['blur', 'change'] }],
+        isMessagePush: [{ required: true, message: '是否开启短信推送必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        isMessagePush: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update') {
+        this.deviceForm = {
+          communication: row.communication.split(','),
+          coordinateType: row.coordinateType,
+          isJobGenerate: row.isJobGenerate,
+          isAppPush: row.isAppPush,
+          isMessagePush: row.isMessagePush,
+          devcode: row.tenentId
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          addAlarmContent(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild') // 刷新父组件数据列表
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/tenantConfig/listTenant.vue b/src/views/systemConfig/tenantConfig/listTenant.vue
index 87325dc..872942d 100644
--- a/src/views/systemConfig/tenantConfig/listTenant.vue
+++ b/src/views/systemConfig/tenantConfig/listTenant.vue
@@ -1,10 +1,213 @@
 <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-input
+          v-model="listQuery.tenantName"
+          placeholder="项目名称"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <normal-table
+      ref="normalTable"
+      :data="list"
+      :query="listQuery"
+      :columns="columns"
+      :list-loading="listLoading"
+      :options="options"
+      size="small"
+    >
+      <template slot="btns">
+        <el-button size="small" @click="add">
+          新增
+        </el-button>
+      </template>
+      <template slot="columns">
+        <el-table-column label="操作" width="120" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="edit(scope.row)">
+              修改
+            </el-button>
+            <el-button type="text" size="small" @click="del(scope.row)">
+              删除
+            </el-button>
+            <el-button type="text" size="small" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </template>
+    </normal-table>
+    <dialog-Alarm-content ref="dialogAlarmContent" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <script>
-export default {
+// 引用封装组件
+import dialogAlarmContent from '@/views/systemConfig/tenantConfig/components/dialogListTenant'
+// 接口调用
+import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
 
+export default {
+  name: 'ListTenant',
+  components: { dialogAlarmContent },
+  data() {
+    return {
+      // 查询条件
+      listQuery: {
+        tenantName: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      },
+      columns: [
+        {
+          text: '项目id',
+          value: 'tenentId',
+          align: 'center'
+        },
+        {
+          text: '项目名称',
+          value: 'tenantName',
+          align: 'center'
+        },
+        {
+          text: '支持通讯协议',
+          value: 'communication',
+          align: 'center'
+        },
+        {
+          text: '导入数据默认坐标系',
+          value: 'coordinateType',
+          align: 'center'
+        },
+        {
+          text: '是否需要生成工单',
+          value: 'isJobGenerate',
+          align: 'center'
+        },
+        {
+          text: '是否开启APP推送',
+          value: 'isAppPush',
+          align: 'center'
+        },
+        {
+          text: '是否开启短信推送',
+          value: 'isMessagePush',
+          align: 'center'
+        },
+        {
+          text: '报警推送规则',
+          value: 'alarmPushType',
+          align: 'center'
+        },
+        {
+          text: '报警推送规则名称',
+          value: 'alarmPushTypeName',
+          align: 'center'
+        }
+      ], // 显示列
+      listLoading: false,
+      deviceModelList: [], // 设备类型列表
+      list: [], // 表格数据列表
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    // 获取数据列表
+    fetchData() {
+      this.listLoading = true
+      alarmTenantList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    del(row) {
+      this.$confirm(
+        '确定要删除所选设备吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delAlarmTenant(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 新增
+    add() {
+      this.$refs.dialogAlarmContent.initDialog('create')
+    },
+    // 修改
+    edit(row) {
+      this.$refs.dialogAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.dialogAlarmContent.initDialog('detail', row)
+    }
+  }
 }
 </script>
 
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $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>