diff --git a/mock/index.js b/mock/index.js
index 08fb33b..5e940f3 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -17,6 +17,7 @@
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
 const alarmContent = require('./systemConfig/alarmContent')
+const tenantConfig = require('./systemConfig/tenantConfig')
 
 const mocks = [
   ...user,
@@ -34,7 +35,8 @@
   ...deviceModels,
   ...deviceImei,
   ...alarmLevel,
-  ...alarmContent
+  ...alarmContent,
+  ...tenantConfig
 ]
 
 // for front mock

diff --git a/mock/index.js b/mock/index.js
index 08fb33b..5e940f3 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -17,6 +17,7 @@
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
 const alarmContent = require('./systemConfig/alarmContent')
+const tenantConfig = require('./systemConfig/tenantConfig')
 
 const mocks = [
   ...user,
@@ -34,7 +35,8 @@
   ...deviceModels,
   ...deviceImei,
   ...alarmLevel,
-  ...alarmContent
+  ...alarmContent,
+  ...tenantConfig
 ]
 
 // for front mock
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 08fb33b..5e940f3 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -17,6 +17,7 @@
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
 const alarmContent = require('./systemConfig/alarmContent')
+const tenantConfig = require('./systemConfig/tenantConfig')
 
 const mocks = [
   ...user,
@@ -34,7 +35,8 @@
   ...deviceModels,
   ...deviceImei,
   ...alarmLevel,
-  ...alarmContent
+  ...alarmContent,
+  ...tenantConfig
 ]
 
 // for front mock
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/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 08fb33b..5e940f3 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -17,6 +17,7 @@
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
 const alarmContent = require('./systemConfig/alarmContent')
+const tenantConfig = require('./systemConfig/tenantConfig')
 
 const mocks = [
   ...user,
@@ -34,7 +35,8 @@
   ...deviceModels,
   ...deviceImei,
   ...alarmLevel,
-  ...alarmContent
+  ...alarmContent,
+  ...tenantConfig
 ]
 
 // for front mock
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/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/views/systemConfig/tenantConfig/components/dialogListTenant.vue b/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
new file mode 100644
index 0000000..086c68f
--- /dev/null
+++ b/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
@@ -0,0 +1,334 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :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="tenentId">
+            <el-input
+              v-model="deviceForm.tenentId"
+              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 = {
+        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 08fb33b..5e940f3 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -17,6 +17,7 @@
 const deviceImei = require('./deviceManage/deviceImei')
 const alarmLevel = require('./systemConfig/alarmLevel')
 const alarmContent = require('./systemConfig/alarmContent')
+const tenantConfig = require('./systemConfig/tenantConfig')
 
 const mocks = [
   ...user,
@@ -34,7 +35,8 @@
   ...deviceModels,
   ...deviceImei,
   ...alarmLevel,
-  ...alarmContent
+  ...alarmContent,
+  ...tenantConfig
 ]
 
 // for front mock
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/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/views/systemConfig/tenantConfig/components/dialogListTenant.vue b/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
new file mode 100644
index 0000000..086c68f
--- /dev/null
+++ b/src/views/systemConfig/tenantConfig/components/dialogListTenant.vue
@@ -0,0 +1,334 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :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="tenentId">
+            <el-input
+              v-model="deviceForm.tenentId"
+              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 = {
+        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/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>