diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index ab199e7..3470925 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -1,25 +1,3 @@
-const deptPermissionList = [
-  {
-    'id': '321232131',
-    'tenantCode': 'fsa123445',
-    'tenantName': '项目名称一',
-    'linkPerson': '张三',
-    'tel': '12345678889',
-    'clearDay': '162天',
-    'deptId': '213131312321',
-    'deptName': '关联组织名称一'
-  },
-  {
-    'id': '378932131',
-    'tenantCode': 'lwa123445',
-    'tenantName': '项目名称二',
-    'linkPerson': '王五',
-    'tel': '13335678889',
-    'clearDay': '123天',
-    'deptId': '256731312321',
-    'deptName': '关联组织名称二'
-  }
-]
 // 设备类型列表
 const deviceTypeList = [
   {
@@ -76,17 +54,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/bus/tenant/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deptPermissionList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]

diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index ab199e7..3470925 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -1,25 +1,3 @@
-const deptPermissionList = [
-  {
-    'id': '321232131',
-    'tenantCode': 'fsa123445',
-    'tenantName': '项目名称一',
-    'linkPerson': '张三',
-    'tel': '12345678889',
-    'clearDay': '162天',
-    'deptId': '213131312321',
-    'deptName': '关联组织名称一'
-  },
-  {
-    'id': '378932131',
-    'tenantCode': 'lwa123445',
-    'tenantName': '项目名称二',
-    'linkPerson': '王五',
-    'tel': '13335678889',
-    'clearDay': '123天',
-    'deptId': '256731312321',
-    'deptName': '关联组织名称二'
-  }
-]
 // 设备类型列表
 const deviceTypeList = [
   {
@@ -76,17 +54,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/bus/tenant/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deptPermissionList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/mock/system/user.js b/mock/system/user.js
index efab279..173e2ab 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -95,7 +95,7 @@
     { 'code': 'device_list', 'icon': '', 'id': '1138678001323175937', 'ismenu': '1', 'levels': 11, 'name': '设备列表', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '03', 'url': '/device/list' },
     { 'code': 'device_config', 'icon': '', 'id': '1138690889324654593', 'ismenu': '1', 'levels': 1, 'name': '设备配置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/config' },
     { 'code': 'nbdevice', 'icon': '', 'id': '1138694597554958338', 'ismenu': '1', 'levels': 1, 'name': '电信NB注册', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/nbdevice/list' },
-    { 'code': 'device_type', 'icon': '', 'id': '1138694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备类型管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/type' },
+    { 'code': 'device_type', 'icon': '', 'id': '1138694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备类型管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/deviceType/mange' },
     { 'code': 'device_model', 'icon': '', 'id': '1128694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备型号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/model' },
     { 'code': 'device_model', 'icon': '', 'id': '1128694597554958338', 'ismenu': '1', 'levels': 1, 'name': '设备SIM卡号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/imei' },
     { 'code': 'well_add', 'icon': '', 'id': '1138614981481963521', 'ismenu': '1', 'levels': 2, 'name': '新增窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/add' },

diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index ab199e7..3470925 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -1,25 +1,3 @@
-const deptPermissionList = [
-  {
-    'id': '321232131',
-    'tenantCode': 'fsa123445',
-    'tenantName': '项目名称一',
-    'linkPerson': '张三',
-    'tel': '12345678889',
-    'clearDay': '162天',
-    'deptId': '213131312321',
-    'deptName': '关联组织名称一'
-  },
-  {
-    'id': '378932131',
-    'tenantCode': 'lwa123445',
-    'tenantName': '项目名称二',
-    'linkPerson': '王五',
-    'tel': '13335678889',
-    'clearDay': '123天',
-    'deptId': '256731312321',
-    'deptName': '关联组织名称二'
-  }
-]
 // 设备类型列表
 const deviceTypeList = [
   {
@@ -76,17 +54,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/bus/tenant/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deptPermissionList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/mock/system/user.js b/mock/system/user.js
index efab279..173e2ab 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -95,7 +95,7 @@
     { 'code': 'device_list', 'icon': '', 'id': '1138678001323175937', 'ismenu': '1', 'levels': 11, 'name': '设备列表', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '03', 'url': '/device/list' },
     { 'code': 'device_config', 'icon': '', 'id': '1138690889324654593', 'ismenu': '1', 'levels': 1, 'name': '设备配置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/config' },
     { 'code': 'nbdevice', 'icon': '', 'id': '1138694597554958338', 'ismenu': '1', 'levels': 1, 'name': '电信NB注册', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/nbdevice/list' },
-    { 'code': 'device_type', 'icon': '', 'id': '1138694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备类型管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/type' },
+    { 'code': 'device_type', 'icon': '', 'id': '1138694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备类型管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/deviceType/mange' },
     { 'code': 'device_model', 'icon': '', 'id': '1128694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备型号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/model' },
     { 'code': 'device_model', 'icon': '', 'id': '1128694597554958338', 'ismenu': '1', 'levels': 1, 'name': '设备SIM卡号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/imei' },
     { 'code': 'well_add', 'icon': '', 'id': '1138614981481963521', 'ismenu': '1', 'levels': 2, 'name': '新增窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/add' },
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index b13eb86..7496fad 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -132,7 +132,7 @@
         path: '/deviceList',
         name: 'DeviceList',
         component: () => import('@/views/deviceManage/listDevice'),
-        meta: { title: '设备管理', icon: 'icon-config', permission: ['/device/list'] }
+        meta: { title: '设备列表', icon: 'icon-config', permission: ['/device/list'] }
       },
       {
         path: '/deviceConfig',
@@ -144,13 +144,13 @@
         path: '/nbDevice',
         name: 'NbDevice',
         component: () => import('@/views/nbDevice/listNbDevice'),
-        meta: { title: 'NB注册', icon: 'icon-config', permission: ['/nbdevice/list'] }
+        meta: { title: '电信NB注册', icon: 'icon-config', permission: ['/nbdevice/list'] }
       },
       {
         path: '/deviceType',
         name: 'DeviceType',
         component: () => import('@/views/deviceManage/deviceType/deviceType'),
-        meta: { title: '设备类型管理', icon: 'icon-config', permission: ['/device/type'] }
+        meta: { title: '设备类型管理', icon: 'icon-config', permission: ['/deviceType/mange'] }
       },
       {
         path: '/deviceModel',

diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index ab199e7..3470925 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -1,25 +1,3 @@
-const deptPermissionList = [
-  {
-    'id': '321232131',
-    'tenantCode': 'fsa123445',
-    'tenantName': '项目名称一',
-    'linkPerson': '张三',
-    'tel': '12345678889',
-    'clearDay': '162天',
-    'deptId': '213131312321',
-    'deptName': '关联组织名称一'
-  },
-  {
-    'id': '378932131',
-    'tenantCode': 'lwa123445',
-    'tenantName': '项目名称二',
-    'linkPerson': '王五',
-    'tel': '13335678889',
-    'clearDay': '123天',
-    'deptId': '256731312321',
-    'deptName': '关联组织名称二'
-  }
-]
 // 设备类型列表
 const deviceTypeList = [
   {
@@ -76,17 +54,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/bus/tenant/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deptPermissionList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/mock/system/user.js b/mock/system/user.js
index efab279..173e2ab 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -95,7 +95,7 @@
     { 'code': 'device_list', 'icon': '', 'id': '1138678001323175937', 'ismenu': '1', 'levels': 11, 'name': '设备列表', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '03', 'url': '/device/list' },
     { 'code': 'device_config', 'icon': '', 'id': '1138690889324654593', 'ismenu': '1', 'levels': 1, 'name': '设备配置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/config' },
     { 'code': 'nbdevice', 'icon': '', 'id': '1138694597554958338', 'ismenu': '1', 'levels': 1, 'name': '电信NB注册', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/nbdevice/list' },
-    { 'code': 'device_type', 'icon': '', 'id': '1138694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备类型管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/type' },
+    { 'code': 'device_type', 'icon': '', 'id': '1138694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备类型管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/deviceType/mange' },
     { 'code': 'device_model', 'icon': '', 'id': '1128694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备型号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/model' },
     { 'code': 'device_model', 'icon': '', 'id': '1128694597554958338', 'ismenu': '1', 'levels': 1, 'name': '设备SIM卡号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/imei' },
     { 'code': 'well_add', 'icon': '', 'id': '1138614981481963521', 'ismenu': '1', 'levels': 2, 'name': '新增窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/add' },
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index b13eb86..7496fad 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -132,7 +132,7 @@
         path: '/deviceList',
         name: 'DeviceList',
         component: () => import('@/views/deviceManage/listDevice'),
-        meta: { title: '设备管理', icon: 'icon-config', permission: ['/device/list'] }
+        meta: { title: '设备列表', icon: 'icon-config', permission: ['/device/list'] }
       },
       {
         path: '/deviceConfig',
@@ -144,13 +144,13 @@
         path: '/nbDevice',
         name: 'NbDevice',
         component: () => import('@/views/nbDevice/listNbDevice'),
-        meta: { title: 'NB注册', icon: 'icon-config', permission: ['/nbdevice/list'] }
+        meta: { title: '电信NB注册', icon: 'icon-config', permission: ['/nbdevice/list'] }
       },
       {
         path: '/deviceType',
         name: 'DeviceType',
         component: () => import('@/views/deviceManage/deviceType/deviceType'),
-        meta: { title: '设备类型管理', icon: 'icon-config', permission: ['/device/type'] }
+        meta: { title: '设备类型管理', icon: 'icon-config', permission: ['/deviceType/mange'] }
       },
       {
         path: '/deviceModel',
diff --git a/src/views/systemConfig/alarmConfig/components/editAlarmConfig.vue b/src/views/systemConfig/alarmConfig/components/editAlarmConfig.vue
new file mode 100644
index 0000000..a308888
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/editAlarmConfig.vue
@@ -0,0 +1,302 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :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="address">
+            <el-input
+              v-model="deviceForm.address"
+              placeholder="请输入平台地址"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="应用名称" prop="planName">
+            <el-input
+              v-model="deviceForm.planName"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              placeholder="请输入应用名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="APPID" prop="APPID">
+            <el-input
+              v-model="deviceForm.APPID"
+              placeholder="请输入APPID"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="APPKEY" prop="APPKEY">
+            <el-input
+              v-model="deviceForm.APPKEY"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              placeholder="请输入APPKEY"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { updateAlarmContent } from '@/api/systemConfig/tenantConfig'
+export default {
+  name: 'EditAlarmConfig',
+  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'
+        }
+      ],
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        planName: '',
+        address: '',
+        APPID: '',
+        APPKEY: ''
+      },
+      // 表单校验规则
+      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'] }],
+        address: [{ required: true, message: '平台地址不能为空', trigger: ['blur', 'change'] }],
+        planName: [{ required: true, message: '应用名称不能为空', trigger: ['blur', 'change'] }],
+        APPID: [{ required: true, message: 'APPID不能为空', trigger: ['blur', 'change'] }],
+        APPKEY: [{ required: true, message: 'APPKEY不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        planName: '',
+        address: '',
+        APPID: '',
+        APPKEY: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          communication: row.communication.split(','),
+          coordinateType: row.coordinateType,
+          isJobGenerate: row.isJobGenerate,
+          isAppPush: row.isAppPush,
+          planName: row.planName,
+          address: row.address,
+          APPID: row.address,
+          APPKEY: row.APPKEY
+        }
+      }
+    },
+    // 修改数据
+    saveData() {
+      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
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>

diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index ab199e7..3470925 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -1,25 +1,3 @@
-const deptPermissionList = [
-  {
-    'id': '321232131',
-    'tenantCode': 'fsa123445',
-    'tenantName': '项目名称一',
-    'linkPerson': '张三',
-    'tel': '12345678889',
-    'clearDay': '162天',
-    'deptId': '213131312321',
-    'deptName': '关联组织名称一'
-  },
-  {
-    'id': '378932131',
-    'tenantCode': 'lwa123445',
-    'tenantName': '项目名称二',
-    'linkPerson': '王五',
-    'tel': '13335678889',
-    'clearDay': '123天',
-    'deptId': '256731312321',
-    'deptName': '关联组织名称二'
-  }
-]
 // 设备类型列表
 const deviceTypeList = [
   {
@@ -76,17 +54,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/bus/tenant/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deptPermissionList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/mock/system/user.js b/mock/system/user.js
index efab279..173e2ab 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -95,7 +95,7 @@
     { 'code': 'device_list', 'icon': '', 'id': '1138678001323175937', 'ismenu': '1', 'levels': 11, 'name': '设备列表', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '03', 'url': '/device/list' },
     { 'code': 'device_config', 'icon': '', 'id': '1138690889324654593', 'ismenu': '1', 'levels': 1, 'name': '设备配置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/config' },
     { 'code': 'nbdevice', 'icon': '', 'id': '1138694597554958338', 'ismenu': '1', 'levels': 1, 'name': '电信NB注册', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/nbdevice/list' },
-    { 'code': 'device_type', 'icon': '', 'id': '1138694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备类型管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/type' },
+    { 'code': 'device_type', 'icon': '', 'id': '1138694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备类型管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/deviceType/mange' },
     { 'code': 'device_model', 'icon': '', 'id': '1128694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备型号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/model' },
     { 'code': 'device_model', 'icon': '', 'id': '1128694597554958338', 'ismenu': '1', 'levels': 1, 'name': '设备SIM卡号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/imei' },
     { 'code': 'well_add', 'icon': '', 'id': '1138614981481963521', 'ismenu': '1', 'levels': 2, 'name': '新增窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/add' },
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index b13eb86..7496fad 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -132,7 +132,7 @@
         path: '/deviceList',
         name: 'DeviceList',
         component: () => import('@/views/deviceManage/listDevice'),
-        meta: { title: '设备管理', icon: 'icon-config', permission: ['/device/list'] }
+        meta: { title: '设备列表', icon: 'icon-config', permission: ['/device/list'] }
       },
       {
         path: '/deviceConfig',
@@ -144,13 +144,13 @@
         path: '/nbDevice',
         name: 'NbDevice',
         component: () => import('@/views/nbDevice/listNbDevice'),
-        meta: { title: 'NB注册', icon: 'icon-config', permission: ['/nbdevice/list'] }
+        meta: { title: '电信NB注册', icon: 'icon-config', permission: ['/nbdevice/list'] }
       },
       {
         path: '/deviceType',
         name: 'DeviceType',
         component: () => import('@/views/deviceManage/deviceType/deviceType'),
-        meta: { title: '设备类型管理', icon: 'icon-config', permission: ['/device/type'] }
+        meta: { title: '设备类型管理', icon: 'icon-config', permission: ['/deviceType/mange'] }
       },
       {
         path: '/deviceModel',
diff --git a/src/views/systemConfig/alarmConfig/components/editAlarmConfig.vue b/src/views/systemConfig/alarmConfig/components/editAlarmConfig.vue
new file mode 100644
index 0000000..a308888
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/editAlarmConfig.vue
@@ -0,0 +1,302 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :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="address">
+            <el-input
+              v-model="deviceForm.address"
+              placeholder="请输入平台地址"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="应用名称" prop="planName">
+            <el-input
+              v-model="deviceForm.planName"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              placeholder="请输入应用名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="APPID" prop="APPID">
+            <el-input
+              v-model="deviceForm.APPID"
+              placeholder="请输入APPID"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="APPKEY" prop="APPKEY">
+            <el-input
+              v-model="deviceForm.APPKEY"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              placeholder="请输入APPKEY"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { updateAlarmContent } from '@/api/systemConfig/tenantConfig'
+export default {
+  name: 'EditAlarmConfig',
+  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'
+        }
+      ],
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        planName: '',
+        address: '',
+        APPID: '',
+        APPKEY: ''
+      },
+      // 表单校验规则
+      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'] }],
+        address: [{ required: true, message: '平台地址不能为空', trigger: ['blur', 'change'] }],
+        planName: [{ required: true, message: '应用名称不能为空', trigger: ['blur', 'change'] }],
+        APPID: [{ required: true, message: 'APPID不能为空', trigger: ['blur', 'change'] }],
+        APPKEY: [{ required: true, message: 'APPKEY不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        planName: '',
+        address: '',
+        APPID: '',
+        APPKEY: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          communication: row.communication.split(','),
+          coordinateType: row.coordinateType,
+          isJobGenerate: row.isJobGenerate,
+          isAppPush: row.isAppPush,
+          planName: row.planName,
+          address: row.address,
+          APPID: row.address,
+          APPKEY: row.APPKEY
+        }
+      }
+    },
+    // 修改数据
+    saveData() {
+      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
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index bddbb6d..bdf53a5 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -1,28 +1,151 @@
 <template>
-  <div
-    class="conatiner"
-    :style="{height:(bodyHeight-70)+'px'}"
-  />
+  <app-container>
+    <el-row>
+      <!--左半部分-->
+      <el-col :span="5">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always">
+            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+              <el-tree
+                ref="tree2"
+                v-loading="treeLoading"
+                :data="deptTree"
+                :props="defaultProps"
+                :default-expand-all="expandAllNode"
+                :expand-on-click-node="expandNodeClick"
+                @node-click="handleNodeClick"
+              >
+                <span
+                  slot-scope="{ data }"
+                  class="custom-tree-node"
+                >
+                  <span>
+                    <i :class="data.icon" />{{ data.name }}
+                  </span>
+                </span>
+              </el-tree>
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </el-col>
+      <!--右半部分-->
+      <el-col :span="19">
+        <div class="headerTeam">
+          <span>{{ headerValue }}</span>
+        </div>
+        <el-table :data="list">
+          <el-table-column label="通讯协议" align="center" />
+          <el-table-column label="默认坐标系" align="center" />
+          <el-table-column label="生成工单" align="center" />
+          <el-table-column label="APP推送" align="center" />
+          <el-table-column label="NB平台配置" align="center">
+            <el-table-column label="平台地址" align="center" />
+            <el-table-column label="应用名称" align="center" />
+            <el-table-column label="APPID" align="center" />
+            <el-table-column label="APPKEY" align="center" />
+          </el-table-column>
+          <el-table-column label="操作" align="center">
+            <template slot-scope="scope">
+              <el-button type="text" @click="edit(scope.row)">
+                编辑
+              </el-button>
+              <el-button type="text" @click="detail(scope.row)">
+                详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+    <edit-alarm-config ref="editAlarmConfig" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import editAlarmConfig from '@/views/systemConfig/alarmConfig/components/editAlarmConfig'
 export default {
   name: 'ListAlarmConfig',
+  components: { editAlarmConfig },
   data() {
-    return {}
+    return {
+      treeLoading: false,
+      deptTree: null,
+      headerValue: null,
+      list: [],
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      expandAllNode: true,
+      expandNodeClick: false,
+      listQuery: {
+        keywords: '',
+        beginTime: '',
+        endTime: '',
+        deptId: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id'
+      }
+    }
   },
-  computed: {
-    ...mapGetters([
-      'bodyHeight'
-    ])
+  mounted() {
+    this.fetchDeptTree()
+    this.fetchData()
+  },
+  methods: {
+    // 获取组织结构树
+    fetchDeptTree() {
+      this.deptTree = [
+        {
+          name: '123',
+          id: '1111111',
+          value: 'aaaaa',
+          icon: 'el-icon-edit'
+        }
+      ]
+    },
+    // 点击左侧组织结构项触发
+    handleNodeClick(val) {
+      console.log(val)
+      this.headerValue = val.name
+      this.listQuery.deptId = val.id
+    },
+    // 获取用户数据
+    fetchData() {
+      this.list = [{}]
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.conatiner{
-  width: 100%;
-  background: #ebebeb;
-}
+  .dept-div{
+    padding-right: 12px;
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: calc(100vh - 260px);
+      }
+    }
+  }
+  .headerTeam{
+    font-size: 20px;
+  }
+</style>
+<style>
+  .dept-div .el-scrollbar__wrap{
+    overflow-x: auto;
+    background-color: #fff;
+    padding: 0px;
+  }
 </style>

diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index ab199e7..3470925 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -1,25 +1,3 @@
-const deptPermissionList = [
-  {
-    'id': '321232131',
-    'tenantCode': 'fsa123445',
-    'tenantName': '项目名称一',
-    'linkPerson': '张三',
-    'tel': '12345678889',
-    'clearDay': '162天',
-    'deptId': '213131312321',
-    'deptName': '关联组织名称一'
-  },
-  {
-    'id': '378932131',
-    'tenantCode': 'lwa123445',
-    'tenantName': '项目名称二',
-    'linkPerson': '王五',
-    'tel': '13335678889',
-    'clearDay': '123天',
-    'deptId': '256731312321',
-    'deptName': '关联组织名称二'
-  }
-]
 // 设备类型列表
 const deviceTypeList = [
   {
@@ -76,17 +54,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/bus/tenant/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deptPermissionList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/mock/system/user.js b/mock/system/user.js
index efab279..173e2ab 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -95,7 +95,7 @@
     { 'code': 'device_list', 'icon': '', 'id': '1138678001323175937', 'ismenu': '1', 'levels': 11, 'name': '设备列表', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '03', 'url': '/device/list' },
     { 'code': 'device_config', 'icon': '', 'id': '1138690889324654593', 'ismenu': '1', 'levels': 1, 'name': '设备配置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/config' },
     { 'code': 'nbdevice', 'icon': '', 'id': '1138694597554958338', 'ismenu': '1', 'levels': 1, 'name': '电信NB注册', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/nbdevice/list' },
-    { 'code': 'device_type', 'icon': '', 'id': '1138694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备类型管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/type' },
+    { 'code': 'device_type', 'icon': '', 'id': '1138694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备类型管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/deviceType/mange' },
     { 'code': 'device_model', 'icon': '', 'id': '1128694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备型号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/model' },
     { 'code': 'device_model', 'icon': '', 'id': '1128694597554958338', 'ismenu': '1', 'levels': 1, 'name': '设备SIM卡号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/imei' },
     { 'code': 'well_add', 'icon': '', 'id': '1138614981481963521', 'ismenu': '1', 'levels': 2, 'name': '新增窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/add' },
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index b13eb86..7496fad 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -132,7 +132,7 @@
         path: '/deviceList',
         name: 'DeviceList',
         component: () => import('@/views/deviceManage/listDevice'),
-        meta: { title: '设备管理', icon: 'icon-config', permission: ['/device/list'] }
+        meta: { title: '设备列表', icon: 'icon-config', permission: ['/device/list'] }
       },
       {
         path: '/deviceConfig',
@@ -144,13 +144,13 @@
         path: '/nbDevice',
         name: 'NbDevice',
         component: () => import('@/views/nbDevice/listNbDevice'),
-        meta: { title: 'NB注册', icon: 'icon-config', permission: ['/nbdevice/list'] }
+        meta: { title: '电信NB注册', icon: 'icon-config', permission: ['/nbdevice/list'] }
       },
       {
         path: '/deviceType',
         name: 'DeviceType',
         component: () => import('@/views/deviceManage/deviceType/deviceType'),
-        meta: { title: '设备类型管理', icon: 'icon-config', permission: ['/device/type'] }
+        meta: { title: '设备类型管理', icon: 'icon-config', permission: ['/deviceType/mange'] }
       },
       {
         path: '/deviceModel',
diff --git a/src/views/systemConfig/alarmConfig/components/editAlarmConfig.vue b/src/views/systemConfig/alarmConfig/components/editAlarmConfig.vue
new file mode 100644
index 0000000..a308888
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/editAlarmConfig.vue
@@ -0,0 +1,302 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :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="address">
+            <el-input
+              v-model="deviceForm.address"
+              placeholder="请输入平台地址"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="应用名称" prop="planName">
+            <el-input
+              v-model="deviceForm.planName"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              placeholder="请输入应用名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="APPID" prop="APPID">
+            <el-input
+              v-model="deviceForm.APPID"
+              placeholder="请输入APPID"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="APPKEY" prop="APPKEY">
+            <el-input
+              v-model="deviceForm.APPKEY"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              placeholder="请输入APPKEY"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { updateAlarmContent } from '@/api/systemConfig/tenantConfig'
+export default {
+  name: 'EditAlarmConfig',
+  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'
+        }
+      ],
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        planName: '',
+        address: '',
+        APPID: '',
+        APPKEY: ''
+      },
+      // 表单校验规则
+      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'] }],
+        address: [{ required: true, message: '平台地址不能为空', trigger: ['blur', 'change'] }],
+        planName: [{ required: true, message: '应用名称不能为空', trigger: ['blur', 'change'] }],
+        APPID: [{ required: true, message: 'APPID不能为空', trigger: ['blur', 'change'] }],
+        APPKEY: [{ required: true, message: 'APPKEY不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        planName: '',
+        address: '',
+        APPID: '',
+        APPKEY: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          communication: row.communication.split(','),
+          coordinateType: row.coordinateType,
+          isJobGenerate: row.isJobGenerate,
+          isAppPush: row.isAppPush,
+          planName: row.planName,
+          address: row.address,
+          APPID: row.address,
+          APPKEY: row.APPKEY
+        }
+      }
+    },
+    // 修改数据
+    saveData() {
+      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
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index bddbb6d..bdf53a5 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -1,28 +1,151 @@
 <template>
-  <div
-    class="conatiner"
-    :style="{height:(bodyHeight-70)+'px'}"
-  />
+  <app-container>
+    <el-row>
+      <!--左半部分-->
+      <el-col :span="5">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always">
+            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+              <el-tree
+                ref="tree2"
+                v-loading="treeLoading"
+                :data="deptTree"
+                :props="defaultProps"
+                :default-expand-all="expandAllNode"
+                :expand-on-click-node="expandNodeClick"
+                @node-click="handleNodeClick"
+              >
+                <span
+                  slot-scope="{ data }"
+                  class="custom-tree-node"
+                >
+                  <span>
+                    <i :class="data.icon" />{{ data.name }}
+                  </span>
+                </span>
+              </el-tree>
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </el-col>
+      <!--右半部分-->
+      <el-col :span="19">
+        <div class="headerTeam">
+          <span>{{ headerValue }}</span>
+        </div>
+        <el-table :data="list">
+          <el-table-column label="通讯协议" align="center" />
+          <el-table-column label="默认坐标系" align="center" />
+          <el-table-column label="生成工单" align="center" />
+          <el-table-column label="APP推送" align="center" />
+          <el-table-column label="NB平台配置" align="center">
+            <el-table-column label="平台地址" align="center" />
+            <el-table-column label="应用名称" align="center" />
+            <el-table-column label="APPID" align="center" />
+            <el-table-column label="APPKEY" align="center" />
+          </el-table-column>
+          <el-table-column label="操作" align="center">
+            <template slot-scope="scope">
+              <el-button type="text" @click="edit(scope.row)">
+                编辑
+              </el-button>
+              <el-button type="text" @click="detail(scope.row)">
+                详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+    <edit-alarm-config ref="editAlarmConfig" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import editAlarmConfig from '@/views/systemConfig/alarmConfig/components/editAlarmConfig'
 export default {
   name: 'ListAlarmConfig',
+  components: { editAlarmConfig },
   data() {
-    return {}
+    return {
+      treeLoading: false,
+      deptTree: null,
+      headerValue: null,
+      list: [],
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      expandAllNode: true,
+      expandNodeClick: false,
+      listQuery: {
+        keywords: '',
+        beginTime: '',
+        endTime: '',
+        deptId: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id'
+      }
+    }
   },
-  computed: {
-    ...mapGetters([
-      'bodyHeight'
-    ])
+  mounted() {
+    this.fetchDeptTree()
+    this.fetchData()
+  },
+  methods: {
+    // 获取组织结构树
+    fetchDeptTree() {
+      this.deptTree = [
+        {
+          name: '123',
+          id: '1111111',
+          value: 'aaaaa',
+          icon: 'el-icon-edit'
+        }
+      ]
+    },
+    // 点击左侧组织结构项触发
+    handleNodeClick(val) {
+      console.log(val)
+      this.headerValue = val.name
+      this.listQuery.deptId = val.id
+    },
+    // 获取用户数据
+    fetchData() {
+      this.list = [{}]
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.conatiner{
-  width: 100%;
-  background: #ebebeb;
-}
+  .dept-div{
+    padding-right: 12px;
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: calc(100vh - 260px);
+      }
+    }
+  }
+  .headerTeam{
+    font-size: 20px;
+  }
+</style>
+<style>
+  .dept-div .el-scrollbar__wrap{
+    overflow-x: auto;
+    background-color: #fff;
+    padding: 0px;
+  }
 </style>
diff --git a/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
index d1be724..3f32389 100644
--- a/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
+++ b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
@@ -31,7 +31,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="坐标系" prop="coordinateType">
+          <el-form-item label="默认坐标系" prop="coordinateType">
             <el-input
               v-model="deviceForm.coordinateType"
               placeholder="请输入数据默认坐标系"
@@ -79,29 +79,44 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="短信推送" prop="isMessagePush">
-            <el-select
-              v-model="deviceForm.isMessagePush"
+          <el-form-item label="平台地址" prop="address">
+            <el-input
+              v-model="deviceForm.address"
+              placeholder="请输入平台地址"
               clearable
-              placeholder="请选择是否短信推送"
               :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in messagePushList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
+            />
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="项目id" prop="devcode">
+        <el-col :span="12">
+          <el-form-item label="应用名称" prop="planName">
             <el-input
-              v-model="deviceForm.devcode"
+              v-model="deviceForm.planName"
               clearable
-              disabled
-              placeholder="未知"
+              :disabled="dialogStatus === 'detail' ? true : false"
+              placeholder="请输入应用名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="APPID" prop="APPID">
+            <el-input
+              v-model="deviceForm.APPID"
+              placeholder="请输入APPID"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="APPKEY" prop="APPKEY">
+            <el-input
+              v-model="deviceForm.APPKEY"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              placeholder="请输入APPKEY"
             />
           </el-form-item>
         </el-col>
@@ -123,7 +138,7 @@
 </template>
 
 <script>
-import { updateAlarmContent, addAlarmContent } from '@/api/systemConfig/tenantConfig'
+import { updateAlarmContent } from '@/api/systemConfig/tenantConfig'
 export default {
   name: 'EditTenantConfig',
   data() {
@@ -173,34 +188,8 @@
           value: '1'
         }
       ],
-      // 是否开启短信推送
-      messagePushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
       dialogFormVisible: false, // 对话框显示隐藏
       dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
       // 对话框标题
       textMap: {
         update: '编辑',
@@ -224,8 +213,10 @@
         coordinateType: '',
         isJobGenerate: '',
         isAppPush: '',
-        isMessagePush: '',
-        devcode: ''
+        planName: '',
+        address: '',
+        APPID: '',
+        APPKEY: ''
       },
       // 表单校验规则
       rules: {
@@ -233,7 +224,10 @@
         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'] }]
+        address: [{ required: true, message: '平台地址不能为空', trigger: ['blur', 'change'] }],
+        planName: [{ required: true, message: '应用名称不能为空', trigger: ['blur', 'change'] }],
+        APPID: [{ required: true, message: 'APPID不能为空', trigger: ['blur', 'change'] }],
+        APPKEY: [{ required: true, message: 'APPKEY不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
@@ -245,8 +239,10 @@
         coordinateType: '',
         isJobGenerate: '',
         isAppPush: '',
-        isMessagePush: '',
-        devcode: ''
+        planName: '',
+        address: '',
+        APPID: '',
+        APPKEY: ''
       }
     },
     // 父子组件通信
@@ -264,21 +260,15 @@
           coordinateType: row.coordinateType,
           isJobGenerate: row.isJobGenerate,
           isAppPush: row.isAppPush,
-          isMessagePush: row.isMessagePush,
-          devcode: row.tenentId
+          planName: row.planName,
+          address: row.address,
+          APPID: row.address,
+          APPKEY: row.APPKEY
         }
       }
     },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
     // 修改数据
-    updateData() {
+    saveData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           this.deviceForm.communication = this.deviceForm.communication.toString()
@@ -291,31 +281,6 @@
           })
         }
       })
-    },
-    // 新增数据
-    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
-              })
-            }
-          })
-        }
-      })
     }
   }
 }

diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index ab199e7..3470925 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -1,25 +1,3 @@
-const deptPermissionList = [
-  {
-    'id': '321232131',
-    'tenantCode': 'fsa123445',
-    'tenantName': '项目名称一',
-    'linkPerson': '张三',
-    'tel': '12345678889',
-    'clearDay': '162天',
-    'deptId': '213131312321',
-    'deptName': '关联组织名称一'
-  },
-  {
-    'id': '378932131',
-    'tenantCode': 'lwa123445',
-    'tenantName': '项目名称二',
-    'linkPerson': '王五',
-    'tel': '13335678889',
-    'clearDay': '123天',
-    'deptId': '256731312321',
-    'deptName': '关联组织名称二'
-  }
-]
 // 设备类型列表
 const deviceTypeList = [
   {
@@ -76,17 +54,5 @@
         success: true
       }
     }
-  },
-  {
-    url: '/bus/tenant/list',
-    type: 'get',
-    response: _ => {
-      return {
-        code: 200,
-        data: deptPermissionList,
-        message: '请求成功',
-        success: true
-      }
-    }
   }
 ]
diff --git a/mock/system/user.js b/mock/system/user.js
index efab279..173e2ab 100644
--- a/mock/system/user.js
+++ b/mock/system/user.js
@@ -95,7 +95,7 @@
     { 'code': 'device_list', 'icon': '', 'id': '1138678001323175937', 'ismenu': '1', 'levels': 11, 'name': '设备列表', 'num': 0, 'parentId': '1138378119630761985', 'resourceType': '03', 'url': '/device/list' },
     { 'code': 'device_config', 'icon': '', 'id': '1138690889324654593', 'ismenu': '1', 'levels': 1, 'name': '设备配置', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/config' },
     { 'code': 'nbdevice', 'icon': '', 'id': '1138694597554958338', 'ismenu': '1', 'levels': 1, 'name': '电信NB注册', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/nbdevice/list' },
-    { 'code': 'device_type', 'icon': '', 'id': '1138694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备类型管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/type' },
+    { 'code': 'device_type', 'icon': '', 'id': '1138694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备类型管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/deviceType/mange' },
     { 'code': 'device_model', 'icon': '', 'id': '1128694597554958339', 'ismenu': '1', 'levels': 1, 'name': '设备型号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/model' },
     { 'code': 'device_model', 'icon': '', 'id': '1128694597554958338', 'ismenu': '1', 'levels': 1, 'name': '设备SIM卡号管理', 'num': 0, 'parentId': '0', 'resourceType': '03', 'url': '/device/imei' },
     { 'code': 'well_add', 'icon': '', 'id': '1138614981481963521', 'ismenu': '1', 'levels': 2, 'name': '新增窨井', 'num': 0, 'parentId': '1138377674778685442', 'resourceType': '03', 'url': '/well/add' },
diff --git a/src/router/modules/well.js b/src/router/modules/well.js
index b13eb86..7496fad 100644
--- a/src/router/modules/well.js
+++ b/src/router/modules/well.js
@@ -132,7 +132,7 @@
         path: '/deviceList',
         name: 'DeviceList',
         component: () => import('@/views/deviceManage/listDevice'),
-        meta: { title: '设备管理', icon: 'icon-config', permission: ['/device/list'] }
+        meta: { title: '设备列表', icon: 'icon-config', permission: ['/device/list'] }
       },
       {
         path: '/deviceConfig',
@@ -144,13 +144,13 @@
         path: '/nbDevice',
         name: 'NbDevice',
         component: () => import('@/views/nbDevice/listNbDevice'),
-        meta: { title: 'NB注册', icon: 'icon-config', permission: ['/nbdevice/list'] }
+        meta: { title: '电信NB注册', icon: 'icon-config', permission: ['/nbdevice/list'] }
       },
       {
         path: '/deviceType',
         name: 'DeviceType',
         component: () => import('@/views/deviceManage/deviceType/deviceType'),
-        meta: { title: '设备类型管理', icon: 'icon-config', permission: ['/device/type'] }
+        meta: { title: '设备类型管理', icon: 'icon-config', permission: ['/deviceType/mange'] }
       },
       {
         path: '/deviceModel',
diff --git a/src/views/systemConfig/alarmConfig/components/editAlarmConfig.vue b/src/views/systemConfig/alarmConfig/components/editAlarmConfig.vue
new file mode 100644
index 0000000..a308888
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/editAlarmConfig.vue
@@ -0,0 +1,302 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :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="address">
+            <el-input
+              v-model="deviceForm.address"
+              placeholder="请输入平台地址"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="应用名称" prop="planName">
+            <el-input
+              v-model="deviceForm.planName"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              placeholder="请输入应用名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="APPID" prop="APPID">
+            <el-input
+              v-model="deviceForm.APPID"
+              placeholder="请输入APPID"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="APPKEY" prop="APPKEY">
+            <el-input
+              v-model="deviceForm.APPKEY"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              placeholder="请输入APPKEY"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { updateAlarmContent } from '@/api/systemConfig/tenantConfig'
+export default {
+  name: 'EditAlarmConfig',
+  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'
+        }
+      ],
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        planName: '',
+        address: '',
+        APPID: '',
+        APPKEY: ''
+      },
+      // 表单校验规则
+      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'] }],
+        address: [{ required: true, message: '平台地址不能为空', trigger: ['blur', 'change'] }],
+        planName: [{ required: true, message: '应用名称不能为空', trigger: ['blur', 'change'] }],
+        APPID: [{ required: true, message: 'APPID不能为空', trigger: ['blur', 'change'] }],
+        APPKEY: [{ required: true, message: 'APPKEY不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        communication: [],
+        coordinateType: '',
+        isJobGenerate: '',
+        isAppPush: '',
+        planName: '',
+        address: '',
+        APPID: '',
+        APPKEY: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        this.deviceForm = {
+          communication: row.communication.split(','),
+          coordinateType: row.coordinateType,
+          isJobGenerate: row.isJobGenerate,
+          isAppPush: row.isAppPush,
+          planName: row.planName,
+          address: row.address,
+          APPID: row.address,
+          APPKEY: row.APPKEY
+        }
+      }
+    },
+    // 修改数据
+    saveData() {
+      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
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+  }
+  ::-webkit-scrollbar {
+    height: 4px;
+  }
+  /* //滚动条的滑块 */
+  ::-webkit-scrollbar-thumb {
+    background-color: #eaecf1;
+    border-radius: 3px;
+  }
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index bddbb6d..bdf53a5 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -1,28 +1,151 @@
 <template>
