diff --git a/src/api/group.js b/src/api/group.js
new file mode 100644
index 0000000..e0fa884
--- /dev/null
+++ b/src/api/group.js
@@ -0,0 +1,119 @@
+/**
+ * 组管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 组列表
+export function getGroupList(params) {
+  return request({
+    url: '/group/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取组内井
+export function getGroupWells(params) {
+  return request({
+    url: 'group/welllist',
+    method: 'get',
+    params
+  })
+}
+
+// 获取组内人
+export function getGroupUsers(params) {
+  return request({
+    url: 'group/userlist',
+    method: 'get',
+    params
+  })
+}
+
+// 获取未分组的井列表
+export function getNoGroupWells(params) {
+  return request({
+    url: '/group/noGroupWelllist',
+    method: 'get',
+    params
+  })
+}
+
+// 新增组
+export function addGroup(params) {
+  return request({
+    url: 'group/add',
+    method: 'post',
+    params
+  })
+}
+// 编辑组
+export function editGroup(params) {
+  return request({
+    url: 'group/edit',
+    method: 'post',
+    params
+  })
+}
+
+// 给组新增绑定井
+export function addWellsToGroup(params) {
+  return request({
+    url: 'group/addWells',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 给组新增绑定人
+export function addUsersToGroup(params) {
+  return request({
+    url: 'group/addUsers',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 从组里删除井
+export function delWellFromGroup(params) {
+  return request({
+    url: 'group/delWell',
+    method: 'post',
+    params
+  })
+}
+
+// 从组里删除人
+export function delUserFromGroup(params) {
+  return request({
+    url: 'group/delUser',
+    method: 'post',
+    params
+  })
+}
+
+// 删除组
+export function delGroup(params) {
+  return request({
+    url: 'group/delete',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportGroup(params) {
+  return request({
+    url: 'group/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}

diff --git a/src/api/group.js b/src/api/group.js
new file mode 100644
index 0000000..e0fa884
--- /dev/null
+++ b/src/api/group.js
@@ -0,0 +1,119 @@
+/**
+ * 组管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 组列表
+export function getGroupList(params) {
+  return request({
+    url: '/group/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取组内井
+export function getGroupWells(params) {
+  return request({
+    url: 'group/welllist',
+    method: 'get',
+    params
+  })
+}
+
+// 获取组内人
+export function getGroupUsers(params) {
+  return request({
+    url: 'group/userlist',
+    method: 'get',
+    params
+  })
+}
+
+// 获取未分组的井列表
+export function getNoGroupWells(params) {
+  return request({
+    url: '/group/noGroupWelllist',
+    method: 'get',
+    params
+  })
+}
+
+// 新增组
+export function addGroup(params) {
+  return request({
+    url: 'group/add',
+    method: 'post',
+    params
+  })
+}
+// 编辑组
+export function editGroup(params) {
+  return request({
+    url: 'group/edit',
+    method: 'post',
+    params
+  })
+}
+
+// 给组新增绑定井
+export function addWellsToGroup(params) {
+  return request({
+    url: 'group/addWells',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 给组新增绑定人
+export function addUsersToGroup(params) {
+  return request({
+    url: 'group/addUsers',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 从组里删除井
+export function delWellFromGroup(params) {
+  return request({
+    url: 'group/delWell',
+    method: 'post',
+    params
+  })
+}
+
+// 从组里删除人
+export function delUserFromGroup(params) {
+  return request({
+    url: 'group/delUser',
+    method: 'post',
+    params
+  })
+}
+
+// 删除组
+export function delGroup(params) {
+  return request({
+    url: 'group/delete',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportGroup(params) {
+  return request({
+    url: 'group/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 5703eaf..c9fb937 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -126,6 +126,29 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/listRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule'] }
+      },
+      {
+        path: '/group',
+        name: 'Group',
+        redirect: '/group/listGroup',
+        component: () => import('@/views/alarmGroup/index'),
+        meta: { title: '告警配置', icon: 'icon-config', permission: ['/group'] },
+        children: [
+          {
+            path: 'listGroup',
+            name: 'ListGroup',
+            hidden: true,
+            component: () => import('@/views/alarmGroup/listGroup'),
+            meta: { title: '分组列表', icon: '', activeMenu: '/group' }
+          },
+          {
+            path: 'editGroup',
+            name: 'EditGroup',
+            hidden: true,
+            component: () => import('@/views/alarmGroup/editGroup'),
+            meta: { title: '编辑组', icon: 'icon-config', permission: ['/group/edit'], activeMenu: '/group' }
+          }
+        ]
       }
     ]
   },

diff --git a/src/api/group.js b/src/api/group.js
new file mode 100644
index 0000000..e0fa884
--- /dev/null
+++ b/src/api/group.js
@@ -0,0 +1,119 @@
+/**
+ * 组管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 组列表
+export function getGroupList(params) {
+  return request({
+    url: '/group/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取组内井
+export function getGroupWells(params) {
+  return request({
+    url: 'group/welllist',
+    method: 'get',
+    params
+  })
+}
+
+// 获取组内人
+export function getGroupUsers(params) {
+  return request({
+    url: 'group/userlist',
+    method: 'get',
+    params
+  })
+}
+
+// 获取未分组的井列表
+export function getNoGroupWells(params) {
+  return request({
+    url: '/group/noGroupWelllist',
+    method: 'get',
+    params
+  })
+}
+
+// 新增组
+export function addGroup(params) {
+  return request({
+    url: 'group/add',
+    method: 'post',
+    params
+  })
+}
+// 编辑组
+export function editGroup(params) {
+  return request({
+    url: 'group/edit',
+    method: 'post',
+    params
+  })
+}
+
+// 给组新增绑定井
+export function addWellsToGroup(params) {
+  return request({
+    url: 'group/addWells',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 给组新增绑定人
+export function addUsersToGroup(params) {
+  return request({
+    url: 'group/addUsers',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 从组里删除井
+export function delWellFromGroup(params) {
+  return request({
+    url: 'group/delWell',
+    method: 'post',
+    params
+  })
+}
+
+// 从组里删除人
+export function delUserFromGroup(params) {
+  return request({
+    url: 'group/delUser',
+    method: 'post',
+    params
+  })
+}
+
+// 删除组
+export function delGroup(params) {
+  return request({
+    url: 'group/delete',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportGroup(params) {
+  return request({
+    url: 'group/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 5703eaf..c9fb937 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -126,6 +126,29 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/listRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule'] }
+      },
+      {
+        path: '/group',
+        name: 'Group',
+        redirect: '/group/listGroup',
+        component: () => import('@/views/alarmGroup/index'),
+        meta: { title: '告警配置', icon: 'icon-config', permission: ['/group'] },
+        children: [
+          {
+            path: 'listGroup',
+            name: 'ListGroup',
+            hidden: true,
+            component: () => import('@/views/alarmGroup/listGroup'),
+            meta: { title: '分组列表', icon: '', activeMenu: '/group' }
+          },
+          {
+            path: 'editGroup',
+            name: 'EditGroup',
+            hidden: true,
+            component: () => import('@/views/alarmGroup/editGroup'),
+            meta: { title: '编辑组', icon: 'icon-config', permission: ['/group/edit'], activeMenu: '/group' }
+          }
+        ]
       }
     ]
   },
diff --git a/src/views/alarmGroup/addGroup.vue b/src/views/alarmGroup/addGroup.vue
new file mode 100644
index 0000000..5f4350d
--- /dev/null
+++ b/src/views/alarmGroup/addGroup.vue
@@ -0,0 +1,94 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增组" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="groupForm" label-well-code="right" label-width="100px">
+      <el-row type="flex" justify="center">
+        <el-col :span="16">
+          <el-form-item label="组名称" prop="groupName">
+            <el-input v-model.trim="groupForm.groupName" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isAdmin" type="flex" justify="center">
+        <el-col :span="16">
+          <el-form-item label="所属派出所" prop="deptid">
+            <dept-select v-model="groupForm.deptid" :need-top="false" dept-type="03" placeholder="选择所属派出所"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import DeptSelect from '@/components/DeptSelect'
+import { addGroup } from '@/api/group'
+export default {
+  name: 'AddGroup',
+  components: {
+    DeptSelect
+  },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      groupForm: {
+        groupName: '', // 组名称
+        deptid: '' // 组织机构
+      },
+      rules: {
+        groupName: [{ required: true, message: '组名称必填', trigger: ['blur', 'change'] }],
+        deptid: [{ required: true, message: '所属派出所必选', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      btnLoading: false, // 按钮加载动画
+      deptShow: false // 组织机构是否显示
+    }
+  },
+  methods: {
+    initDialog: function(row = null) {
+      this.btnLoading = false
+      this.dialogFormVisible = true
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.groupForm = {
+        groupName: '', // 组名称
+        deptid: '' // 组织机构
+      }
+    },
+    // 点击保存
+    saveData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.btnLoading = true
+          // 调用后台请求
+          addGroup(this.groupForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('添加成功！')
+              this.cancel()
+            }
+            this.btnLoading = false
+          }).catch(() => {
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    // 取消
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

diff --git a/src/api/group.js b/src/api/group.js
new file mode 100644
index 0000000..e0fa884
--- /dev/null
+++ b/src/api/group.js
@@ -0,0 +1,119 @@
+/**
+ * 组管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 组列表
+export function getGroupList(params) {
+  return request({
+    url: '/group/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取组内井
+export function getGroupWells(params) {
+  return request({
+    url: 'group/welllist',
+    method: 'get',
+    params
+  })
+}
+
+// 获取组内人
+export function getGroupUsers(params) {
+  return request({
+    url: 'group/userlist',
+    method: 'get',
+    params
+  })
+}
+
+// 获取未分组的井列表
+export function getNoGroupWells(params) {
+  return request({
+    url: '/group/noGroupWelllist',
+    method: 'get',
+    params
+  })
+}
+
+// 新增组
+export function addGroup(params) {
+  return request({
+    url: 'group/add',
+    method: 'post',
+    params
+  })
+}
+// 编辑组
+export function editGroup(params) {
+  return request({
+    url: 'group/edit',
+    method: 'post',
+    params
+  })
+}
+
+// 给组新增绑定井
+export function addWellsToGroup(params) {
+  return request({
+    url: 'group/addWells',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 给组新增绑定人
+export function addUsersToGroup(params) {
+  return request({
+    url: 'group/addUsers',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 从组里删除井
+export function delWellFromGroup(params) {
+  return request({
+    url: 'group/delWell',
+    method: 'post',
+    params
+  })
+}
+
+// 从组里删除人
+export function delUserFromGroup(params) {
+  return request({
+    url: 'group/delUser',
+    method: 'post',
+    params
+  })
+}
+
+// 删除组
+export function delGroup(params) {
+  return request({
+    url: 'group/delete',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportGroup(params) {
+  return request({
+    url: 'group/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 5703eaf..c9fb937 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -126,6 +126,29 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/listRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule'] }
+      },
+      {
+        path: '/group',
+        name: 'Group',
+        redirect: '/group/listGroup',
+        component: () => import('@/views/alarmGroup/index'),
+        meta: { title: '告警配置', icon: 'icon-config', permission: ['/group'] },
+        children: [
+          {
+            path: 'listGroup',
+            name: 'ListGroup',
+            hidden: true,
+            component: () => import('@/views/alarmGroup/listGroup'),
+            meta: { title: '分组列表', icon: '', activeMenu: '/group' }
+          },
+          {
+            path: 'editGroup',
+            name: 'EditGroup',
+            hidden: true,
+            component: () => import('@/views/alarmGroup/editGroup'),
+            meta: { title: '编辑组', icon: 'icon-config', permission: ['/group/edit'], activeMenu: '/group' }
+          }
+        ]
       }
     ]
   },
diff --git a/src/views/alarmGroup/addGroup.vue b/src/views/alarmGroup/addGroup.vue
new file mode 100644
index 0000000..5f4350d
--- /dev/null
+++ b/src/views/alarmGroup/addGroup.vue
@@ -0,0 +1,94 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增组" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="groupForm" label-well-code="right" label-width="100px">
+      <el-row type="flex" justify="center">
+        <el-col :span="16">
+          <el-form-item label="组名称" prop="groupName">
+            <el-input v-model.trim="groupForm.groupName" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isAdmin" type="flex" justify="center">
+        <el-col :span="16">
+          <el-form-item label="所属派出所" prop="deptid">
+            <dept-select v-model="groupForm.deptid" :need-top="false" dept-type="03" placeholder="选择所属派出所"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import DeptSelect from '@/components/DeptSelect'
+import { addGroup } from '@/api/group'
+export default {
+  name: 'AddGroup',
+  components: {
+    DeptSelect
+  },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      groupForm: {
+        groupName: '', // 组名称
+        deptid: '' // 组织机构
+      },
+      rules: {
+        groupName: [{ required: true, message: '组名称必填', trigger: ['blur', 'change'] }],
+        deptid: [{ required: true, message: '所属派出所必选', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      btnLoading: false, // 按钮加载动画
+      deptShow: false // 组织机构是否显示
+    }
+  },
+  methods: {
+    initDialog: function(row = null) {
+      this.btnLoading = false
+      this.dialogFormVisible = true
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.groupForm = {
+        groupName: '', // 组名称
+        deptid: '' // 组织机构
+      }
+    },
+    // 点击保存
+    saveData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.btnLoading = true
+          // 调用后台请求
+          addGroup(this.groupForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('添加成功！')
+              this.cancel()
+            }
+            this.btnLoading = false
+          }).catch(() => {
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    // 取消
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/alarmGroup/components/addUser.vue b/src/views/alarmGroup/components/addUser.vue
new file mode 100644
index 0000000..ff34176
--- /dev/null
+++ b/src/views/alarmGroup/components/addUser.vue
@@ -0,0 +1,206 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="添加告警通知接收人" width="700px" append-to-body>
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.keywords" placeholder="姓名/手机号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="false" dept-type="03" placeholder="选择部门"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="fetchData">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 查询结果 -->
+    <div class="tablediv">
+      <!--<el-row class="table-title">-->
+      <!--<el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>搜索结果({{ list.length }})</div></el-col>-->
+      <!--</el-row>-->
+      <el-table v-loading="loading" :data="list" size="small" max-height="300" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column :index="indexMethod" label="#" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        :current-page="listQuery.offset"
+        :total="total"
+        :page-sizes="[5,10]"
+        :page-size="listQuery.limit"
+        align="center"
+        layout="total, prev, pager, next"
+        background
+        small
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getUserList } from '@/api/user'
+import { addUsersToGroup } from '@/api/group'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'AddUser',
+  components: { DeptSelect },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      multipleSelection: [],
+      groupId: '',
+      listQuery: {
+        keywords: '',
+        beginTime: '',
+        endTime: '',
+        deptid: '',
+        offset: 1,
+        limit: 5,
+        sort: 'id'
+      },
+      form: { // 表单
+        deptid: '',
+        user: ''
+      },
+      columns: [
+        {
+          text: '真实姓名',
+          value: 'name'
+        },
+        {
+          text: '手机号',
+          value: 'phone'
+        },
+        {
+          text: '部门',
+          value: 'deptName'
+        }
+      ],
+      list: [], // 用户列表数据
+      total: 0,
+      loading: false, // 加载动态效果
+      btnLoading: false
+    }
+  },
+  computed: {
+    titleText: function() {
+      return this.roleName + ''
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(groupId) {
+      this.loading = true
+      this.groupId = groupId
+      this.dialogFormVisible = true
+      this.btnLoading = false
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      getUserList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.loading = false
+      })
+    },
+    saveData() {
+      // 获取选择的用户列表
+      if (this.checkSelection()) {
+        const list = []
+        this.multipleSelection.forEach(function(value, index) {
+          list.push(value.id)
+        })
+        const params = {
+          id: this.groupId,
+          userIds: list
+        }
+        this.btnLoading = true
+        addUsersToGroup(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('添加成功')
+            this.cancel()
+          }
+          this.btnLoading = false
+        }).catch(() => {
+          this.btnLoading = false
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 检查多选情况，未选择返回false，已有选择返回true
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 取消
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    min-width:350px !important;
+  }
+  .scrollbar{
+    max-height: 400px;
+  }
+  .el-tree{
+  }
+  .el-select{
+    width: 100%;
+    overflow-x: hidden;
+    .el-scrollbar__wrap{
+      overflow-x: hidden;
+    }
+  }
+  .list{
+    max-height:300px;
+  }
+  .pagination-container{
+    margin-top: 10px;
+  }
+  .dialog-footer {
+    margin-top: -40px;
+    text-align: right;
+  }
+</style>

diff --git a/src/api/group.js b/src/api/group.js
new file mode 100644
index 0000000..e0fa884
--- /dev/null
+++ b/src/api/group.js
@@ -0,0 +1,119 @@
+/**
+ * 组管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 组列表
+export function getGroupList(params) {
+  return request({
+    url: '/group/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取组内井
+export function getGroupWells(params) {
+  return request({
+    url: 'group/welllist',
+    method: 'get',
+    params
+  })
+}
+
+// 获取组内人
+export function getGroupUsers(params) {
+  return request({
+    url: 'group/userlist',
+    method: 'get',
+    params
+  })
+}
+
+// 获取未分组的井列表
+export function getNoGroupWells(params) {
+  return request({
+    url: '/group/noGroupWelllist',
+    method: 'get',
+    params
+  })
+}
+
+// 新增组
+export function addGroup(params) {
+  return request({
+    url: 'group/add',
+    method: 'post',
+    params
+  })
+}
+// 编辑组
+export function editGroup(params) {
+  return request({
+    url: 'group/edit',
+    method: 'post',
+    params
+  })
+}
+
+// 给组新增绑定井
+export function addWellsToGroup(params) {
+  return request({
+    url: 'group/addWells',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 给组新增绑定人
+export function addUsersToGroup(params) {
+  return request({
+    url: 'group/addUsers',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 从组里删除井
+export function delWellFromGroup(params) {
+  return request({
+    url: 'group/delWell',
+    method: 'post',
+    params
+  })
+}
+
+// 从组里删除人
+export function delUserFromGroup(params) {
+  return request({
+    url: 'group/delUser',
+    method: 'post',
+    params
+  })
+}
+
+// 删除组
+export function delGroup(params) {
+  return request({
+    url: 'group/delete',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportGroup(params) {
+  return request({
+    url: 'group/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 5703eaf..c9fb937 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -126,6 +126,29 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/listRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule'] }
+      },
+      {
+        path: '/group',
+        name: 'Group',
+        redirect: '/group/listGroup',
+        component: () => import('@/views/alarmGroup/index'),
+        meta: { title: '告警配置', icon: 'icon-config', permission: ['/group'] },
+        children: [
+          {
+            path: 'listGroup',
+            name: 'ListGroup',
+            hidden: true,
+            component: () => import('@/views/alarmGroup/listGroup'),
+            meta: { title: '分组列表', icon: '', activeMenu: '/group' }
+          },
+          {
+            path: 'editGroup',
+            name: 'EditGroup',
+            hidden: true,
+            component: () => import('@/views/alarmGroup/editGroup'),
+            meta: { title: '编辑组', icon: 'icon-config', permission: ['/group/edit'], activeMenu: '/group' }
+          }
+        ]
       }
     ]
   },
diff --git a/src/views/alarmGroup/addGroup.vue b/src/views/alarmGroup/addGroup.vue
new file mode 100644
index 0000000..5f4350d
--- /dev/null
+++ b/src/views/alarmGroup/addGroup.vue
@@ -0,0 +1,94 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增组" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="groupForm" label-well-code="right" label-width="100px">
+      <el-row type="flex" justify="center">
+        <el-col :span="16">
+          <el-form-item label="组名称" prop="groupName">
+            <el-input v-model.trim="groupForm.groupName" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isAdmin" type="flex" justify="center">
+        <el-col :span="16">
+          <el-form-item label="所属派出所" prop="deptid">
+            <dept-select v-model="groupForm.deptid" :need-top="false" dept-type="03" placeholder="选择所属派出所"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import DeptSelect from '@/components/DeptSelect'
+import { addGroup } from '@/api/group'
+export default {
+  name: 'AddGroup',
+  components: {
+    DeptSelect
+  },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      groupForm: {
+        groupName: '', // 组名称
+        deptid: '' // 组织机构
+      },
+      rules: {
+        groupName: [{ required: true, message: '组名称必填', trigger: ['blur', 'change'] }],
+        deptid: [{ required: true, message: '所属派出所必选', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      btnLoading: false, // 按钮加载动画
+      deptShow: false // 组织机构是否显示
+    }
+  },
+  methods: {
+    initDialog: function(row = null) {
+      this.btnLoading = false
+      this.dialogFormVisible = true
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.groupForm = {
+        groupName: '', // 组名称
+        deptid: '' // 组织机构
+      }
+    },
+    // 点击保存
+    saveData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.btnLoading = true
+          // 调用后台请求
+          addGroup(this.groupForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('添加成功！')
+              this.cancel()
+            }
+            this.btnLoading = false
+          }).catch(() => {
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    // 取消
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/alarmGroup/components/addUser.vue b/src/views/alarmGroup/components/addUser.vue
new file mode 100644
index 0000000..ff34176
--- /dev/null
+++ b/src/views/alarmGroup/components/addUser.vue
@@ -0,0 +1,206 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="添加告警通知接收人" width="700px" append-to-body>
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.keywords" placeholder="姓名/手机号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="false" dept-type="03" placeholder="选择部门"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="fetchData">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 查询结果 -->
+    <div class="tablediv">
+      <!--<el-row class="table-title">-->
+      <!--<el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>搜索结果({{ list.length }})</div></el-col>-->
+      <!--</el-row>-->
+      <el-table v-loading="loading" :data="list" size="small" max-height="300" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column :index="indexMethod" label="#" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        :current-page="listQuery.offset"
+        :total="total"
+        :page-sizes="[5,10]"
+        :page-size="listQuery.limit"
+        align="center"
+        layout="total, prev, pager, next"
+        background
+        small
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getUserList } from '@/api/user'
+import { addUsersToGroup } from '@/api/group'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'AddUser',
+  components: { DeptSelect },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      multipleSelection: [],
+      groupId: '',
+      listQuery: {
+        keywords: '',
+        beginTime: '',
+        endTime: '',
+        deptid: '',
+        offset: 1,
+        limit: 5,
+        sort: 'id'
+      },
+      form: { // 表单
+        deptid: '',
+        user: ''
+      },
+      columns: [
+        {
+          text: '真实姓名',
+          value: 'name'
+        },
+        {
+          text: '手机号',
+          value: 'phone'
+        },
+        {
+          text: '部门',
+          value: 'deptName'
+        }
+      ],
+      list: [], // 用户列表数据
+      total: 0,
+      loading: false, // 加载动态效果
+      btnLoading: false
+    }
+  },
+  computed: {
+    titleText: function() {
+      return this.roleName + ''
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(groupId) {
+      this.loading = true
+      this.groupId = groupId
+      this.dialogFormVisible = true
+      this.btnLoading = false
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      getUserList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.loading = false
+      })
+    },
+    saveData() {
+      // 获取选择的用户列表
+      if (this.checkSelection()) {
+        const list = []
+        this.multipleSelection.forEach(function(value, index) {
+          list.push(value.id)
+        })
+        const params = {
+          id: this.groupId,
+          userIds: list
+        }
+        this.btnLoading = true
+        addUsersToGroup(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('添加成功')
+            this.cancel()
+          }
+          this.btnLoading = false
+        }).catch(() => {
+          this.btnLoading = false
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 检查多选情况，未选择返回false，已有选择返回true
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 取消
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    min-width:350px !important;
+  }
+  .scrollbar{
+    max-height: 400px;
+  }
+  .el-tree{
+  }
+  .el-select{
+    width: 100%;
+    overflow-x: hidden;
+    .el-scrollbar__wrap{
+      overflow-x: hidden;
+    }
+  }
+  .list{
+    max-height:300px;
+  }
+  .pagination-container{
+    margin-top: 10px;
+  }
+  .dialog-footer {
+    margin-top: -40px;
+    text-align: right;
+  }
+</style>
diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue
new file mode 100644
index 0000000..dd02bfc
--- /dev/null
+++ b/src/views/alarmGroup/components/addWell.vue
@@ -0,0 +1,231 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="添加闸井" width="700px" append-to-body>
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.keywords" placeholder="闸井地址/编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.wellType" placeholder="选择闸井类型" clearable>
+              <el-option
+                v-for="item in wellTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"/>
+            </el-select>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="fetchData">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 查询结果 -->
+    <div class="tablediv">
+      <el-table v-loading="loading" :data="list" size="small" max-height="300" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column :index="indexMethod" label="#" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        :current-page="listQuery.offset"
+        :total="total"
+        :page-sizes="[5,10]"
+        :page-size="listQuery.limit"
+        align="center"
+        layout="total, prev, pager, next"
+        background
+        small
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getNoGroupWells } from '@/api/group'
+import { addWellsToGroup } from '@/api/group'
+import DeptSelect from '@/components/DeptSelect'
+import { getWellType } from '@/api/well'
+
+export default {
+  name: 'AddWell',
+  components: { DeptSelect },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      multipleSelection: [],
+      groupId: '',
+      listQuery: {
+        keywords: '',
+        wellType: '',
+        beginTime: '',
+        endTime: '',
+        deptid: '',
+        offset: 1,
+        limit: 5,
+        sort: 'id'
+      },
+      form: { // 表单
+        deptid: '',
+        user: ''
+      },
+      wellTypeList: [],
+      columns: [
+        {
+          text: '闸井编号',
+          value: 'wellCode'
+        },
+        {
+          text: '详细地址',
+          value: 'position'
+        },
+        {
+          text: '闸井类型',
+          value: 'wellTypeName'
+        },
+        {
+          text: '权属单位',
+          value: 'deptName'
+        }
+      ],
+      list: [], // 井列表数据
+      total: 0,
+      loading: false, // 加载动态效果
+      btnLoading: false
+    }
+  },
+  computed: {
+    titleText: function() {
+      return this.roleName + ''
+    }
+  },
+  created() {
+    this.fetchWellType()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(groupId) {
+      this.loading = true
+      this.groupId = groupId
+      this.dialogFormVisible = true
+      this.btnLoading = false
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      getNoGroupWells(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.loading = false
+      })
+    },
+    saveData() {
+      // 获取选择的井列表
+      if (this.checkSelection()) {
+        const list = []
+        this.multipleSelection.forEach(function(value, index) {
+          list.push(value.id)
+        })
+        const params = {
+          id: this.groupId,
+          wellIds: list
+        }
+        this.btnLoading = true
+        addWellsToGroup(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('添加成功')
+            this.cancel()
+          }
+          this.btnLoading = false
+        }).catch(() => {
+          this.btnLoading = false
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 获取闸井类型
+    fetchWellType() {
+      getWellType().then(response => {
+        this.wellTypeList = []
+        const wellTypes = this.$store.getters.wellTypes
+        for (const wellType of response.data) {
+          if (wellTypes.indexOf(wellType.value) !== -1) {
+            this.wellTypeList.push(wellType)
+          }
+        }
+      })
+    },
+    // 检查多选情况，未选择返回false，已有选择返回true
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 取消
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    min-width:350px !important;
+  }
+  .scrollbar{
+    max-height: 400px;
+  }
+  .el-tree{
+  }
+  .el-select{
+    width: 100%;
+    overflow-x: hidden;
+    .el-scrollbar__wrap{
+      overflow-x: hidden;
+    }
+  }
+  .list{
+    max-height:300px;
+  }
+  .pagination-container{
+    margin-top: 10px;
+  }
+  .dialog-footer {
+    margin-top: -40px;
+    text-align: right;
+  }
+</style>

diff --git a/src/api/group.js b/src/api/group.js
new file mode 100644
index 0000000..e0fa884
--- /dev/null
+++ b/src/api/group.js
@@ -0,0 +1,119 @@
+/**
+ * 组管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 组列表
+export function getGroupList(params) {
+  return request({
+    url: '/group/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取组内井
+export function getGroupWells(params) {
+  return request({
+    url: 'group/welllist',
+    method: 'get',
+    params
+  })
+}
+
+// 获取组内人
+export function getGroupUsers(params) {
+  return request({
+    url: 'group/userlist',
+    method: 'get',
+    params
+  })
+}
+
+// 获取未分组的井列表
+export function getNoGroupWells(params) {
+  return request({
+    url: '/group/noGroupWelllist',
+    method: 'get',
+    params
+  })
+}
+
+// 新增组
+export function addGroup(params) {
+  return request({
+    url: 'group/add',
+    method: 'post',
+    params
+  })
+}
+// 编辑组
+export function editGroup(params) {
+  return request({
+    url: 'group/edit',
+    method: 'post',
+    params
+  })
+}
+
+// 给组新增绑定井
+export function addWellsToGroup(params) {
+  return request({
+    url: 'group/addWells',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 给组新增绑定人
+export function addUsersToGroup(params) {
+  return request({
+    url: 'group/addUsers',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 从组里删除井
+export function delWellFromGroup(params) {
+  return request({
+    url: 'group/delWell',
+    method: 'post',
+    params
+  })
+}
+
+// 从组里删除人
+export function delUserFromGroup(params) {
+  return request({
+    url: 'group/delUser',
+    method: 'post',
+    params
+  })
+}
+
+// 删除组
+export function delGroup(params) {
+  return request({
+    url: 'group/delete',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportGroup(params) {
+  return request({
+    url: 'group/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 5703eaf..c9fb937 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -126,6 +126,29 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/listRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule'] }
+      },
+      {
+        path: '/group',
+        name: 'Group',
+        redirect: '/group/listGroup',
+        component: () => import('@/views/alarmGroup/index'),
+        meta: { title: '告警配置', icon: 'icon-config', permission: ['/group'] },
+        children: [
+          {
+            path: 'listGroup',
+            name: 'ListGroup',
+            hidden: true,
+            component: () => import('@/views/alarmGroup/listGroup'),
+            meta: { title: '分组列表', icon: '', activeMenu: '/group' }
+          },
+          {
+            path: 'editGroup',
+            name: 'EditGroup',
+            hidden: true,
+            component: () => import('@/views/alarmGroup/editGroup'),
+            meta: { title: '编辑组', icon: 'icon-config', permission: ['/group/edit'], activeMenu: '/group' }
+          }
+        ]
       }
     ]
   },
diff --git a/src/views/alarmGroup/addGroup.vue b/src/views/alarmGroup/addGroup.vue
new file mode 100644
index 0000000..5f4350d
--- /dev/null
+++ b/src/views/alarmGroup/addGroup.vue
@@ -0,0 +1,94 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增组" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="groupForm" label-well-code="right" label-width="100px">
+      <el-row type="flex" justify="center">
+        <el-col :span="16">
+          <el-form-item label="组名称" prop="groupName">
+            <el-input v-model.trim="groupForm.groupName" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isAdmin" type="flex" justify="center">
+        <el-col :span="16">
+          <el-form-item label="所属派出所" prop="deptid">
+            <dept-select v-model="groupForm.deptid" :need-top="false" dept-type="03" placeholder="选择所属派出所"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import DeptSelect from '@/components/DeptSelect'
+import { addGroup } from '@/api/group'
+export default {
+  name: 'AddGroup',
+  components: {
+    DeptSelect
+  },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      groupForm: {
+        groupName: '', // 组名称
+        deptid: '' // 组织机构
+      },
+      rules: {
+        groupName: [{ required: true, message: '组名称必填', trigger: ['blur', 'change'] }],
+        deptid: [{ required: true, message: '所属派出所必选', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      btnLoading: false, // 按钮加载动画
+      deptShow: false // 组织机构是否显示
+    }
+  },
+  methods: {
+    initDialog: function(row = null) {
+      this.btnLoading = false
+      this.dialogFormVisible = true
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.groupForm = {
+        groupName: '', // 组名称
+        deptid: '' // 组织机构
+      }
+    },
+    // 点击保存
+    saveData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.btnLoading = true
+          // 调用后台请求
+          addGroup(this.groupForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('添加成功！')
+              this.cancel()
+            }
+            this.btnLoading = false
+          }).catch(() => {
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    // 取消
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/alarmGroup/components/addUser.vue b/src/views/alarmGroup/components/addUser.vue
new file mode 100644
index 0000000..ff34176
--- /dev/null
+++ b/src/views/alarmGroup/components/addUser.vue
@@ -0,0 +1,206 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="添加告警通知接收人" width="700px" append-to-body>
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.keywords" placeholder="姓名/手机号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="false" dept-type="03" placeholder="选择部门"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="fetchData">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 查询结果 -->
+    <div class="tablediv">
+      <!--<el-row class="table-title">-->
+      <!--<el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>搜索结果({{ list.length }})</div></el-col>-->
+      <!--</el-row>-->
+      <el-table v-loading="loading" :data="list" size="small" max-height="300" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column :index="indexMethod" label="#" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        :current-page="listQuery.offset"
+        :total="total"
+        :page-sizes="[5,10]"
+        :page-size="listQuery.limit"
+        align="center"
+        layout="total, prev, pager, next"
+        background
+        small
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getUserList } from '@/api/user'
+import { addUsersToGroup } from '@/api/group'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'AddUser',
+  components: { DeptSelect },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      multipleSelection: [],
+      groupId: '',
+      listQuery: {
+        keywords: '',
+        beginTime: '',
+        endTime: '',
+        deptid: '',
+        offset: 1,
+        limit: 5,
+        sort: 'id'
+      },
+      form: { // 表单
+        deptid: '',
+        user: ''
+      },
+      columns: [
+        {
+          text: '真实姓名',
+          value: 'name'
+        },
+        {
+          text: '手机号',
+          value: 'phone'
+        },
+        {
+          text: '部门',
+          value: 'deptName'
+        }
+      ],
+      list: [], // 用户列表数据
+      total: 0,
+      loading: false, // 加载动态效果
+      btnLoading: false
+    }
+  },
+  computed: {
+    titleText: function() {
+      return this.roleName + ''
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(groupId) {
+      this.loading = true
+      this.groupId = groupId
+      this.dialogFormVisible = true
+      this.btnLoading = false
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      getUserList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.loading = false
+      })
+    },
+    saveData() {
+      // 获取选择的用户列表
+      if (this.checkSelection()) {
+        const list = []
+        this.multipleSelection.forEach(function(value, index) {
+          list.push(value.id)
+        })
+        const params = {
+          id: this.groupId,
+          userIds: list
+        }
+        this.btnLoading = true
+        addUsersToGroup(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('添加成功')
+            this.cancel()
+          }
+          this.btnLoading = false
+        }).catch(() => {
+          this.btnLoading = false
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 检查多选情况，未选择返回false，已有选择返回true
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 取消
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    min-width:350px !important;
+  }
+  .scrollbar{
+    max-height: 400px;
+  }
+  .el-tree{
+  }
+  .el-select{
+    width: 100%;
+    overflow-x: hidden;
+    .el-scrollbar__wrap{
+      overflow-x: hidden;
+    }
+  }
+  .list{
+    max-height:300px;
+  }
+  .pagination-container{
+    margin-top: 10px;
+  }
+  .dialog-footer {
+    margin-top: -40px;
+    text-align: right;
+  }
+</style>
diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue
new file mode 100644
index 0000000..dd02bfc
--- /dev/null
+++ b/src/views/alarmGroup/components/addWell.vue
@@ -0,0 +1,231 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="添加闸井" width="700px" append-to-body>
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.keywords" placeholder="闸井地址/编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.wellType" placeholder="选择闸井类型" clearable>
+              <el-option
+                v-for="item in wellTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"/>
+            </el-select>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="fetchData">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 查询结果 -->
+    <div class="tablediv">
+      <el-table v-loading="loading" :data="list" size="small" max-height="300" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column :index="indexMethod" label="#" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        :current-page="listQuery.offset"
+        :total="total"
+        :page-sizes="[5,10]"
+        :page-size="listQuery.limit"
+        align="center"
+        layout="total, prev, pager, next"
+        background
+        small
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getNoGroupWells } from '@/api/group'
+import { addWellsToGroup } from '@/api/group'
+import DeptSelect from '@/components/DeptSelect'
+import { getWellType } from '@/api/well'
+
+export default {
+  name: 'AddWell',
+  components: { DeptSelect },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      multipleSelection: [],
+      groupId: '',
+      listQuery: {
+        keywords: '',
+        wellType: '',
+        beginTime: '',
+        endTime: '',
+        deptid: '',
+        offset: 1,
+        limit: 5,
+        sort: 'id'
+      },
+      form: { // 表单
+        deptid: '',
+        user: ''
+      },
+      wellTypeList: [],
+      columns: [
+        {
+          text: '闸井编号',
+          value: 'wellCode'
+        },
+        {
+          text: '详细地址',
+          value: 'position'
+        },
+        {
+          text: '闸井类型',
+          value: 'wellTypeName'
+        },
+        {
+          text: '权属单位',
+          value: 'deptName'
+        }
+      ],
+      list: [], // 井列表数据
+      total: 0,
+      loading: false, // 加载动态效果
+      btnLoading: false
+    }
+  },
+  computed: {
+    titleText: function() {
+      return this.roleName + ''
+    }
+  },
+  created() {
+    this.fetchWellType()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(groupId) {
+      this.loading = true
+      this.groupId = groupId
+      this.dialogFormVisible = true
+      this.btnLoading = false
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      getNoGroupWells(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.loading = false
+      })
+    },
+    saveData() {
+      // 获取选择的井列表
+      if (this.checkSelection()) {
+        const list = []
+        this.multipleSelection.forEach(function(value, index) {
+          list.push(value.id)
+        })
+        const params = {
+          id: this.groupId,
+          wellIds: list
+        }
+        this.btnLoading = true
+        addWellsToGroup(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('添加成功')
+            this.cancel()
+          }
+          this.btnLoading = false
+        }).catch(() => {
+          this.btnLoading = false
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 获取闸井类型
+    fetchWellType() {
+      getWellType().then(response => {
+        this.wellTypeList = []
+        const wellTypes = this.$store.getters.wellTypes
+        for (const wellType of response.data) {
+          if (wellTypes.indexOf(wellType.value) !== -1) {
+            this.wellTypeList.push(wellType)
+          }
+        }
+      })
+    },
+    // 检查多选情况，未选择返回false，已有选择返回true
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 取消
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    min-width:350px !important;
+  }
+  .scrollbar{
+    max-height: 400px;
+  }
+  .el-tree{
+  }
+  .el-select{
+    width: 100%;
+    overflow-x: hidden;
+    .el-scrollbar__wrap{
+      overflow-x: hidden;
+    }
+  }
+  .list{
+    max-height:300px;
+  }
+  .pagination-container{
+    margin-top: 10px;
+  }
+  .dialog-footer {
+    margin-top: -40px;
+    text-align: right;
+  }
+</style>
diff --git a/src/views/alarmGroup/components/groupListUser.vue b/src/views/alarmGroup/components/groupListUser.vue
new file mode 100644
index 0000000..3572125
--- /dev/null
+++ b/src/views/alarmGroup/components/groupListUser.vue
@@ -0,0 +1,155 @@
+<template>
+  <div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-table v-loading="listLoading" :data="list" class="table" size="mini" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" @click="del(scope.row)">移除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[5,10]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getGroupUsers, delUserFromGroup } from '@/api/group'
+
+export default {
+  name: 'GroupListUser',
+  props: {
+    id: {
+      type: String,
+      required: true
+    }// 小组id
+  },
+  data() {
+    return {
+      listQuery: {
+        offset: 1,
+        limit: 10,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '联系电话',
+          value: 'phone',
+          align: 'center'
+        },
+        {
+          text: '部门',
+          value: 'deptname',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false // 全屏加载动画
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    // 获取组列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      const listQuery = { id: this.id, ...this.listQuery }
+      getGroupUsers(listQuery).then(response => {
+        if (response.code === 200) {
+          // response.data.rows = [
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' },
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' },
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' },
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' },
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' }
+          // ]
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+          this.listLoading = false
+        }
+      })
+    },
+    // 删除井
+    del(row) {
+      this.$confirm(
+        '确定要从该组中移除该通知人吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        const params = {
+          id: this.id,
+          userId: row.id
+        }
+        delUserFromGroup(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('移除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 10px;
+  }
+</style>

diff --git a/src/api/group.js b/src/api/group.js
new file mode 100644
index 0000000..e0fa884
--- /dev/null
+++ b/src/api/group.js
@@ -0,0 +1,119 @@
+/**
+ * 组管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 组列表
+export function getGroupList(params) {
+  return request({
+    url: '/group/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取组内井
+export function getGroupWells(params) {
+  return request({
+    url: 'group/welllist',
+    method: 'get',
+    params
+  })
+}
+
+// 获取组内人
+export function getGroupUsers(params) {
+  return request({
+    url: 'group/userlist',
+    method: 'get',
+    params
+  })
+}
+
+// 获取未分组的井列表
+export function getNoGroupWells(params) {
+  return request({
+    url: '/group/noGroupWelllist',
+    method: 'get',
+    params
+  })
+}
+
+// 新增组
+export function addGroup(params) {
+  return request({
+    url: 'group/add',
+    method: 'post',
+    params
+  })
+}
+// 编辑组
+export function editGroup(params) {
+  return request({
+    url: 'group/edit',
+    method: 'post',
+    params
+  })
+}
+
+// 给组新增绑定井
+export function addWellsToGroup(params) {
+  return request({
+    url: 'group/addWells',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 给组新增绑定人
+export function addUsersToGroup(params) {
+  return request({
+    url: 'group/addUsers',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 从组里删除井
+export function delWellFromGroup(params) {
+  return request({
+    url: 'group/delWell',
+    method: 'post',
+    params
+  })
+}
+
+// 从组里删除人
+export function delUserFromGroup(params) {
+  return request({
+    url: 'group/delUser',
+    method: 'post',
+    params
+  })
+}
+
+// 删除组
+export function delGroup(params) {
+  return request({
+    url: 'group/delete',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportGroup(params) {
+  return request({
+    url: 'group/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 5703eaf..c9fb937 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -126,6 +126,29 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/listRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule'] }
+      },
+      {
+        path: '/group',
+        name: 'Group',
+        redirect: '/group/listGroup',
+        component: () => import('@/views/alarmGroup/index'),
+        meta: { title: '告警配置', icon: 'icon-config', permission: ['/group'] },
+        children: [
+          {
+            path: 'listGroup',
+            name: 'ListGroup',
+            hidden: true,
+            component: () => import('@/views/alarmGroup/listGroup'),
+            meta: { title: '分组列表', icon: '', activeMenu: '/group' }
+          },
+          {
+            path: 'editGroup',
+            name: 'EditGroup',
+            hidden: true,
+            component: () => import('@/views/alarmGroup/editGroup'),
+            meta: { title: '编辑组', icon: 'icon-config', permission: ['/group/edit'], activeMenu: '/group' }
+          }
+        ]
       }
     ]
   },
diff --git a/src/views/alarmGroup/addGroup.vue b/src/views/alarmGroup/addGroup.vue
new file mode 100644
index 0000000..5f4350d
--- /dev/null
+++ b/src/views/alarmGroup/addGroup.vue
@@ -0,0 +1,94 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增组" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="groupForm" label-well-code="right" label-width="100px">
+      <el-row type="flex" justify="center">
+        <el-col :span="16">
+          <el-form-item label="组名称" prop="groupName">
+            <el-input v-model.trim="groupForm.groupName" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isAdmin" type="flex" justify="center">
+        <el-col :span="16">
+          <el-form-item label="所属派出所" prop="deptid">
+            <dept-select v-model="groupForm.deptid" :need-top="false" dept-type="03" placeholder="选择所属派出所"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import DeptSelect from '@/components/DeptSelect'
+import { addGroup } from '@/api/group'
+export default {
+  name: 'AddGroup',
+  components: {
+    DeptSelect
+  },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      groupForm: {
+        groupName: '', // 组名称
+        deptid: '' // 组织机构
+      },
+      rules: {
+        groupName: [{ required: true, message: '组名称必填', trigger: ['blur', 'change'] }],
+        deptid: [{ required: true, message: '所属派出所必选', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      btnLoading: false, // 按钮加载动画
+      deptShow: false // 组织机构是否显示
+    }
+  },
+  methods: {
+    initDialog: function(row = null) {
+      this.btnLoading = false
+      this.dialogFormVisible = true
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.groupForm = {
+        groupName: '', // 组名称
+        deptid: '' // 组织机构
+      }
+    },
+    // 点击保存
+    saveData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.btnLoading = true
+          // 调用后台请求
+          addGroup(this.groupForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('添加成功！')
+              this.cancel()
+            }
+            this.btnLoading = false
+          }).catch(() => {
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    // 取消
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/alarmGroup/components/addUser.vue b/src/views/alarmGroup/components/addUser.vue
new file mode 100644
index 0000000..ff34176
--- /dev/null
+++ b/src/views/alarmGroup/components/addUser.vue
@@ -0,0 +1,206 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="添加告警通知接收人" width="700px" append-to-body>
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.keywords" placeholder="姓名/手机号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="false" dept-type="03" placeholder="选择部门"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="fetchData">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 查询结果 -->
+    <div class="tablediv">
+      <!--<el-row class="table-title">-->
+      <!--<el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>搜索结果({{ list.length }})</div></el-col>-->
+      <!--</el-row>-->
+      <el-table v-loading="loading" :data="list" size="small" max-height="300" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column :index="indexMethod" label="#" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        :current-page="listQuery.offset"
+        :total="total"
+        :page-sizes="[5,10]"
+        :page-size="listQuery.limit"
+        align="center"
+        layout="total, prev, pager, next"
+        background
+        small
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getUserList } from '@/api/user'
+import { addUsersToGroup } from '@/api/group'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'AddUser',
+  components: { DeptSelect },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      multipleSelection: [],
+      groupId: '',
+      listQuery: {
+        keywords: '',
+        beginTime: '',
+        endTime: '',
+        deptid: '',
+        offset: 1,
+        limit: 5,
+        sort: 'id'
+      },
+      form: { // 表单
+        deptid: '',
+        user: ''
+      },
+      columns: [
+        {
+          text: '真实姓名',
+          value: 'name'
+        },
+        {
+          text: '手机号',
+          value: 'phone'
+        },
+        {
+          text: '部门',
+          value: 'deptName'
+        }
+      ],
+      list: [], // 用户列表数据
+      total: 0,
+      loading: false, // 加载动态效果
+      btnLoading: false
+    }
+  },
+  computed: {
+    titleText: function() {
+      return this.roleName + ''
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(groupId) {
+      this.loading = true
+      this.groupId = groupId
+      this.dialogFormVisible = true
+      this.btnLoading = false
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      getUserList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.loading = false
+      })
+    },
+    saveData() {
+      // 获取选择的用户列表
+      if (this.checkSelection()) {
+        const list = []
+        this.multipleSelection.forEach(function(value, index) {
+          list.push(value.id)
+        })
+        const params = {
+          id: this.groupId,
+          userIds: list
+        }
+        this.btnLoading = true
+        addUsersToGroup(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('添加成功')
+            this.cancel()
+          }
+          this.btnLoading = false
+        }).catch(() => {
+          this.btnLoading = false
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 检查多选情况，未选择返回false，已有选择返回true
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 取消
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    min-width:350px !important;
+  }
+  .scrollbar{
+    max-height: 400px;
+  }
+  .el-tree{
+  }
+  .el-select{
+    width: 100%;
+    overflow-x: hidden;
+    .el-scrollbar__wrap{
+      overflow-x: hidden;
+    }
+  }
+  .list{
+    max-height:300px;
+  }
+  .pagination-container{
+    margin-top: 10px;
+  }
+  .dialog-footer {
+    margin-top: -40px;
+    text-align: right;
+  }
+</style>
diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue
new file mode 100644
index 0000000..dd02bfc
--- /dev/null
+++ b/src/views/alarmGroup/components/addWell.vue
@@ -0,0 +1,231 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="添加闸井" width="700px" append-to-body>
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.keywords" placeholder="闸井地址/编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.wellType" placeholder="选择闸井类型" clearable>
+              <el-option
+                v-for="item in wellTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"/>
+            </el-select>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="fetchData">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 查询结果 -->
+    <div class="tablediv">
+      <el-table v-loading="loading" :data="list" size="small" max-height="300" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column :index="indexMethod" label="#" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        :current-page="listQuery.offset"
+        :total="total"
+        :page-sizes="[5,10]"
+        :page-size="listQuery.limit"
+        align="center"
+        layout="total, prev, pager, next"
+        background
+        small
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getNoGroupWells } from '@/api/group'
+import { addWellsToGroup } from '@/api/group'
+import DeptSelect from '@/components/DeptSelect'
+import { getWellType } from '@/api/well'
+
+export default {
+  name: 'AddWell',
+  components: { DeptSelect },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      multipleSelection: [],
+      groupId: '',
+      listQuery: {
+        keywords: '',
+        wellType: '',
+        beginTime: '',
+        endTime: '',
+        deptid: '',
+        offset: 1,
+        limit: 5,
+        sort: 'id'
+      },
+      form: { // 表单
+        deptid: '',
+        user: ''
+      },
+      wellTypeList: [],
+      columns: [
+        {
+          text: '闸井编号',
+          value: 'wellCode'
+        },
+        {
+          text: '详细地址',
+          value: 'position'
+        },
+        {
+          text: '闸井类型',
+          value: 'wellTypeName'
+        },
+        {
+          text: '权属单位',
+          value: 'deptName'
+        }
+      ],
+      list: [], // 井列表数据
+      total: 0,
+      loading: false, // 加载动态效果
+      btnLoading: false
+    }
+  },
+  computed: {
+    titleText: function() {
+      return this.roleName + ''
+    }
+  },
+  created() {
+    this.fetchWellType()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(groupId) {
+      this.loading = true
+      this.groupId = groupId
+      this.dialogFormVisible = true
+      this.btnLoading = false
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      getNoGroupWells(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.loading = false
+      })
+    },
+    saveData() {
+      // 获取选择的井列表
+      if (this.checkSelection()) {
+        const list = []
+        this.multipleSelection.forEach(function(value, index) {
+          list.push(value.id)
+        })
+        const params = {
+          id: this.groupId,
+          wellIds: list
+        }
+        this.btnLoading = true
+        addWellsToGroup(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('添加成功')
+            this.cancel()
+          }
+          this.btnLoading = false
+        }).catch(() => {
+          this.btnLoading = false
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 获取闸井类型
+    fetchWellType() {
+      getWellType().then(response => {
+        this.wellTypeList = []
+        const wellTypes = this.$store.getters.wellTypes
+        for (const wellType of response.data) {
+          if (wellTypes.indexOf(wellType.value) !== -1) {
+            this.wellTypeList.push(wellType)
+          }
+        }
+      })
+    },
+    // 检查多选情况，未选择返回false，已有选择返回true
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 取消
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    min-width:350px !important;
+  }
+  .scrollbar{
+    max-height: 400px;
+  }
+  .el-tree{
+  }
+  .el-select{
+    width: 100%;
+    overflow-x: hidden;
+    .el-scrollbar__wrap{
+      overflow-x: hidden;
+    }
+  }
+  .list{
+    max-height:300px;
+  }
+  .pagination-container{
+    margin-top: 10px;
+  }
+  .dialog-footer {
+    margin-top: -40px;
+    text-align: right;
+  }
+</style>
diff --git a/src/views/alarmGroup/components/groupListUser.vue b/src/views/alarmGroup/components/groupListUser.vue
new file mode 100644
index 0000000..3572125
--- /dev/null
+++ b/src/views/alarmGroup/components/groupListUser.vue
@@ -0,0 +1,155 @@
+<template>
+  <div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-table v-loading="listLoading" :data="list" class="table" size="mini" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" @click="del(scope.row)">移除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[5,10]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getGroupUsers, delUserFromGroup } from '@/api/group'
+
+export default {
+  name: 'GroupListUser',
+  props: {
+    id: {
+      type: String,
+      required: true
+    }// 小组id
+  },
+  data() {
+    return {
+      listQuery: {
+        offset: 1,
+        limit: 10,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '联系电话',
+          value: 'phone',
+          align: 'center'
+        },
+        {
+          text: '部门',
+          value: 'deptname',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false // 全屏加载动画
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    // 获取组列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      const listQuery = { id: this.id, ...this.listQuery }
+      getGroupUsers(listQuery).then(response => {
+        if (response.code === 200) {
+          // response.data.rows = [
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' },
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' },
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' },
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' },
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' }
+          // ]
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+          this.listLoading = false
+        }
+      })
+    },
+    // 删除井
+    del(row) {
+      this.$confirm(
+        '确定要从该组中移除该通知人吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        const params = {
+          id: this.id,
+          userId: row.id
+        }
+        delUserFromGroup(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('移除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 10px;
+  }
+</style>
diff --git a/src/views/alarmGroup/components/groupListWell.vue b/src/views/alarmGroup/components/groupListWell.vue
new file mode 100644
index 0000000..85944a4
--- /dev/null
+++ b/src/views/alarmGroup/components/groupListWell.vue
@@ -0,0 +1,160 @@
+<template>
+  <div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-table v-loading="listLoading" :data="list" class="table" size="mini" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" @click="del(scope.row)">移除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[5,10]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getGroupWells, delWellFromGroup } from '@/api/group'
+
+export default {
+  name: 'GroupListWell',
+  props: {
+    id: {
+      type: String,
+      required: true
+    }// 小组id
+  },
+  data() {
+    return {
+      listQuery: {
+        offset: 1,
+        limit: 10,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '位置',
+          value: 'position',
+          align: 'center'
+        },
+        {
+          text: '井类型',
+          value: 'wellTypeName',
+          align: 'center'
+        },
+        {
+          text: '所属派出所',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false // 全屏加载动画
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    // 获取组列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      const listQuery = { id: this.id, ...this.listQuery }
+      getGroupWells(listQuery).then(response => {
+        if (response.code === 200) {
+          // response.data.rows = [
+          //   { id: '1', wellCode: 'N57F141', position: '北京市通州区AA路AA号', wellTypeName: '雨水井', deptName: '永定路派出所' },
+          //   { id: '1', wellCode: 'N57F141', position: '北京市通州区AA路AA号', wellTypeName: '雨水井', deptName: '永定路派出所' },
+          //   { id: '1', wellCode: 'N57F141', position: '北京市通州区AA路AA号', wellTypeName: '雨水井', deptName: '永定路派出所' },
+          //   { id: '1', wellCode: 'N57F141', position: '北京市通州区AA路AA号', wellTypeName: '雨水井', deptName: '永定路派出所' },
+          //   { id: '1', wellCode: 'N57F141', position: '北京市通州区AA路AA号', wellTypeName: '雨水井', deptName: '永定路派出所' },
+          //   { id: '1', wellCode: 'N57F141', position: '北京市通州区AA路AA号', wellTypeName: '雨水井', deptName: '永定路派出所' }
+          // ]
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+          this.listLoading = false
+        }
+      })
+    },
+    // 删除井
+    del(row) {
+      this.$confirm(
+        '确定要从该组中移除该井吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        const params = {
+          id: this.id,
+          wellId: row.id
+        }
+        delWellFromGroup(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('移除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 10px;
+  }
+</style>

diff --git a/src/api/group.js b/src/api/group.js
new file mode 100644
index 0000000..e0fa884
--- /dev/null
+++ b/src/api/group.js
@@ -0,0 +1,119 @@
+/**
+ * 组管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 组列表
+export function getGroupList(params) {
+  return request({
+    url: '/group/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取组内井
+export function getGroupWells(params) {
+  return request({
+    url: 'group/welllist',
+    method: 'get',
+    params
+  })
+}
+
+// 获取组内人
+export function getGroupUsers(params) {
+  return request({
+    url: 'group/userlist',
+    method: 'get',
+    params
+  })
+}
+
+// 获取未分组的井列表
+export function getNoGroupWells(params) {
+  return request({
+    url: '/group/noGroupWelllist',
+    method: 'get',
+    params
+  })
+}
+
+// 新增组
+export function addGroup(params) {
+  return request({
+    url: 'group/add',
+    method: 'post',
+    params
+  })
+}
+// 编辑组
+export function editGroup(params) {
+  return request({
+    url: 'group/edit',
+    method: 'post',
+    params
+  })
+}
+
+// 给组新增绑定井
+export function addWellsToGroup(params) {
+  return request({
+    url: 'group/addWells',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 给组新增绑定人
+export function addUsersToGroup(params) {
+  return request({
+    url: 'group/addUsers',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 从组里删除井
+export function delWellFromGroup(params) {
+  return request({
+    url: 'group/delWell',
+    method: 'post',
+    params
+  })
+}
+
+// 从组里删除人
+export function delUserFromGroup(params) {
+  return request({
+    url: 'group/delUser',
+    method: 'post',
+    params
+  })
+}
+
+// 删除组
+export function delGroup(params) {
+  return request({
+    url: 'group/delete',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportGroup(params) {
+  return request({
+    url: 'group/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 5703eaf..c9fb937 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -126,6 +126,29 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/listRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule'] }
+      },
+      {
+        path: '/group',
+        name: 'Group',
+        redirect: '/group/listGroup',
+        component: () => import('@/views/alarmGroup/index'),
+        meta: { title: '告警配置', icon: 'icon-config', permission: ['/group'] },
+        children: [
+          {
+            path: 'listGroup',
+            name: 'ListGroup',
+            hidden: true,
+            component: () => import('@/views/alarmGroup/listGroup'),
+            meta: { title: '分组列表', icon: '', activeMenu: '/group' }
+          },
+          {
+            path: 'editGroup',
+            name: 'EditGroup',
+            hidden: true,
+            component: () => import('@/views/alarmGroup/editGroup'),
+            meta: { title: '编辑组', icon: 'icon-config', permission: ['/group/edit'], activeMenu: '/group' }
+          }
+        ]
       }
     ]
   },
diff --git a/src/views/alarmGroup/addGroup.vue b/src/views/alarmGroup/addGroup.vue
new file mode 100644
index 0000000..5f4350d
--- /dev/null
+++ b/src/views/alarmGroup/addGroup.vue
@@ -0,0 +1,94 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增组" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="groupForm" label-well-code="right" label-width="100px">
+      <el-row type="flex" justify="center">
+        <el-col :span="16">
+          <el-form-item label="组名称" prop="groupName">
+            <el-input v-model.trim="groupForm.groupName" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isAdmin" type="flex" justify="center">
+        <el-col :span="16">
+          <el-form-item label="所属派出所" prop="deptid">
+            <dept-select v-model="groupForm.deptid" :need-top="false" dept-type="03" placeholder="选择所属派出所"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import DeptSelect from '@/components/DeptSelect'
+import { addGroup } from '@/api/group'
+export default {
+  name: 'AddGroup',
+  components: {
+    DeptSelect
+  },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      groupForm: {
+        groupName: '', // 组名称
+        deptid: '' // 组织机构
+      },
+      rules: {
+        groupName: [{ required: true, message: '组名称必填', trigger: ['blur', 'change'] }],
+        deptid: [{ required: true, message: '所属派出所必选', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      btnLoading: false, // 按钮加载动画
+      deptShow: false // 组织机构是否显示
+    }
+  },
+  methods: {
+    initDialog: function(row = null) {
+      this.btnLoading = false
+      this.dialogFormVisible = true
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.groupForm = {
+        groupName: '', // 组名称
+        deptid: '' // 组织机构
+      }
+    },
+    // 点击保存
+    saveData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.btnLoading = true
+          // 调用后台请求
+          addGroup(this.groupForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('添加成功！')
+              this.cancel()
+            }
+            this.btnLoading = false
+          }).catch(() => {
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    // 取消
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/alarmGroup/components/addUser.vue b/src/views/alarmGroup/components/addUser.vue
new file mode 100644
index 0000000..ff34176
--- /dev/null
+++ b/src/views/alarmGroup/components/addUser.vue
@@ -0,0 +1,206 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="添加告警通知接收人" width="700px" append-to-body>
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.keywords" placeholder="姓名/手机号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="false" dept-type="03" placeholder="选择部门"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="fetchData">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 查询结果 -->
+    <div class="tablediv">
+      <!--<el-row class="table-title">-->
+      <!--<el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>搜索结果({{ list.length }})</div></el-col>-->
+      <!--</el-row>-->
+      <el-table v-loading="loading" :data="list" size="small" max-height="300" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column :index="indexMethod" label="#" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        :current-page="listQuery.offset"
+        :total="total"
+        :page-sizes="[5,10]"
+        :page-size="listQuery.limit"
+        align="center"
+        layout="total, prev, pager, next"
+        background
+        small
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getUserList } from '@/api/user'
+import { addUsersToGroup } from '@/api/group'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'AddUser',
+  components: { DeptSelect },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      multipleSelection: [],
+      groupId: '',
+      listQuery: {
+        keywords: '',
+        beginTime: '',
+        endTime: '',
+        deptid: '',
+        offset: 1,
+        limit: 5,
+        sort: 'id'
+      },
+      form: { // 表单
+        deptid: '',
+        user: ''
+      },
+      columns: [
+        {
+          text: '真实姓名',
+          value: 'name'
+        },
+        {
+          text: '手机号',
+          value: 'phone'
+        },
+        {
+          text: '部门',
+          value: 'deptName'
+        }
+      ],
+      list: [], // 用户列表数据
+      total: 0,
+      loading: false, // 加载动态效果
+      btnLoading: false
+    }
+  },
+  computed: {
+    titleText: function() {
+      return this.roleName + ''
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(groupId) {
+      this.loading = true
+      this.groupId = groupId
+      this.dialogFormVisible = true
+      this.btnLoading = false
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      getUserList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.loading = false
+      })
+    },
+    saveData() {
+      // 获取选择的用户列表
+      if (this.checkSelection()) {
+        const list = []
+        this.multipleSelection.forEach(function(value, index) {
+          list.push(value.id)
+        })
+        const params = {
+          id: this.groupId,
+          userIds: list
+        }
+        this.btnLoading = true
+        addUsersToGroup(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('添加成功')
+            this.cancel()
+          }
+          this.btnLoading = false
+        }).catch(() => {
+          this.btnLoading = false
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 检查多选情况，未选择返回false，已有选择返回true
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 取消
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    min-width:350px !important;
+  }
+  .scrollbar{
+    max-height: 400px;
+  }
+  .el-tree{
+  }
+  .el-select{
+    width: 100%;
+    overflow-x: hidden;
+    .el-scrollbar__wrap{
+      overflow-x: hidden;
+    }
+  }
+  .list{
+    max-height:300px;
+  }
+  .pagination-container{
+    margin-top: 10px;
+  }
+  .dialog-footer {
+    margin-top: -40px;
+    text-align: right;
+  }
+</style>
diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue
new file mode 100644
index 0000000..dd02bfc
--- /dev/null
+++ b/src/views/alarmGroup/components/addWell.vue
@@ -0,0 +1,231 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="添加闸井" width="700px" append-to-body>
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.keywords" placeholder="闸井地址/编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.wellType" placeholder="选择闸井类型" clearable>
+              <el-option
+                v-for="item in wellTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"/>
+            </el-select>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="fetchData">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 查询结果 -->
+    <div class="tablediv">
+      <el-table v-loading="loading" :data="list" size="small" max-height="300" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column :index="indexMethod" label="#" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        :current-page="listQuery.offset"
+        :total="total"
+        :page-sizes="[5,10]"
+        :page-size="listQuery.limit"
+        align="center"
+        layout="total, prev, pager, next"
+        background
+        small
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getNoGroupWells } from '@/api/group'
+import { addWellsToGroup } from '@/api/group'
+import DeptSelect from '@/components/DeptSelect'
+import { getWellType } from '@/api/well'
+
+export default {
+  name: 'AddWell',
+  components: { DeptSelect },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      multipleSelection: [],
+      groupId: '',
+      listQuery: {
+        keywords: '',
+        wellType: '',
+        beginTime: '',
+        endTime: '',
+        deptid: '',
+        offset: 1,
+        limit: 5,
+        sort: 'id'
+      },
+      form: { // 表单
+        deptid: '',
+        user: ''
+      },
+      wellTypeList: [],
+      columns: [
+        {
+          text: '闸井编号',
+          value: 'wellCode'
+        },
+        {
+          text: '详细地址',
+          value: 'position'
+        },
+        {
+          text: '闸井类型',
+          value: 'wellTypeName'
+        },
+        {
+          text: '权属单位',
+          value: 'deptName'
+        }
+      ],
+      list: [], // 井列表数据
+      total: 0,
+      loading: false, // 加载动态效果
+      btnLoading: false
+    }
+  },
+  computed: {
+    titleText: function() {
+      return this.roleName + ''
+    }
+  },
+  created() {
+    this.fetchWellType()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(groupId) {
+      this.loading = true
+      this.groupId = groupId
+      this.dialogFormVisible = true
+      this.btnLoading = false
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      getNoGroupWells(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.loading = false
+      })
+    },
+    saveData() {
+      // 获取选择的井列表
+      if (this.checkSelection()) {
+        const list = []
+        this.multipleSelection.forEach(function(value, index) {
+          list.push(value.id)
+        })
+        const params = {
+          id: this.groupId,
+          wellIds: list
+        }
+        this.btnLoading = true
+        addWellsToGroup(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('添加成功')
+            this.cancel()
+          }
+          this.btnLoading = false
+        }).catch(() => {
+          this.btnLoading = false
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 获取闸井类型
+    fetchWellType() {
+      getWellType().then(response => {
+        this.wellTypeList = []
+        const wellTypes = this.$store.getters.wellTypes
+        for (const wellType of response.data) {
+          if (wellTypes.indexOf(wellType.value) !== -1) {
+            this.wellTypeList.push(wellType)
+          }
+        }
+      })
+    },
+    // 检查多选情况，未选择返回false，已有选择返回true
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 取消
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    min-width:350px !important;
+  }
+  .scrollbar{
+    max-height: 400px;
+  }
+  .el-tree{
+  }
+  .el-select{
+    width: 100%;
+    overflow-x: hidden;
+    .el-scrollbar__wrap{
+      overflow-x: hidden;
+    }
+  }
+  .list{
+    max-height:300px;
+  }
+  .pagination-container{
+    margin-top: 10px;
+  }
+  .dialog-footer {
+    margin-top: -40px;
+    text-align: right;
+  }
+</style>
diff --git a/src/views/alarmGroup/components/groupListUser.vue b/src/views/alarmGroup/components/groupListUser.vue
new file mode 100644
index 0000000..3572125
--- /dev/null
+++ b/src/views/alarmGroup/components/groupListUser.vue
@@ -0,0 +1,155 @@
+<template>
+  <div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-table v-loading="listLoading" :data="list" class="table" size="mini" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" @click="del(scope.row)">移除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[5,10]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getGroupUsers, delUserFromGroup } from '@/api/group'
+
+export default {
+  name: 'GroupListUser',
+  props: {
+    id: {
+      type: String,
+      required: true
+    }// 小组id
+  },
+  data() {
+    return {
+      listQuery: {
+        offset: 1,
+        limit: 10,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '联系电话',
+          value: 'phone',
+          align: 'center'
+        },
+        {
+          text: '部门',
+          value: 'deptname',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false // 全屏加载动画
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    // 获取组列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      const listQuery = { id: this.id, ...this.listQuery }
+      getGroupUsers(listQuery).then(response => {
+        if (response.code === 200) {
+          // response.data.rows = [
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' },
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' },
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' },
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' },
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' }
+          // ]
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+          this.listLoading = false
+        }
+      })
+    },
+    // 删除井
+    del(row) {
+      this.$confirm(
+        '确定要从该组中移除该通知人吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        const params = {
+          id: this.id,
+          userId: row.id
+        }
+        delUserFromGroup(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('移除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 10px;
+  }
+</style>
diff --git a/src/views/alarmGroup/components/groupListWell.vue b/src/views/alarmGroup/components/groupListWell.vue
new file mode 100644
index 0000000..85944a4
--- /dev/null
+++ b/src/views/alarmGroup/components/groupListWell.vue
@@ -0,0 +1,160 @@
+<template>
+  <div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-table v-loading="listLoading" :data="list" class="table" size="mini" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" @click="del(scope.row)">移除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[5,10]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getGroupWells, delWellFromGroup } from '@/api/group'
+
+export default {
+  name: 'GroupListWell',
+  props: {
+    id: {
+      type: String,
+      required: true
+    }// 小组id
+  },
+  data() {
+    return {
+      listQuery: {
+        offset: 1,
+        limit: 10,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '位置',
+          value: 'position',
+          align: 'center'
+        },
+        {
+          text: '井类型',
+          value: 'wellTypeName',
+          align: 'center'
+        },
+        {
+          text: '所属派出所',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false // 全屏加载动画
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    // 获取组列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      const listQuery = { id: this.id, ...this.listQuery }
+      getGroupWells(listQuery).then(response => {
+        if (response.code === 200) {
+          // response.data.rows = [
+          //   { id: '1', wellCode: 'N57F141', position: '北京市通州区AA路AA号', wellTypeName: '雨水井', deptName: '永定路派出所' },
+          //   { id: '1', wellCode: 'N57F141', position: '北京市通州区AA路AA号', wellTypeName: '雨水井', deptName: '永定路派出所' },
+          //   { id: '1', wellCode: 'N57F141', position: '北京市通州区AA路AA号', wellTypeName: '雨水井', deptName: '永定路派出所' },
+          //   { id: '1', wellCode: 'N57F141', position: '北京市通州区AA路AA号', wellTypeName: '雨水井', deptName: '永定路派出所' },
+          //   { id: '1', wellCode: 'N57F141', position: '北京市通州区AA路AA号', wellTypeName: '雨水井', deptName: '永定路派出所' },
+          //   { id: '1', wellCode: 'N57F141', position: '北京市通州区AA路AA号', wellTypeName: '雨水井', deptName: '永定路派出所' }
+          // ]
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+          this.listLoading = false
+        }
+      })
+    },
+    // 删除井
+    del(row) {
+      this.$confirm(
+        '确定要从该组中移除该井吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        const params = {
+          id: this.id,
+          wellId: row.id
+        }
+        delWellFromGroup(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('移除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 10px;
+  }
+</style>
diff --git a/src/views/alarmGroup/editGroup.vue b/src/views/alarmGroup/editGroup.vue
new file mode 100644
index 0000000..2debd9f
--- /dev/null
+++ b/src/views/alarmGroup/editGroup.vue
@@ -0,0 +1,142 @@
+<template>
+  <div class="main-form">
+    <div>
+      <el-form ref="dataForm" :rules="rules" :model="groupForm" label-well-code="right" label-width="110px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="组名称" prop="groupName">
+              <el-input v-model.trim="groupForm.groupName" type="text" placeholder="必填"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="isAdmin">
+          <el-col :span="12">
+            <el-form-item label="所属派出所" prop="deptid">
+              <dept-select v-model="groupForm.deptid" :need-top="false" placeholder="选择所属派出所"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div class="group-list">
+      <el-form label-well-code="right" label-width="110px">
+        <el-form-item label="包含闸井">
+          <group-list-well ref="listwell" :id="groupForm.id"/>
+          <el-row>
+            <el-button type="primary" icon="el-icon-plus" @click="addWell">添加闸井</el-button>
+          </el-row>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="group-list">
+      <el-form label-well-code="right" label-width="110px">
+        <el-form-item label="告警通知接收人">
+          <group-list-user ref="listuser" :id="groupForm.id"/>
+          <el-row>
+            <el-button type="primary" icon="el-icon-plus" @click="addPerson">添加人员</el-button>
+          </el-row>
+        </el-form-item>
+      </el-form>
+    </div>
+    <el-row>
+      <el-col :span="12">
+        <el-form label-well-code="right" label-width="110px">
+          <el-form-item label="">
+            <el-row>
+              <el-button :loading="btnLoading" type="primary" icon="el-icon-s-claim" @click="save">保存</el-button>
+              <el-button icon="el-icon-back" @click="back">返回</el-button>
+            </el-row>
+          </el-form-item>
+        </el-form>
+      </el-col>
+    </el-row>
+    <add-user ref="adduser" @watchChild="refreshUser"/>
+    <add-well ref="addwell" @watchChild="refreshWell"/>
+  </div>
+</template>
+
+<script>
+import GroupListWell from './components/groupListWell'
+import DeptSelect from '@/components/DeptSelect'
+import GroupListUser from './components/groupListUser'
+import AddUser from './components/addUser'
+import AddWell from './components/addWell'
+import { editGroup } from '@/api/group'
+
+export default {
+  name: 'EditGroup',
+  components: { AddWell, AddUser, GroupListUser, GroupListWell, DeptSelect },
+  data() {
+    return {
+      groupForm: {
+        id: '',
+        groupName: '', // 组名称
+        deptid: '' // 组织机构
+      },
+      rules: {
+        groupName: [{ required: true, message: '组名称必填', trigger: ['blur', 'change'] }],
+        deptid: [{ required: true, message: '所属派出所必选', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      btnLoading: false, // 按钮加载动画
+      deptShow: false // 组织机构是否显示
+    }
+  },
+  created() {
+    this.groupForm.id = this.$route.query.id
+    this.groupForm.groupName = this.$route.query.groupName
+    this.groupForm.deptid = this.$route.query.deptid
+  },
+  methods: {
+    // 添加井
+    addWell() {
+      this.$refs.addwell.initDialog(this.groupForm.id)
+    },
+    // 添加人
+    addPerson() {
+      this.$refs.adduser.initDialog(this.groupForm.id)
+    },
+    // 刷新用户列表
+    refreshUser() {
+      this.$refs.listuser.fetchData()
+    },
+    // 刷新井列表
+    refreshWell() {
+      this.$refs.listwell.fetchData()
+    },
+    // 保存
+    save() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // 调用后台请求
+          this.btnLoading = true
+          editGroup(this.groupForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('保存成功!')
+            }
+            this.btnLoading = false
+          }).catch(() => {
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    // 返回
+    back() {
+      this.$router.back()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .main-form{
+    margin: 20px 30px;
+    padding: 10px;
+  }
+  .group-list{
+    width:80%;
+    .el-table td{
+      padding:3px 0 !important;
+    }
+  }
+</style>

diff --git a/src/api/group.js b/src/api/group.js
new file mode 100644
index 0000000..e0fa884
--- /dev/null
+++ b/src/api/group.js
@@ -0,0 +1,119 @@
+/**
+ * 组管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 组列表
+export function getGroupList(params) {
+  return request({
+    url: '/group/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取组内井
+export function getGroupWells(params) {
+  return request({
+    url: 'group/welllist',
+    method: 'get',
+    params
+  })
+}
+
+// 获取组内人
+export function getGroupUsers(params) {
+  return request({
+    url: 'group/userlist',
+    method: 'get',
+    params
+  })
+}
+
+// 获取未分组的井列表
+export function getNoGroupWells(params) {
+  return request({
+    url: '/group/noGroupWelllist',
+    method: 'get',
+    params
+  })
+}
+
+// 新增组
+export function addGroup(params) {
+  return request({
+    url: 'group/add',
+    method: 'post',
+    params
+  })
+}
+// 编辑组
+export function editGroup(params) {
+  return request({
+    url: 'group/edit',
+    method: 'post',
+    params
+  })
+}
+
+// 给组新增绑定井
+export function addWellsToGroup(params) {
+  return request({
+    url: 'group/addWells',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 给组新增绑定人
+export function addUsersToGroup(params) {
+  return request({
+    url: 'group/addUsers',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 从组里删除井
+export function delWellFromGroup(params) {
+  return request({
+    url: 'group/delWell',
+    method: 'post',
+    params
+  })
+}
+
+// 从组里删除人
+export function delUserFromGroup(params) {
+  return request({
+    url: 'group/delUser',
+    method: 'post',
+    params
+  })
+}
+
+// 删除组
+export function delGroup(params) {
+  return request({
+    url: 'group/delete',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportGroup(params) {
+  return request({
+    url: 'group/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 5703eaf..c9fb937 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -126,6 +126,29 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/listRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule'] }
+      },
+      {
+        path: '/group',
+        name: 'Group',
+        redirect: '/group/listGroup',
+        component: () => import('@/views/alarmGroup/index'),
+        meta: { title: '告警配置', icon: 'icon-config', permission: ['/group'] },
+        children: [
+          {
+            path: 'listGroup',
+            name: 'ListGroup',
+            hidden: true,
+            component: () => import('@/views/alarmGroup/listGroup'),
+            meta: { title: '分组列表', icon: '', activeMenu: '/group' }
+          },
+          {
+            path: 'editGroup',
+            name: 'EditGroup',
+            hidden: true,
+            component: () => import('@/views/alarmGroup/editGroup'),
+            meta: { title: '编辑组', icon: 'icon-config', permission: ['/group/edit'], activeMenu: '/group' }
+          }
+        ]
       }
     ]
   },
diff --git a/src/views/alarmGroup/addGroup.vue b/src/views/alarmGroup/addGroup.vue
new file mode 100644
index 0000000..5f4350d
--- /dev/null
+++ b/src/views/alarmGroup/addGroup.vue
@@ -0,0 +1,94 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增组" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="groupForm" label-well-code="right" label-width="100px">
+      <el-row type="flex" justify="center">
+        <el-col :span="16">
+          <el-form-item label="组名称" prop="groupName">
+            <el-input v-model.trim="groupForm.groupName" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isAdmin" type="flex" justify="center">
+        <el-col :span="16">
+          <el-form-item label="所属派出所" prop="deptid">
+            <dept-select v-model="groupForm.deptid" :need-top="false" dept-type="03" placeholder="选择所属派出所"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import DeptSelect from '@/components/DeptSelect'
+import { addGroup } from '@/api/group'
+export default {
+  name: 'AddGroup',
+  components: {
+    DeptSelect
+  },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      groupForm: {
+        groupName: '', // 组名称
+        deptid: '' // 组织机构
+      },
+      rules: {
+        groupName: [{ required: true, message: '组名称必填', trigger: ['blur', 'change'] }],
+        deptid: [{ required: true, message: '所属派出所必选', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      btnLoading: false, // 按钮加载动画
+      deptShow: false // 组织机构是否显示
+    }
+  },
+  methods: {
+    initDialog: function(row = null) {
+      this.btnLoading = false
+      this.dialogFormVisible = true
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.groupForm = {
+        groupName: '', // 组名称
+        deptid: '' // 组织机构
+      }
+    },
+    // 点击保存
+    saveData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.btnLoading = true
+          // 调用后台请求
+          addGroup(this.groupForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('添加成功！')
+              this.cancel()
+            }
+            this.btnLoading = false
+          }).catch(() => {
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    // 取消
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/alarmGroup/components/addUser.vue b/src/views/alarmGroup/components/addUser.vue
new file mode 100644
index 0000000..ff34176
--- /dev/null
+++ b/src/views/alarmGroup/components/addUser.vue
@@ -0,0 +1,206 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="添加告警通知接收人" width="700px" append-to-body>
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.keywords" placeholder="姓名/手机号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="false" dept-type="03" placeholder="选择部门"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="fetchData">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 查询结果 -->
+    <div class="tablediv">
+      <!--<el-row class="table-title">-->
+      <!--<el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>搜索结果({{ list.length }})</div></el-col>-->
+      <!--</el-row>-->
+      <el-table v-loading="loading" :data="list" size="small" max-height="300" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column :index="indexMethod" label="#" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        :current-page="listQuery.offset"
+        :total="total"
+        :page-sizes="[5,10]"
+        :page-size="listQuery.limit"
+        align="center"
+        layout="total, prev, pager, next"
+        background
+        small
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getUserList } from '@/api/user'
+import { addUsersToGroup } from '@/api/group'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'AddUser',
+  components: { DeptSelect },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      multipleSelection: [],
+      groupId: '',
+      listQuery: {
+        keywords: '',
+        beginTime: '',
+        endTime: '',
+        deptid: '',
+        offset: 1,
+        limit: 5,
+        sort: 'id'
+      },
+      form: { // 表单
+        deptid: '',
+        user: ''
+      },
+      columns: [
+        {
+          text: '真实姓名',
+          value: 'name'
+        },
+        {
+          text: '手机号',
+          value: 'phone'
+        },
+        {
+          text: '部门',
+          value: 'deptName'
+        }
+      ],
+      list: [], // 用户列表数据
+      total: 0,
+      loading: false, // 加载动态效果
+      btnLoading: false
+    }
+  },
+  computed: {
+    titleText: function() {
+      return this.roleName + ''
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(groupId) {
+      this.loading = true
+      this.groupId = groupId
+      this.dialogFormVisible = true
+      this.btnLoading = false
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      getUserList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.loading = false
+      })
+    },
+    saveData() {
+      // 获取选择的用户列表
+      if (this.checkSelection()) {
+        const list = []
+        this.multipleSelection.forEach(function(value, index) {
+          list.push(value.id)
+        })
+        const params = {
+          id: this.groupId,
+          userIds: list
+        }
+        this.btnLoading = true
+        addUsersToGroup(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('添加成功')
+            this.cancel()
+          }
+          this.btnLoading = false
+        }).catch(() => {
+          this.btnLoading = false
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 检查多选情况，未选择返回false，已有选择返回true
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 取消
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    min-width:350px !important;
+  }
+  .scrollbar{
+    max-height: 400px;
+  }
+  .el-tree{
+  }
+  .el-select{
+    width: 100%;
+    overflow-x: hidden;
+    .el-scrollbar__wrap{
+      overflow-x: hidden;
+    }
+  }
+  .list{
+    max-height:300px;
+  }
+  .pagination-container{
+    margin-top: 10px;
+  }
+  .dialog-footer {
+    margin-top: -40px;
+    text-align: right;
+  }
+</style>
diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue
new file mode 100644
index 0000000..dd02bfc
--- /dev/null
+++ b/src/views/alarmGroup/components/addWell.vue
@@ -0,0 +1,231 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="添加闸井" width="700px" append-to-body>
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.keywords" placeholder="闸井地址/编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.wellType" placeholder="选择闸井类型" clearable>
+              <el-option
+                v-for="item in wellTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"/>
+            </el-select>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="fetchData">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 查询结果 -->
+    <div class="tablediv">
+      <el-table v-loading="loading" :data="list" size="small" max-height="300" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column :index="indexMethod" label="#" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        :current-page="listQuery.offset"
+        :total="total"
+        :page-sizes="[5,10]"
+        :page-size="listQuery.limit"
+        align="center"
+        layout="total, prev, pager, next"
+        background
+        small
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getNoGroupWells } from '@/api/group'
+import { addWellsToGroup } from '@/api/group'
+import DeptSelect from '@/components/DeptSelect'
+import { getWellType } from '@/api/well'
+
+export default {
+  name: 'AddWell',
+  components: { DeptSelect },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      multipleSelection: [],
+      groupId: '',
+      listQuery: {
+        keywords: '',
+        wellType: '',
+        beginTime: '',
+        endTime: '',
+        deptid: '',
+        offset: 1,
+        limit: 5,
+        sort: 'id'
+      },
+      form: { // 表单
+        deptid: '',
+        user: ''
+      },
+      wellTypeList: [],
+      columns: [
+        {
+          text: '闸井编号',
+          value: 'wellCode'
+        },
+        {
+          text: '详细地址',
+          value: 'position'
+        },
+        {
+          text: '闸井类型',
+          value: 'wellTypeName'
+        },
+        {
+          text: '权属单位',
+          value: 'deptName'
+        }
+      ],
+      list: [], // 井列表数据
+      total: 0,
+      loading: false, // 加载动态效果
+      btnLoading: false
+    }
+  },
+  computed: {
+    titleText: function() {
+      return this.roleName + ''
+    }
+  },
+  created() {
+    this.fetchWellType()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(groupId) {
+      this.loading = true
+      this.groupId = groupId
+      this.dialogFormVisible = true
+      this.btnLoading = false
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      getNoGroupWells(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.loading = false
+      })
+    },
+    saveData() {
+      // 获取选择的井列表
+      if (this.checkSelection()) {
+        const list = []
+        this.multipleSelection.forEach(function(value, index) {
+          list.push(value.id)
+        })
+        const params = {
+          id: this.groupId,
+          wellIds: list
+        }
+        this.btnLoading = true
+        addWellsToGroup(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('添加成功')
+            this.cancel()
+          }
+          this.btnLoading = false
+        }).catch(() => {
+          this.btnLoading = false
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 获取闸井类型
+    fetchWellType() {
+      getWellType().then(response => {
+        this.wellTypeList = []
+        const wellTypes = this.$store.getters.wellTypes
+        for (const wellType of response.data) {
+          if (wellTypes.indexOf(wellType.value) !== -1) {
+            this.wellTypeList.push(wellType)
+          }
+        }
+      })
+    },
+    // 检查多选情况，未选择返回false，已有选择返回true
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 取消
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    min-width:350px !important;
+  }
+  .scrollbar{
+    max-height: 400px;
+  }
+  .el-tree{
+  }
+  .el-select{
+    width: 100%;
+    overflow-x: hidden;
+    .el-scrollbar__wrap{
+      overflow-x: hidden;
+    }
+  }
+  .list{
+    max-height:300px;
+  }
+  .pagination-container{
+    margin-top: 10px;
+  }
+  .dialog-footer {
+    margin-top: -40px;
+    text-align: right;
+  }
+</style>
diff --git a/src/views/alarmGroup/components/groupListUser.vue b/src/views/alarmGroup/components/groupListUser.vue
new file mode 100644
index 0000000..3572125
--- /dev/null
+++ b/src/views/alarmGroup/components/groupListUser.vue
@@ -0,0 +1,155 @@
+<template>
+  <div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-table v-loading="listLoading" :data="list" class="table" size="mini" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" @click="del(scope.row)">移除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[5,10]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getGroupUsers, delUserFromGroup } from '@/api/group'
+
+export default {
+  name: 'GroupListUser',
+  props: {
+    id: {
+      type: String,
+      required: true
+    }// 小组id
+  },
+  data() {
+    return {
+      listQuery: {
+        offset: 1,
+        limit: 10,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '联系电话',
+          value: 'phone',
+          align: 'center'
+        },
+        {
+          text: '部门',
+          value: 'deptname',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false // 全屏加载动画
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    // 获取组列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      const listQuery = { id: this.id, ...this.listQuery }
+      getGroupUsers(listQuery).then(response => {
+        if (response.code === 200) {
+          // response.data.rows = [
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' },
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' },
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' },
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' },
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' }
+          // ]
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+          this.listLoading = false
+        }
+      })
+    },
+    // 删除井
+    del(row) {
+      this.$confirm(
+        '确定要从该组中移除该通知人吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        const params = {
+          id: this.id,
+          userId: row.id
+        }
+        delUserFromGroup(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('移除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 10px;
+  }
+</style>
diff --git a/src/views/alarmGroup/components/groupListWell.vue b/src/views/alarmGroup/components/groupListWell.vue
new file mode 100644
index 0000000..85944a4
--- /dev/null
+++ b/src/views/alarmGroup/components/groupListWell.vue
@@ -0,0 +1,160 @@
+<template>
+  <div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-table v-loading="listLoading" :data="list" class="table" size="mini" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" @click="del(scope.row)">移除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[5,10]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getGroupWells, delWellFromGroup } from '@/api/group'
+
+export default {
+  name: 'GroupListWell',
+  props: {
+    id: {
+      type: String,
+      required: true
+    }// 小组id
+  },
+  data() {
+    return {
+      listQuery: {
+        offset: 1,
+        limit: 10,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '位置',
+          value: 'position',
+          align: 'center'
+        },
+        {
+          text: '井类型',
+          value: 'wellTypeName',
+          align: 'center'
+        },
+        {
+          text: '所属派出所',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false // 全屏加载动画
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    // 获取组列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      const listQuery = { id: this.id, ...this.listQuery }
+      getGroupWells(listQuery).then(response => {
+        if (response.code === 200) {
+          // response.data.rows = [
+          //   { id: '1', wellCode: 'N57F141', position: '北京市通州区AA路AA号', wellTypeName: '雨水井', deptName: '永定路派出所' },
+          //   { id: '1', wellCode: 'N57F141', position: '北京市通州区AA路AA号', wellTypeName: '雨水井', deptName: '永定路派出所' },
+          //   { id: '1', wellCode: 'N57F141', position: '北京市通州区AA路AA号', wellTypeName: '雨水井', deptName: '永定路派出所' },
+          //   { id: '1', wellCode: 'N57F141', position: '北京市通州区AA路AA号', wellTypeName: '雨水井', deptName: '永定路派出所' },
+          //   { id: '1', wellCode: 'N57F141', position: '北京市通州区AA路AA号', wellTypeName: '雨水井', deptName: '永定路派出所' },
+          //   { id: '1', wellCode: 'N57F141', position: '北京市通州区AA路AA号', wellTypeName: '雨水井', deptName: '永定路派出所' }
+          // ]
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+          this.listLoading = false
+        }
+      })
+    },
+    // 删除井
+    del(row) {
+      this.$confirm(
+        '确定要从该组中移除该井吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        const params = {
+          id: this.id,
+          wellId: row.id
+        }
+        delWellFromGroup(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('移除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 10px;
+  }
+</style>
diff --git a/src/views/alarmGroup/editGroup.vue b/src/views/alarmGroup/editGroup.vue
new file mode 100644
index 0000000..2debd9f
--- /dev/null
+++ b/src/views/alarmGroup/editGroup.vue
@@ -0,0 +1,142 @@
+<template>
+  <div class="main-form">
+    <div>
+      <el-form ref="dataForm" :rules="rules" :model="groupForm" label-well-code="right" label-width="110px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="组名称" prop="groupName">
+              <el-input v-model.trim="groupForm.groupName" type="text" placeholder="必填"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="isAdmin">
+          <el-col :span="12">
+            <el-form-item label="所属派出所" prop="deptid">
+              <dept-select v-model="groupForm.deptid" :need-top="false" placeholder="选择所属派出所"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div class="group-list">
+      <el-form label-well-code="right" label-width="110px">
+        <el-form-item label="包含闸井">
+          <group-list-well ref="listwell" :id="groupForm.id"/>
+          <el-row>
+            <el-button type="primary" icon="el-icon-plus" @click="addWell">添加闸井</el-button>
+          </el-row>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="group-list">
+      <el-form label-well-code="right" label-width="110px">
+        <el-form-item label="告警通知接收人">
+          <group-list-user ref="listuser" :id="groupForm.id"/>
+          <el-row>
+            <el-button type="primary" icon="el-icon-plus" @click="addPerson">添加人员</el-button>
+          </el-row>
+        </el-form-item>
+      </el-form>
+    </div>
+    <el-row>
+      <el-col :span="12">
+        <el-form label-well-code="right" label-width="110px">
+          <el-form-item label="">
+            <el-row>
+              <el-button :loading="btnLoading" type="primary" icon="el-icon-s-claim" @click="save">保存</el-button>
+              <el-button icon="el-icon-back" @click="back">返回</el-button>
+            </el-row>
+          </el-form-item>
+        </el-form>
+      </el-col>
+    </el-row>
+    <add-user ref="adduser" @watchChild="refreshUser"/>
+    <add-well ref="addwell" @watchChild="refreshWell"/>
+  </div>
+</template>
+
+<script>
+import GroupListWell from './components/groupListWell'
+import DeptSelect from '@/components/DeptSelect'
+import GroupListUser from './components/groupListUser'
+import AddUser from './components/addUser'
+import AddWell from './components/addWell'
+import { editGroup } from '@/api/group'
+
+export default {
+  name: 'EditGroup',
+  components: { AddWell, AddUser, GroupListUser, GroupListWell, DeptSelect },
+  data() {
+    return {
+      groupForm: {
+        id: '',
+        groupName: '', // 组名称
+        deptid: '' // 组织机构
+      },
+      rules: {
+        groupName: [{ required: true, message: '组名称必填', trigger: ['blur', 'change'] }],
+        deptid: [{ required: true, message: '所属派出所必选', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      btnLoading: false, // 按钮加载动画
+      deptShow: false // 组织机构是否显示
+    }
+  },
+  created() {
+    this.groupForm.id = this.$route.query.id
+    this.groupForm.groupName = this.$route.query.groupName
+    this.groupForm.deptid = this.$route.query.deptid
+  },
+  methods: {
+    // 添加井
+    addWell() {
+      this.$refs.addwell.initDialog(this.groupForm.id)
+    },
+    // 添加人
+    addPerson() {
+      this.$refs.adduser.initDialog(this.groupForm.id)
+    },
+    // 刷新用户列表
+    refreshUser() {
+      this.$refs.listuser.fetchData()
+    },
+    // 刷新井列表
+    refreshWell() {
+      this.$refs.listwell.fetchData()
+    },
+    // 保存
+    save() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // 调用后台请求
+          this.btnLoading = true
+          editGroup(this.groupForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('保存成功!')
+            }
+            this.btnLoading = false
+          }).catch(() => {
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    // 返回
+    back() {
+      this.$router.back()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .main-form{
+    margin: 20px 30px;
+    padding: 10px;
+  }
+  .group-list{
+    width:80%;
+    .el-table td{
+      padding:3px 0 !important;
+    }
+  }
+</style>
diff --git a/src/views/alarmGroup/index.vue b/src/views/alarmGroup/index.vue
new file mode 100644
index 0000000..13725c1
--- /dev/null
+++ b/src/views/alarmGroup/index.vue
@@ -0,0 +1,5 @@
+<template>
+  <div style="padding:0px;">
+    <router-view />
+  </div>
+</template>

diff --git a/src/api/group.js b/src/api/group.js
new file mode 100644
index 0000000..e0fa884
--- /dev/null
+++ b/src/api/group.js
@@ -0,0 +1,119 @@
+/**
+ * 组管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 组列表
+export function getGroupList(params) {
+  return request({
+    url: '/group/list',
+    method: 'get',
+    params
+  })
+}
+
+// 获取组内井
+export function getGroupWells(params) {
+  return request({
+    url: 'group/welllist',
+    method: 'get',
+    params
+  })
+}
+
+// 获取组内人
+export function getGroupUsers(params) {
+  return request({
+    url: 'group/userlist',
+    method: 'get',
+    params
+  })
+}
+
+// 获取未分组的井列表
+export function getNoGroupWells(params) {
+  return request({
+    url: '/group/noGroupWelllist',
+    method: 'get',
+    params
+  })
+}
+
+// 新增组
+export function addGroup(params) {
+  return request({
+    url: 'group/add',
+    method: 'post',
+    params
+  })
+}
+// 编辑组
+export function editGroup(params) {
+  return request({
+    url: 'group/edit',
+    method: 'post',
+    params
+  })
+}
+
+// 给组新增绑定井
+export function addWellsToGroup(params) {
+  return request({
+    url: 'group/addWells',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 给组新增绑定人
+export function addUsersToGroup(params) {
+  return request({
+    url: 'group/addUsers',
+    method: 'post',
+    params,
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+
+// 从组里删除井
+export function delWellFromGroup(params) {
+  return request({
+    url: 'group/delWell',
+    method: 'post',
+    params
+  })
+}
+
+// 从组里删除人
+export function delUserFromGroup(params) {
+  return request({
+    url: 'group/delUser',
+    method: 'post',
+    params
+  })
+}
+
+// 删除组
+export function delGroup(params) {
+  return request({
+    url: 'group/delete',
+    method: 'post',
+    params
+  })
+}
+
+// 批量导出
+export function batchExportGroup(params) {
+  return request({
+    url: 'group/batchExport',
+    method: 'get',
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 5703eaf..c9fb937 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -126,6 +126,29 @@
         name: 'ListRule',
         component: () => import('@/views/alarmRule/listRule'),
         meta: { title: '告警规则', icon: 'icon-config', permission: ['/alarmRule'] }
+      },
+      {
+        path: '/group',
+        name: 'Group',
+        redirect: '/group/listGroup',
+        component: () => import('@/views/alarmGroup/index'),
+        meta: { title: '告警配置', icon: 'icon-config', permission: ['/group'] },
+        children: [
+          {
+            path: 'listGroup',
+            name: 'ListGroup',
+            hidden: true,
+            component: () => import('@/views/alarmGroup/listGroup'),
+            meta: { title: '分组列表', icon: '', activeMenu: '/group' }
+          },
+          {
+            path: 'editGroup',
+            name: 'EditGroup',
+            hidden: true,
+            component: () => import('@/views/alarmGroup/editGroup'),
+            meta: { title: '编辑组', icon: 'icon-config', permission: ['/group/edit'], activeMenu: '/group' }
+          }
+        ]
       }
     ]
   },
diff --git a/src/views/alarmGroup/addGroup.vue b/src/views/alarmGroup/addGroup.vue
new file mode 100644
index 0000000..5f4350d
--- /dev/null
+++ b/src/views/alarmGroup/addGroup.vue
@@ -0,0 +1,94 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="新增组" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="groupForm" label-well-code="right" label-width="100px">
+      <el-row type="flex" justify="center">
+        <el-col :span="16">
+          <el-form-item label="组名称" prop="groupName">
+            <el-input v-model.trim="groupForm.groupName" type="text" placeholder="必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="isAdmin" type="flex" justify="center">
+        <el-col :span="16">
+          <el-form-item label="所属派出所" prop="deptid">
+            <dept-select v-model="groupForm.deptid" :need-top="false" dept-type="03" placeholder="选择所属派出所"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import DeptSelect from '@/components/DeptSelect'
+import { addGroup } from '@/api/group'
+export default {
+  name: 'AddGroup',
+  components: {
+    DeptSelect
+  },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      groupForm: {
+        groupName: '', // 组名称
+        deptid: '' // 组织机构
+      },
+      rules: {
+        groupName: [{ required: true, message: '组名称必填', trigger: ['blur', 'change'] }],
+        deptid: [{ required: true, message: '所属派出所必选', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      btnLoading: false, // 按钮加载动画
+      deptShow: false // 组织机构是否显示
+    }
+  },
+  methods: {
+    initDialog: function(row = null) {
+      this.btnLoading = false
+      this.dialogFormVisible = true
+      this.resetForm()
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.groupForm = {
+        groupName: '', // 组名称
+        deptid: '' // 组织机构
+      }
+    },
+    // 点击保存
+    saveData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.btnLoading = true
+          // 调用后台请求
+          addGroup(this.groupForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('添加成功！')
+              this.cancel()
+            }
+            this.btnLoading = false
+          }).catch(() => {
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    // 取消
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/alarmGroup/components/addUser.vue b/src/views/alarmGroup/components/addUser.vue
new file mode 100644
index 0000000..ff34176
--- /dev/null
+++ b/src/views/alarmGroup/components/addUser.vue
@@ -0,0 +1,206 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="添加告警通知接收人" width="700px" append-to-body>
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.keywords" placeholder="姓名/手机号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <dept-select v-model="listQuery.deptid" :need-top="false" dept-type="03" placeholder="选择部门"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="fetchData">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 查询结果 -->
+    <div class="tablediv">
+      <!--<el-row class="table-title">-->
+      <!--<el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>搜索结果({{ list.length }})</div></el-col>-->
+      <!--</el-row>-->
+      <el-table v-loading="loading" :data="list" size="small" max-height="300" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column :index="indexMethod" label="#" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        :current-page="listQuery.offset"
+        :total="total"
+        :page-sizes="[5,10]"
+        :page-size="listQuery.limit"
+        align="center"
+        layout="total, prev, pager, next"
+        background
+        small
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getUserList } from '@/api/user'
+import { addUsersToGroup } from '@/api/group'
+import DeptSelect from '@/components/DeptSelect'
+
+export default {
+  name: 'AddUser',
+  components: { DeptSelect },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      multipleSelection: [],
+      groupId: '',
+      listQuery: {
+        keywords: '',
+        beginTime: '',
+        endTime: '',
+        deptid: '',
+        offset: 1,
+        limit: 5,
+        sort: 'id'
+      },
+      form: { // 表单
+        deptid: '',
+        user: ''
+      },
+      columns: [
+        {
+          text: '真实姓名',
+          value: 'name'
+        },
+        {
+          text: '手机号',
+          value: 'phone'
+        },
+        {
+          text: '部门',
+          value: 'deptName'
+        }
+      ],
+      list: [], // 用户列表数据
+      total: 0,
+      loading: false, // 加载动态效果
+      btnLoading: false
+    }
+  },
+  computed: {
+    titleText: function() {
+      return this.roleName + ''
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(groupId) {
+      this.loading = true
+      this.groupId = groupId
+      this.dialogFormVisible = true
+      this.btnLoading = false
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      getUserList(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.loading = false
+      })
+    },
+    saveData() {
+      // 获取选择的用户列表
+      if (this.checkSelection()) {
+        const list = []
+        this.multipleSelection.forEach(function(value, index) {
+          list.push(value.id)
+        })
+        const params = {
+          id: this.groupId,
+          userIds: list
+        }
+        this.btnLoading = true
+        addUsersToGroup(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('添加成功')
+            this.cancel()
+          }
+          this.btnLoading = false
+        }).catch(() => {
+          this.btnLoading = false
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 检查多选情况，未选择返回false，已有选择返回true
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 取消
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    min-width:350px !important;
+  }
+  .scrollbar{
+    max-height: 400px;
+  }
+  .el-tree{
+  }
+  .el-select{
+    width: 100%;
+    overflow-x: hidden;
+    .el-scrollbar__wrap{
+      overflow-x: hidden;
+    }
+  }
+  .list{
+    max-height:300px;
+  }
+  .pagination-container{
+    margin-top: 10px;
+  }
+  .dialog-footer {
+    margin-top: -40px;
+    text-align: right;
+  }
+</style>
diff --git a/src/views/alarmGroup/components/addWell.vue b/src/views/alarmGroup/components/addWell.vue
new file mode 100644
index 0000000..dd02bfc
--- /dev/null
+++ b/src/views/alarmGroup/components/addWell.vue
@@ -0,0 +1,231 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" title="添加闸井" width="700px" append-to-body>
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" size="small" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-input v-model.trim="listQuery.keywords" placeholder="闸井地址/编号" clearable/>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.wellType" placeholder="选择闸井类型" clearable>
+              <el-option
+                v-for="item in wellTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"/>
+            </el-select>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="fetchData">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 查询结果 -->
+    <div class="tablediv">
+      <el-table v-loading="loading" :data="list" size="small" max-height="300" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column :index="indexMethod" label="#" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        :current-page="listQuery.offset"
+        :total="total"
+        :page-sizes="[5,10]"
+        :page-size="listQuery.limit"
+        align="center"
+        layout="total, prev, pager, next"
+        background
+        small
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="btnLoading" type="primary" @click="saveData">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getNoGroupWells } from '@/api/group'
+import { addWellsToGroup } from '@/api/group'
+import DeptSelect from '@/components/DeptSelect'
+import { getWellType } from '@/api/well'
+
+export default {
+  name: 'AddWell',
+  components: { DeptSelect },
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      multipleSelection: [],
+      groupId: '',
+      listQuery: {
+        keywords: '',
+        wellType: '',
+        beginTime: '',
+        endTime: '',
+        deptid: '',
+        offset: 1,
+        limit: 5,
+        sort: 'id'
+      },
+      form: { // 表单
+        deptid: '',
+        user: ''
+      },
+      wellTypeList: [],
+      columns: [
+        {
+          text: '闸井编号',
+          value: 'wellCode'
+        },
+        {
+          text: '详细地址',
+          value: 'position'
+        },
+        {
+          text: '闸井类型',
+          value: 'wellTypeName'
+        },
+        {
+          text: '权属单位',
+          value: 'deptName'
+        }
+      ],
+      list: [], // 井列表数据
+      total: 0,
+      loading: false, // 加载动态效果
+      btnLoading: false
+    }
+  },
+  computed: {
+    titleText: function() {
+      return this.roleName + ''
+    }
+  },
+  created() {
+    this.fetchWellType()
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(groupId) {
+      this.loading = true
+      this.groupId = groupId
+      this.dialogFormVisible = true
+      this.btnLoading = false
+      this.fetchData()
+    },
+    fetchData() {
+      this.listLoading = true
+      getNoGroupWells(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.loading = false
+      })
+    },
+    saveData() {
+      // 获取选择的井列表
+      if (this.checkSelection()) {
+        const list = []
+        this.multipleSelection.forEach(function(value, index) {
+          list.push(value.id)
+        })
+        const params = {
+          id: this.groupId,
+          wellIds: list
+        }
+        this.btnLoading = true
+        addWellsToGroup(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('添加成功')
+            this.cancel()
+          }
+          this.btnLoading = false
+        }).catch(() => {
+          this.btnLoading = false
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 获取闸井类型
+    fetchWellType() {
+      getWellType().then(response => {
+        this.wellTypeList = []
+        const wellTypes = this.$store.getters.wellTypes
+        for (const wellType of response.data) {
+          if (wellTypes.indexOf(wellType.value) !== -1) {
+            this.wellTypeList.push(wellType)
+          }
+        }
+      })
+    },
+    // 检查多选情况，未选择返回false，已有选择返回true
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 取消
+    cancel: function() {
+      this.dialogFormVisible = false
+      this.$emit('watchChild')
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+  .el-dialog{
+    min-width:350px !important;
+  }
+  .scrollbar{
+    max-height: 400px;
+  }
+  .el-tree{
+  }
+  .el-select{
+    width: 100%;
+    overflow-x: hidden;
+    .el-scrollbar__wrap{
+      overflow-x: hidden;
+    }
+  }
+  .list{
+    max-height:300px;
+  }
+  .pagination-container{
+    margin-top: 10px;
+  }
+  .dialog-footer {
+    margin-top: -40px;
+    text-align: right;
+  }
+</style>
diff --git a/src/views/alarmGroup/components/groupListUser.vue b/src/views/alarmGroup/components/groupListUser.vue
new file mode 100644
index 0000000..3572125
--- /dev/null
+++ b/src/views/alarmGroup/components/groupListUser.vue
@@ -0,0 +1,155 @@
+<template>
+  <div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-table v-loading="listLoading" :data="list" class="table" size="mini" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" @click="del(scope.row)">移除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[5,10]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getGroupUsers, delUserFromGroup } from '@/api/group'
+
+export default {
+  name: 'GroupListUser',
+  props: {
+    id: {
+      type: String,
+      required: true
+    }// 小组id
+  },
+  data() {
+    return {
+      listQuery: {
+        offset: 1,
+        limit: 10,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '姓名',
+          value: 'name',
+          align: 'center'
+        },
+        {
+          text: '联系电话',
+          value: 'phone',
+          align: 'center'
+        },
+        {
+          text: '部门',
+          value: 'deptname',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false // 全屏加载动画
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    // 获取组列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      const listQuery = { id: this.id, ...this.listQuery }
+      getGroupUsers(listQuery).then(response => {
+        if (response.code === 200) {
+          // response.data.rows = [
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' },
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' },
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' },
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' },
+          //   { id: '1', name: '张三', phone: '19828192812', deptname: '执勤部' }
+          // ]
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+          this.listLoading = false
+        }
+      })
+    },
+    // 删除井
+    del(row) {
+      this.$confirm(
+        '确定要从该组中移除该通知人吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        const params = {
+          id: this.id,
+          userId: row.id
+        }
+        delUserFromGroup(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('移除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 10px;
+  }
+</style>
diff --git a/src/views/alarmGroup/components/groupListWell.vue b/src/views/alarmGroup/components/groupListWell.vue
new file mode 100644
index 0000000..85944a4
--- /dev/null
+++ b/src/views/alarmGroup/components/groupListWell.vue
@@ -0,0 +1,160 @@
+<template>
+  <div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-table v-loading="listLoading" :data="list" class="table" size="mini" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" @click="del(scope.row)">移除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[5,10]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getGroupWells, delWellFromGroup } from '@/api/group'
+
+export default {
+  name: 'GroupListWell',
+  props: {
+    id: {
+      type: String,
+      required: true
+    }// 小组id
+  },
+  data() {
+    return {
+      listQuery: {
+        offset: 1,
+        limit: 10,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '位置',
+          value: 'position',
+          align: 'center'
+        },
+        {
+          text: '井类型',
+          value: 'wellTypeName',
+          align: 'center'
+        },
+        {
+          text: '所属派出所',
+          value: 'deptName',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false // 全屏加载动画
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    // 获取组列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      const listQuery = { id: this.id, ...this.listQuery }
+      getGroupWells(listQuery).then(response => {
+        if (response.code === 200) {
+          // response.data.rows = [
+          //   { id: '1', wellCode: 'N57F141', position: '北京市通州区AA路AA号', wellTypeName: '雨水井', deptName: '永定路派出所' },
+          //   { id: '1', wellCode: 'N57F141', position: '北京市通州区AA路AA号', wellTypeName: '雨水井', deptName: '永定路派出所' },
+          //   { id: '1', wellCode: 'N57F141', position: '北京市通州区AA路AA号', wellTypeName: '雨水井', deptName: '永定路派出所' },
+          //   { id: '1', wellCode: 'N57F141', position: '北京市通州区AA路AA号', wellTypeName: '雨水井', deptName: '永定路派出所' },
+          //   { id: '1', wellCode: 'N57F141', position: '北京市通州区AA路AA号', wellTypeName: '雨水井', deptName: '永定路派出所' },
+          //   { id: '1', wellCode: 'N57F141', position: '北京市通州区AA路AA号', wellTypeName: '雨水井', deptName: '永定路派出所' }
+          // ]
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+          this.listLoading = false
+        }
+      })
+    },
+    // 删除井
+    del(row) {
+      this.$confirm(
+        '确定要从该组中移除该井吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        const params = {
+          id: this.id,
+          wellId: row.id
+        }
+        delWellFromGroup(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('移除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 10px;
+  }
+</style>
diff --git a/src/views/alarmGroup/editGroup.vue b/src/views/alarmGroup/editGroup.vue
new file mode 100644
index 0000000..2debd9f
--- /dev/null
+++ b/src/views/alarmGroup/editGroup.vue
@@ -0,0 +1,142 @@
+<template>
+  <div class="main-form">
+    <div>
+      <el-form ref="dataForm" :rules="rules" :model="groupForm" label-well-code="right" label-width="110px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="组名称" prop="groupName">
+              <el-input v-model.trim="groupForm.groupName" type="text" placeholder="必填"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="isAdmin">
+          <el-col :span="12">
+            <el-form-item label="所属派出所" prop="deptid">
+              <dept-select v-model="groupForm.deptid" :need-top="false" placeholder="选择所属派出所"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div class="group-list">
+      <el-form label-well-code="right" label-width="110px">
+        <el-form-item label="包含闸井">
+          <group-list-well ref="listwell" :id="groupForm.id"/>
+          <el-row>
+            <el-button type="primary" icon="el-icon-plus" @click="addWell">添加闸井</el-button>
+          </el-row>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="group-list">
+      <el-form label-well-code="right" label-width="110px">
+        <el-form-item label="告警通知接收人">
+          <group-list-user ref="listuser" :id="groupForm.id"/>
+          <el-row>
+            <el-button type="primary" icon="el-icon-plus" @click="addPerson">添加人员</el-button>
+          </el-row>
+        </el-form-item>
+      </el-form>
+    </div>
+    <el-row>
+      <el-col :span="12">
+        <el-form label-well-code="right" label-width="110px">
+          <el-form-item label="">
+            <el-row>
+              <el-button :loading="btnLoading" type="primary" icon="el-icon-s-claim" @click="save">保存</el-button>
+              <el-button icon="el-icon-back" @click="back">返回</el-button>
+            </el-row>
+          </el-form-item>
+        </el-form>
+      </el-col>
+    </el-row>
+    <add-user ref="adduser" @watchChild="refreshUser"/>
+    <add-well ref="addwell" @watchChild="refreshWell"/>
+  </div>
+</template>
+
+<script>
+import GroupListWell from './components/groupListWell'
+import DeptSelect from '@/components/DeptSelect'
+import GroupListUser from './components/groupListUser'
+import AddUser from './components/addUser'
+import AddWell from './components/addWell'
+import { editGroup } from '@/api/group'
+
+export default {
+  name: 'EditGroup',
+  components: { AddWell, AddUser, GroupListUser, GroupListWell, DeptSelect },
+  data() {
+    return {
+      groupForm: {
+        id: '',
+        groupName: '', // 组名称
+        deptid: '' // 组织机构
+      },
+      rules: {
+        groupName: [{ required: true, message: '组名称必填', trigger: ['blur', 'change'] }],
+        deptid: [{ required: true, message: '所属派出所必选', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      btnLoading: false, // 按钮加载动画
+      deptShow: false // 组织机构是否显示
+    }
+  },
+  created() {
+    this.groupForm.id = this.$route.query.id
+    this.groupForm.groupName = this.$route.query.groupName
+    this.groupForm.deptid = this.$route.query.deptid
+  },
+  methods: {
+    // 添加井
+    addWell() {
+      this.$refs.addwell.initDialog(this.groupForm.id)
+    },
+    // 添加人
+    addPerson() {
+      this.$refs.adduser.initDialog(this.groupForm.id)
+    },
+    // 刷新用户列表
+    refreshUser() {
+      this.$refs.listuser.fetchData()
+    },
+    // 刷新井列表
+    refreshWell() {
+      this.$refs.listwell.fetchData()
+    },
+    // 保存
+    save() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          // 调用后台请求
+          this.btnLoading = true
+          editGroup(this.groupForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('保存成功!')
+            }
+            this.btnLoading = false
+          }).catch(() => {
+            this.btnLoading = false
+          })
+        }
+      })
+    },
+    // 返回
+    back() {
+      this.$router.back()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .main-form{
+    margin: 20px 30px;
+    padding: 10px;
+  }
+  .group-list{
+    width:80%;
+    .el-table td{
+      padding:3px 0 !important;
+    }
+  }
+</style>
diff --git a/src/views/alarmGroup/index.vue b/src/views/alarmGroup/index.vue
new file mode 100644
index 0000000..13725c1
--- /dev/null
+++ b/src/views/alarmGroup/index.vue
@@ -0,0 +1,5 @@
+<template>
+  <div style="padding:0px;">
+    <router-view />
+  </div>
+</template>
diff --git a/src/views/alarmGroup/listGroup.vue b/src/views/alarmGroup/listGroup.vue
new file mode 100644
index 0000000..f17ec44
--- /dev/null
+++ b/src/views/alarmGroup/listGroup.vue
@@ -0,0 +1,213 @@
+<template>
+  <div class="app-container">
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>分组列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/group/add')" class="edit_btn" size="small" @click="add">新增</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button v-if="hasPerm('/group/edit')" type="text" @click="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/group/delete')" type="text" @click="del(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+    <add-group ref="addgroup" @watchChild="fetchData"/>
+  </div>
+</template>
+
+<script>
+import { getGroupList, delGroup, batchExportGroup } from '@/api/group'
+import AddGroup from './addGroup'
+
+export default {
+  name: 'ListGroup',
+  components: { AddGroup },
+  data() {
+    return {
+      listQuery: {
+        maxLength: '5',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '分组名称',
+          value: 'groupName',
+          align: 'center'
+        },
+        {
+          text: '组内井',
+          value: 'wellNameList',
+          align: 'center'
+        },
+        {
+          text: '接收人员',
+          value: 'userNameList',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false // 全屏加载动画
+    }
+  },
+  created() {
+    this.fetchData(true)
+  },
+  methods: {
+    // 新增组
+    add() {
+      this.$refs.addgroup.initDialog()
+    },
+    // 编辑组信息
+    edit(row) {
+      const query = {
+        id: row.id,
+        groupName: row.groupName,
+        deptid: row.deptid
+      }
+      // 跳转到编辑组页面
+      this.$router.push({ path: '/group/editGroup', query: { ...query }})
+    },
+    // 删除组
+    del(row) {
+      this.$confirm(
+        '确定要删除该组吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        const params = {
+          id: row.id
+        }
+        delGroup(params).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportGroup(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `分组列表.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+        this.$message.error(res.message)
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取组列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getGroupList(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+          this.listLoading = false
+        }
+      })
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>