-  <div
-    class="conatiner"
-    :style="{height:(bodyHeight-70)+'px'}"
-  />
+  <app-container>
+    <el-row>
+      <!--左半部分-->
+      <el-col :span="5">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always">
+            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+              <el-tree
+                ref="tree2"
+                v-loading="treeLoading"
+                :data="deptTree"
+                :props="defaultProps"
+                :default-expand-all="expandAllNode"
+                :expand-on-click-node="expandNodeClick"
+                @node-click="handleNodeClick"
+              >
+                <span
+                  slot-scope="{ data }"
+                  class="custom-tree-node"
+                >
+                  <span>
+                    <i :class="data.icon" />{{ data.name }}
+                  </span>
+                </span>
+              </el-tree>
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </el-col>
+      <!--右半部分-->
+      <el-col :span="19">
+        <div class="headerTeam">
+          <span>{{ headerValue }}</span>
+        </div>
+        <el-table :data="list">
+          <el-table-column label="通讯协议" align="center" />
+          <el-table-column label="默认坐标系" align="center" />
+          <el-table-column label="生成工单" align="center" />
+          <el-table-column label="APP推送" align="center" />
+          <el-table-column label="NB平台配置" align="center">
+            <el-table-column label="平台地址" align="center" />
+            <el-table-column label="应用名称" align="center" />
+            <el-table-column label="APPID" align="center" />
+            <el-table-column label="APPKEY" align="center" />
+          </el-table-column>
+          <el-table-column label="操作" align="center">
+            <template slot-scope="scope">
+              <el-button type="text" @click="edit(scope.row)">
+                编辑
+              </el-button>
+              <el-button type="text" @click="detail(scope.row)">
+                详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+    <edit-alarm-config ref="editAlarmConfig" @watchChild="fetchData" />
+  </app-container>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import editAlarmConfig from '@/views/systemConfig/alarmConfig/components/editAlarmConfig'
 export default {
   name: 'ListAlarmConfig',
+  components: { editAlarmConfig },
   data() {
-    return {}
+    return {
+      treeLoading: false,
+      deptTree: null,
+      headerValue: null,
+      list: [],
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      expandAllNode: true,
+      expandNodeClick: false,
+      listQuery: {
+        keywords: '',
+        beginTime: '',
+        endTime: '',
+        deptId: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id'
+      }
+    }
   },
-  computed: {
-    ...mapGetters([
-      'bodyHeight'
-    ])
+  mounted() {
+    this.fetchDeptTree()
+    this.fetchData()
+  },
+  methods: {
+    // 获取组织结构树
+    fetchDeptTree() {
+      this.deptTree = [
+        {
+          name: '123',
+          id: '1111111',
+          value: 'aaaaa',
+          icon: 'el-icon-edit'
+        }
+      ]
+    },
+    // 点击左侧组织结构项触发
+    handleNodeClick(val) {
+      console.log(val)
+      this.headerValue = val.name
+      this.listQuery.deptId = val.id
+    },
+    // 获取用户数据
+    fetchData() {
+      this.list = [{}]
+    },
+    // 修改
+    edit(row) {
+      this.$refs.editAlarmContent.initDialog('update', row)
+    },
+    // 详情
+    detail(row) {
+      this.$refs.editAlarmContent.initDialog('detail', row)
+    }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.conatiner{
-  width: 100%;
-  background: #ebebeb;
-}
+  .dept-div{
+    padding-right: 12px;
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: calc(100vh - 260px);
+      }
+    }
+  }
+  .headerTeam{
+    font-size: 20px;
+  }
+</style>
+<style>
+  .dept-div .el-scrollbar__wrap{
+    overflow-x: auto;
+    background-color: #fff;
+    padding: 0px;
+  }
 </style>
diff --git a/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
index d1be724..3f32389 100644
--- a/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
+++ b/src/views/systemConfig/tenantConfig/components/editTenantConfig.vue
@@ -31,7 +31,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="坐标系" prop="coordinateType">
+          <el-form-item label="默认坐标系" prop="coordinateType">
             <el-input
               v-model="deviceForm.coordinateType"
               placeholder="请输入数据默认坐标系"
@@ -79,29 +79,44 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="短信推送" prop="isMessagePush">
-            <el-select
-              v-model="deviceForm.isMessagePush"
+          <el-form-item label="平台地址" prop="address">
+            <el-input
+              v-model="deviceForm.address"
+              placeholder="请输入平台地址"
               clearable
-              placeholder="请选择是否短信推送"
               :disabled="dialogStatus === 'detail' ? true : false"
-            >
-              <el-option
-                v-for="item in messagePushList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
+            />
           </el-form-item>
         </el-col>
-        <el-col v-show="dialogStatus === 'detail' ? true : false" :span="12">
-          <el-form-item label="项目id" prop="devcode">
+        <el-col :span="12">
+          <el-form-item label="应用名称" prop="planName">
             <el-input
-              v-model="deviceForm.devcode"
+              v-model="deviceForm.planName"
               clearable
-              disabled
-              placeholder="未知"
+              :disabled="dialogStatus === 'detail' ? true : false"
+              placeholder="请输入应用名称"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="APPID" prop="APPID">
+            <el-input
+              v-model="deviceForm.APPID"
+              placeholder="请输入APPID"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="APPKEY" prop="APPKEY">
+            <el-input
+              v-model="deviceForm.APPKEY"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              placeholder="请输入APPKEY"
             />
           </el-form-item>
         </el-col>
@@ -123,7 +138,7 @@
 </template>
 
 <script>
-import { updateAlarmContent, addAlarmContent } from '@/api/systemConfig/tenantConfig'
+import { updateAlarmContent } from '@/api/systemConfig/tenantConfig'
 export default {
   name: 'EditTenantConfig',
   data() {
@@ -173,34 +188,8 @@
           value: '1'
         }
       ],
-      // 是否开启短信推送
-      messagePushList: [
-        {
-          label: '否',
-          value: '0'
-        },
-        {
-          label: '是',
-          value: '1'
-        }
-      ],
       dialogFormVisible: false, // 对话框显示隐藏
       dialogStatus: '', // 对话框类型：create,update,detail
-      // 告警类型列表
-      alarmTypeList: [
-        {
-          label: '告警类型一',
-          value: '0'
-        },
-        {
-          label: '告警类型二',
-          value: '1'
-        },
-        {
-          label: '告警类型三',
-          value: '2'
-        }
-      ],
       // 对话框标题
       textMap: {
         update: '编辑',
@@ -224,8 +213,10 @@
         coordinateType: '',
         isJobGenerate: '',
         isAppPush: '',
-        isMessagePush: '',
-        devcode: ''
+        planName: '',
+        address: '',
+        APPID: '',
+        APPKEY: ''
       },
       // 表单校验规则
       rules: {
@@ -233,7 +224,10 @@
         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'] }]
+        address: [{ required: true, message: '平台地址不能为空', trigger: ['blur', 'change'] }],
+        planName: [{ required: true, message: '应用名称不能为空', trigger: ['blur', 'change'] }],
+        APPID: [{ required: true, message: 'APPID不能为空', trigger: ['blur', 'change'] }],
+        APPKEY: [{ required: true, message: 'APPKEY不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
@@ -245,8 +239,10 @@
         coordinateType: '',
         isJobGenerate: '',
         isAppPush: '',
-        isMessagePush: '',
-        devcode: ''
+        planName: '',
+        address: '',
+        APPID: '',
+        APPKEY: ''
       }
     },
     // 父子组件通信
@@ -264,21 +260,15 @@
           coordinateType: row.coordinateType,
           isJobGenerate: row.isJobGenerate,
           isAppPush: row.isAppPush,
-          isMessagePush: row.isMessagePush,
-          devcode: row.tenentId
+          planName: row.planName,
+          address: row.address,
+          APPID: row.address,
+          APPKEY: row.APPKEY
         }
       }
     },
-    // 保存数据
-    saveData() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
     // 修改数据
-    updateData() {
+    saveData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           this.deviceForm.communication = this.deviceForm.communication.toString()
@@ -291,31 +281,6 @@
           })
         }
       })
-    },
-    // 新增数据
-    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
-              })
-            }
-          })
-        }
-      })
     }
   }
 }
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
index 58b9aac..b17f043 100644
--- a/src/views/systemConfig/tenantConfig/tenantConfig.vue
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -1,180 +1,144 @@
 <template>
   <app-container>
-    <search-area
-      class="searchBottom"
-      :need-clear="false"
-      :need-search-more="false"
-      type="seperate"
-      size="small"
-      search-more-type="default"
-      @search="fetchData"
-    >
-      <!--一般查询条件-->
-      <search-item>
-        <el-input
-          v-model="listQuery.tenantName"
-          placeholder="项目名称"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <normal-table
-      ref="normalTable"
-      :data="list"
-      :query="listQuery"
-      :columns="columns"
-      :list-loading="listLoading"
-      :options="options"
-      size="small"
-    >
-      <template slot="btns">
-        <el-button size="small" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template slot="columns">
-        <el-table-column label="操作" width="120" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-            <el-button type="text" size="small" @click="detail(scope.row)">
-              详情
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
-    <edit-alarm-content ref="editAlarmContent" @watchChild="fetchData" />
+    <el-row>
+      <!--左半部分-->
+      <el-col :span="5">
+        <div class="dept-div">
+          <el-card class="box-card" shadow="always">
+            <div slot="header">
+              <span>项目名称</span>
+            </div>
+            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
+              <el-tree
+                ref="tree2"
+                v-loading="treeLoading"
+                :data="deptTree"
+                :props="defaultProps"
+                :default-expand-all="expandAllNode"
+                :expand-on-click-node="expandNodeClick"
+                @node-click="handleNodeClick"
+              />
+            </el-scrollbar>
+          </el-card>
+        </div>
+      </el-col>
+      <!--右半部分-->
+      <el-col :span="19">
+        <div class="headerTeam">
+          <span>{{ headerValue }}</span>
+        </div>
+        <el-table :data="list">
+          <el-table-column label="通讯协议" align="center" />
+          <el-table-column label="默认坐标系" align="center" />
+          <el-table-column label="生成工单" align="center" />
+          <el-table-column label="APP推送" align="center" />
+          <el-table-column label="NB平台配置" align="center">
+            <el-table-column label="平台地址" align="center" />
+            <el-table-column label="应用名称" align="center" />
+            <el-table-column label="APPID" align="center" />
+            <el-table-column label="APPKEY" align="center" />
+          </el-table-column>
+          <el-table-column label="操作" align="center">
+            <template slot-scope="scope">
+              <el-button type="text" @click="edit(scope.row)">
+                编辑
+              </el-button>
+              <el-button type="text" @click="detail(scope.row)">
+                详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+    <edit-tenant-config ref="editTenantConfig" @watchChild="fetchData" />
   </app-container>
 </template>
 
 <script>
-import editAlarmContent from '@/views/systemConfig/tenantConfig/components/editTenantConfig'
-import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
-
+import { getDeptTreeList } from '@/api/system/dept'
+import { toTreeList } from '@/utils/structure'
+import editTenantConfig from '@/views/systemConfig/tenantConfig/components/editTenantConfig'
+// import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
 export default {
   name: 'TenantConfig',
-  components: { editAlarmContent },
+  components: { editTenantConfig },
   data() {
     return {
-      // 查询条件
-      listQuery: {
-        tenantName: '',
-        offset: 1,
-        sort: 'id',
-        order: 'asc'
+      treeLoading: false,
+      deptTree: null,
+      headerValue: null,
+      list: [],
+      defaultProps: {
+        children: 'children',
+        label: 'name'
       },
-      columns: [
-        {
-          text: '编号',
-          value: 'tenentId',
-          align: 'center'
-        },
-        {
-          text: '项目名称',
-          value: 'tenantName',
-          align: 'center'
-        },
-        {
-          text: '支持通讯协议',
-          value: 'communication',
-          align: 'center'
-        },
-        {
-          text: '导入数据默认坐标系',
-          value: 'coordinateType',
-          align: 'center'
-        },
-        {
-          text: '是否需要生成工单',
-          value: 'isJobGenerate',
-          align: 'center'
-        },
-        {
-          text: '是否开启APP推送',
-          value: 'isAppPush',
-          align: 'center'
-        },
-        {
-          text: '是否开启短信推送',
-          value: 'isMessagePush',
-          align: 'center'
-        },
-        {
-          text: '报警推送规则',
-          value: 'alarmPushType',
-          align: 'center'
-        }
-      ], // 显示列
-      listLoading: false,
-      deviceModelList: [], // 设备类型列表
-      list: [], // 表格数据列表
-      // 是否需要序号列
-      options: {
-        needIndex: false
+      expandAllNode: true,
+      expandNodeClick: false,
+      listQuery: {
+        keywords: '',
+        beginTime: '',
+        endTime: '',
+        deptId: '',
+        offset: 1,
+        limit: 20,
+        sort: 'id'
       }
     }
   },
-  created() {
+  mounted() {
+    this.fetchDeptTree()
     this.fetchData()
   },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
   methods: {
-    // 获取数据列表
+    // 获取组织结构树
+    fetchDeptTree() {
+      this.treeLoading = true
+      getDeptTreeList(this.listQuery).then(response => {
+        this.deptTree = toTreeList(response.data, '0', true)
+        this.treeLoading = false
+      })
+    },
+    // 点击左侧组织结构项触发
+    handleNodeClick(val) {
+      console.log(val)
+      this.headerValue = val.name
+      this.listQuery.deptId = val.id
+    },
+    // 获取用户数据
     fetchData() {
-      this.listLoading = true
-      alarmTenantList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    },
-    del(row) {
-      this.$confirm(
-        '确定要删除所选设备吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delAlarmTenant(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 新增
-    add() {
-      this.$refs.editAlarmContent.initDialog('create')
     },
     // 修改
     edit(row) {
-      this.$refs.editAlarmContent.initDialog('update', row)
+      this.$refs.editTenantConfig.initDialog('update', row)
     },
     // 详情
     detail(row) {
-      this.$refs.editAlarmContent.initDialog('detail', row)
+      this.$refs.editTenantConfig.initDialog('detail', row)
     }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .searchBottom{
-    border-bottom: 12px solid #ebebeb;
+  .dept-div{
+    padding-right: 12px;
+    .box-card{
+      width:100%;
+      .user-dept-scroll{
+        width:100%;
+        height: calc(100vh - 260px);
+      }
+    }
+  }
+  .headerTeam{
+    font-size: 20px;
+  }
+</style>
+<style>
+  .dept-div .el-scrollbar__wrap{
+    overflow-x: auto;
+    background-color: #fff;
+    padding: 0px;
   }
 </style>