diff --git a/src/api/alarm.js b/src/api/alarm.js
index 6e60037..f17086b 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -1,28 +1,39 @@
 import request from '@/utils/request'
 
-// 查询采集报警列表
-export function getCollectAlarmList(params) {
+// 查询当前报警列表
+export function getAlarmNowList(params) {
   return request({
-    url: '/irisGraAlarm/listPage',
+    url: '/alarm/listPage',
     method: 'get',
     params
   })
 }
 
-// 查询识别报警列表
-export function getRecognizeAlarmList(params) {
+// 查询历史报警记录
+export function getAlarmList(params) {
   return request({
-    url: '/recognition/alarms',
+    url: '/alarm/listPage',
     method: 'get',
     params
   })
 }
 
-// 查询识别报警详情
-export function getRecognizeAlarmDetail(params) {
+// 取消报警
+export function alarmCancel(params) {
   return request({
-    url: '/recognition/alarmDetail',
-    method: 'get',
+    url: '/alarm/cancel',
+    method: 'post',
     params
   })
 }
+
+// 查询报警详情
+export function alarmDetail(id) {
+  return request({
+    url: '/alarm/detail/' + id,
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+    }
+  })
+}

diff --git a/src/api/alarm.js b/src/api/alarm.js
index 6e60037..f17086b 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -1,28 +1,39 @@
 import request from '@/utils/request'
 
-// 查询采集报警列表
-export function getCollectAlarmList(params) {
+// 查询当前报警列表
+export function getAlarmNowList(params) {
   return request({
-    url: '/irisGraAlarm/listPage',
+    url: '/alarm/listPage',
     method: 'get',
     params
   })
 }
 
-// 查询识别报警列表
-export function getRecognizeAlarmList(params) {
+// 查询历史报警记录
+export function getAlarmList(params) {
   return request({
-    url: '/recognition/alarms',
+    url: '/alarm/listPage',
     method: 'get',
     params
   })
 }
 
-// 查询识别报警详情
-export function getRecognizeAlarmDetail(params) {
+// 取消报警
+export function alarmCancel(params) {
   return request({
-    url: '/recognition/alarmDetail',
-    method: 'get',
+    url: '/alarm/cancel',
+    method: 'post',
     params
   })
 }
+
+// 查询报警详情
+export function alarmDetail(id) {
+  return request({
+    url: '/alarm/detail/' + id,
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+    }
+  })
+}
diff --git a/src/api/allDict.js b/src/api/allDict.js
index c567eb2..e7f9bc8 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -69,3 +69,11 @@
     method: 'get'
   })
 }
+
+// 报警内容
+export function getAlarmContent() {
+  return request({
+    url: '/dict/code/alarmContent',
+    method: 'get'
+  })
+}

diff --git a/src/api/alarm.js b/src/api/alarm.js
index 6e60037..f17086b 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -1,28 +1,39 @@
 import request from '@/utils/request'
 
-// 查询采集报警列表
-export function getCollectAlarmList(params) {
+// 查询当前报警列表
+export function getAlarmNowList(params) {
   return request({
-    url: '/irisGraAlarm/listPage',
+    url: '/alarm/listPage',
     method: 'get',
     params
   })
 }
 
-// 查询识别报警列表
-export function getRecognizeAlarmList(params) {
+// 查询历史报警记录
+export function getAlarmList(params) {
   return request({
-    url: '/recognition/alarms',
+    url: '/alarm/listPage',
     method: 'get',
     params
   })
 }
 
-// 查询识别报警详情
-export function getRecognizeAlarmDetail(params) {
+// 取消报警
+export function alarmCancel(params) {
   return request({
-    url: '/recognition/alarmDetail',
-    method: 'get',
+    url: '/alarm/cancel',
+    method: 'post',
     params
   })
 }
+
+// 查询报警详情
+export function alarmDetail(id) {
+  return request({
+    url: '/alarm/detail/' + id,
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+    }
+  })
+}
diff --git a/src/api/allDict.js b/src/api/allDict.js
index c567eb2..e7f9bc8 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -69,3 +69,11 @@
     method: 'get'
   })
 }
+
+// 报警内容
+export function getAlarmContent() {
+  return request({
+    url: '/dict/code/alarmContent',
+    method: 'get'
+  })
+}
diff --git a/src/permission.js b/src/permission.js
index c673350..fd3a535 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -14,7 +14,6 @@
   NProgress.start() // 加载进度条
   // 如果有token
   if (getToken()) {
-    console.log('to Path:' + to.path)
     // 登录后进入登录页
     if (to.path === '/login') {
       next({ path: '/login' })

diff --git a/src/api/alarm.js b/src/api/alarm.js
index 6e60037..f17086b 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -1,28 +1,39 @@
 import request from '@/utils/request'
 
-// 查询采集报警列表
-export function getCollectAlarmList(params) {
+// 查询当前报警列表
+export function getAlarmNowList(params) {
   return request({
-    url: '/irisGraAlarm/listPage',
+    url: '/alarm/listPage',
     method: 'get',
     params
   })
 }
 
-// 查询识别报警列表
-export function getRecognizeAlarmList(params) {
+// 查询历史报警记录
+export function getAlarmList(params) {
   return request({
-    url: '/recognition/alarms',
+    url: '/alarm/listPage',
     method: 'get',
     params
   })
 }
 
-// 查询识别报警详情
-export function getRecognizeAlarmDetail(params) {
+// 取消报警
+export function alarmCancel(params) {
   return request({
-    url: '/recognition/alarmDetail',
-    method: 'get',
+    url: '/alarm/cancel',
+    method: 'post',
     params
   })
 }
+
+// 查询报警详情
+export function alarmDetail(id) {
+  return request({
+    url: '/alarm/detail/' + id,
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+    }
+  })
+}
diff --git a/src/api/allDict.js b/src/api/allDict.js
index c567eb2..e7f9bc8 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -69,3 +69,11 @@
     method: 'get'
   })
 }
+
+// 报警内容
+export function getAlarmContent() {
+  return request({
+    url: '/dict/code/alarmContent',
+    method: 'get'
+  })
+}
diff --git a/src/permission.js b/src/permission.js
index c673350..fd3a535 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -14,7 +14,6 @@
   NProgress.start() // 加载进度条
   // 如果有token
   if (getToken()) {
-    console.log('to Path:' + to.path)
     // 登录后进入登录页
     if (to.path === '/login') {
       next({ path: '/login' })
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 64e8d5e..5d734c2 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -193,5 +193,32 @@
         meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
       }
     ]
+  },
+  {
+    path: '/alarm',
+    component: Layout,
+    redirect: '/alarm',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/alarm'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/alarm/list'], keepAlive: true }
+      }
+    ]
   }
 ]

diff --git a/src/api/alarm.js b/src/api/alarm.js
index 6e60037..f17086b 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -1,28 +1,39 @@
 import request from '@/utils/request'
 
-// 查询采集报警列表
-export function getCollectAlarmList(params) {
+// 查询当前报警列表
+export function getAlarmNowList(params) {
   return request({
-    url: '/irisGraAlarm/listPage',
+    url: '/alarm/listPage',
     method: 'get',
     params
   })
 }
 
-// 查询识别报警列表
-export function getRecognizeAlarmList(params) {
+// 查询历史报警记录
+export function getAlarmList(params) {
   return request({
-    url: '/recognition/alarms',
+    url: '/alarm/listPage',
     method: 'get',
     params
   })
 }
 
-// 查询识别报警详情
-export function getRecognizeAlarmDetail(params) {
+// 取消报警
+export function alarmCancel(params) {
   return request({
-    url: '/recognition/alarmDetail',
-    method: 'get',
+    url: '/alarm/cancel',
+    method: 'post',
     params
   })
 }
+
+// 查询报警详情
+export function alarmDetail(id) {
+  return request({
+    url: '/alarm/detail/' + id,
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+    }
+  })
+}
diff --git a/src/api/allDict.js b/src/api/allDict.js
index c567eb2..e7f9bc8 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -69,3 +69,11 @@
     method: 'get'
   })
 }
+
+// 报警内容
+export function getAlarmContent() {
+  return request({
+    url: '/dict/code/alarmContent',
+    method: 'get'
+  })
+}
diff --git a/src/permission.js b/src/permission.js
index c673350..fd3a535 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -14,7 +14,6 @@
   NProgress.start() // 加载进度条
   // 如果有token
   if (getToken()) {
-    console.log('to Path:' + to.path)
     // 登录后进入登录页
     if (to.path === '/login') {
       next({ path: '/login' })
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 64e8d5e..5d734c2 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -193,5 +193,32 @@
         meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
       }
     ]
+  },
+  {
+    path: '/alarm',
+    component: Layout,
+    redirect: '/alarm',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/alarm'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/alarm/list'], keepAlive: true }
+      }
+    ]
   }
 ]
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1b0e44b..73313ab 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,15 +44,12 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    console.log(tmp)
-
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
-        console.log(tmp.path + '->' + tmp.children[0].path)
         tmp.redirect = tmp.children[0].path
       }
       res.push(tmp)
@@ -66,12 +63,10 @@
 }
 
 function filterRedirect(routes) {
-  console.log('filterRedirect')
   const sysroutes = routes.filter(route => route.meta.isSys)
   const menuroutes = routes.filter(route => !route.meta.isSys)
   for (const sys of sysroutes) {
     const firstmenu = menuroutes.find(route => route.meta.sys === sys.path)
-    console.log(sys.path + ':' + firstmenu.path)
     sys.redirect = firstmenu.path
   }
   return [...sysroutes, ...menuroutes]
@@ -128,8 +123,6 @@
     },
     // 获取用户权限
     GetMenus({ commit, state }, currentSystem) {
-      // console.log('in store.permission.js:GetMenus:')
-      console.log('获取' + currentSystem.name + '的菜单')
       return new Promise((resolve, reject) => {
         // const params = {
         //   parentCode: currentSystem.code

diff --git a/src/api/alarm.js b/src/api/alarm.js
index 6e60037..f17086b 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -1,28 +1,39 @@
 import request from '@/utils/request'
 
-// 查询采集报警列表
-export function getCollectAlarmList(params) {
+// 查询当前报警列表
+export function getAlarmNowList(params) {
   return request({
-    url: '/irisGraAlarm/listPage',
+    url: '/alarm/listPage',
     method: 'get',
     params
   })
 }
 
-// 查询识别报警列表
-export function getRecognizeAlarmList(params) {
+// 查询历史报警记录
+export function getAlarmList(params) {
   return request({
-    url: '/recognition/alarms',
+    url: '/alarm/listPage',
     method: 'get',
     params
   })
 }
 
-// 查询识别报警详情
-export function getRecognizeAlarmDetail(params) {
+// 取消报警
+export function alarmCancel(params) {
   return request({
-    url: '/recognition/alarmDetail',
-    method: 'get',
+    url: '/alarm/cancel',
+    method: 'post',
     params
   })
 }
+
+// 查询报警详情
+export function alarmDetail(id) {
+  return request({
+    url: '/alarm/detail/' + id,
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+    }
+  })
+}
diff --git a/src/api/allDict.js b/src/api/allDict.js
index c567eb2..e7f9bc8 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -69,3 +69,11 @@
     method: 'get'
   })
 }
+
+// 报警内容
+export function getAlarmContent() {
+  return request({
+    url: '/dict/code/alarmContent',
+    method: 'get'
+  })
+}
diff --git a/src/permission.js b/src/permission.js
index c673350..fd3a535 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -14,7 +14,6 @@
   NProgress.start() // 加载进度条
   // 如果有token
   if (getToken()) {
-    console.log('to Path:' + to.path)
     // 登录后进入登录页
     if (to.path === '/login') {
       next({ path: '/login' })
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 64e8d5e..5d734c2 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -193,5 +193,32 @@
         meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
       }
     ]
+  },
+  {
+    path: '/alarm',
+    component: Layout,
+    redirect: '/alarm',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/alarm'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/alarm/list'], keepAlive: true }
+      }
+    ]
   }
 ]
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1b0e44b..73313ab 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,15 +44,12 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    console.log(tmp)
-
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
-        console.log(tmp.path + '->' + tmp.children[0].path)
         tmp.redirect = tmp.children[0].path
       }
       res.push(tmp)
@@ -66,12 +63,10 @@
 }
 
 function filterRedirect(routes) {
-  console.log('filterRedirect')
   const sysroutes = routes.filter(route => route.meta.isSys)
   const menuroutes = routes.filter(route => !route.meta.isSys)
   for (const sys of sysroutes) {
     const firstmenu = menuroutes.find(route => route.meta.sys === sys.path)
-    console.log(sys.path + ':' + firstmenu.path)
     sys.redirect = firstmenu.path
   }
   return [...sysroutes, ...menuroutes]
@@ -128,8 +123,6 @@
     },
     // 获取用户权限
     GetMenus({ commit, state }, currentSystem) {
-      // console.log('in store.permission.js:GetMenus:')
-      console.log('获取' + currentSystem.name + '的菜单')
       return new Promise((resolve, reject) => {
         // const params = {
         //   parentCode: currentSystem.code
diff --git a/src/views/alarm/alarmCancel.vue b/src/views/alarm/alarmCancel.vue
new file mode 100644
index 0000000..03bf52f
--- /dev/null
+++ b/src/views/alarm/alarmCancel.vue
@@ -0,0 +1,116 @@
+<!-- 取消报警 -->
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :close-on-click-modal="false" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="dataForm" label-well-code="right" label-width="120px">
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="取消报警原因" prop="reason">
+            <el-radio-group v-model="dataForm.reason">
+              <el-radio label="已解决" border>已解决</el-radio>
+              <el-radio label="无需处理" border>无需处理</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="dataForm.remark" type="text" />
+          </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>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { alarmCancel } from '@/api/alarm'
+
+export default {
+  name: 'AlarmCancel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,detail
+      dataForm: {
+        id: '', // id
+        reason: '', // 取消原因
+        remark: '' // 备注
+      }, // 表单
+      rules: {
+        reason: [{ required: true, message: '消警原因不能为空', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      textMap: {
+        detail: '取消报警'
+      }, // 表头显示标题
+      btnLoading: true // 保存按钮是否不允许点击
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.btnLoading = false
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+
+      if (dialogStatus === 'detail') {
+        // 清除
+        this.dataForm = {
+          id: row.id,
+          reason: '',
+          remark: ''
+        }
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.btnLoading = true
+
+      this.updateData()
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          alarmCancel(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('消警成功')
+
+              // 关闭对话框，并刷新列表的记录
+              this.dialogFormVisible = false
+              this.$emit('refreshList')
+            } else {
+              this.btnLoading = false
+              this.$message.error(response.message)
+            }
+          }).catch(() => {
+            this.btnLoading = false
+          })
+        } else {
+          this.btnLoading = false
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .dialog-footer {
+    margin-top: -20px;
+    text-align: center;
+  }
+</style>

diff --git a/src/api/alarm.js b/src/api/alarm.js
index 6e60037..f17086b 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -1,28 +1,39 @@
 import request from '@/utils/request'
 
-// 查询采集报警列表
-export function getCollectAlarmList(params) {
+// 查询当前报警列表
+export function getAlarmNowList(params) {
   return request({
-    url: '/irisGraAlarm/listPage',
+    url: '/alarm/listPage',
     method: 'get',
     params
   })
 }
 
-// 查询识别报警列表
-export function getRecognizeAlarmList(params) {
+// 查询历史报警记录
+export function getAlarmList(params) {
   return request({
-    url: '/recognition/alarms',
+    url: '/alarm/listPage',
     method: 'get',
     params
   })
 }
 
-// 查询识别报警详情
-export function getRecognizeAlarmDetail(params) {
+// 取消报警
+export function alarmCancel(params) {
   return request({
-    url: '/recognition/alarmDetail',
-    method: 'get',
+    url: '/alarm/cancel',
+    method: 'post',
     params
   })
 }
+
+// 查询报警详情
+export function alarmDetail(id) {
+  return request({
+    url: '/alarm/detail/' + id,
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+    }
+  })
+}
diff --git a/src/api/allDict.js b/src/api/allDict.js
index c567eb2..e7f9bc8 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -69,3 +69,11 @@
     method: 'get'
   })
 }
+
+// 报警内容
+export function getAlarmContent() {
+  return request({
+    url: '/dict/code/alarmContent',
+    method: 'get'
+  })
+}
diff --git a/src/permission.js b/src/permission.js
index c673350..fd3a535 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -14,7 +14,6 @@
   NProgress.start() // 加载进度条
   // 如果有token
   if (getToken()) {
-    console.log('to Path:' + to.path)
     // 登录后进入登录页
     if (to.path === '/login') {
       next({ path: '/login' })
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 64e8d5e..5d734c2 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -193,5 +193,32 @@
         meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
       }
     ]
+  },
+  {
+    path: '/alarm',
+    component: Layout,
+    redirect: '/alarm',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/alarm'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/alarm/list'], keepAlive: true }
+      }
+    ]
   }
 ]
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1b0e44b..73313ab 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,15 +44,12 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    console.log(tmp)
-
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
-        console.log(tmp.path + '->' + tmp.children[0].path)
         tmp.redirect = tmp.children[0].path
       }
       res.push(tmp)
@@ -66,12 +63,10 @@
 }
 
 function filterRedirect(routes) {
-  console.log('filterRedirect')
   const sysroutes = routes.filter(route => route.meta.isSys)
   const menuroutes = routes.filter(route => !route.meta.isSys)
   for (const sys of sysroutes) {
     const firstmenu = menuroutes.find(route => route.meta.sys === sys.path)
-    console.log(sys.path + ':' + firstmenu.path)
     sys.redirect = firstmenu.path
   }
   return [...sysroutes, ...menuroutes]
@@ -128,8 +123,6 @@
     },
     // 获取用户权限
     GetMenus({ commit, state }, currentSystem) {
-      // console.log('in store.permission.js:GetMenus:')
-      console.log('获取' + currentSystem.name + '的菜单')
       return new Promise((resolve, reject) => {
         // const params = {
         //   parentCode: currentSystem.code
diff --git a/src/views/alarm/alarmCancel.vue b/src/views/alarm/alarmCancel.vue
new file mode 100644
index 0000000..03bf52f
--- /dev/null
+++ b/src/views/alarm/alarmCancel.vue
@@ -0,0 +1,116 @@
+<!-- 取消报警 -->
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :close-on-click-modal="false" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="dataForm" label-well-code="right" label-width="120px">
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="取消报警原因" prop="reason">
+            <el-radio-group v-model="dataForm.reason">
+              <el-radio label="已解决" border>已解决</el-radio>
+              <el-radio label="无需处理" border>无需处理</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="dataForm.remark" type="text" />
+          </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>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { alarmCancel } from '@/api/alarm'
+
+export default {
+  name: 'AlarmCancel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,detail
+      dataForm: {
+        id: '', // id
+        reason: '', // 取消原因
+        remark: '' // 备注
+      }, // 表单
+      rules: {
+        reason: [{ required: true, message: '消警原因不能为空', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      textMap: {
+        detail: '取消报警'
+      }, // 表头显示标题
+      btnLoading: true // 保存按钮是否不允许点击
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.btnLoading = false
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+
+      if (dialogStatus === 'detail') {
+        // 清除
+        this.dataForm = {
+          id: row.id,
+          reason: '',
+          remark: ''
+        }
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.btnLoading = true
+
+      this.updateData()
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          alarmCancel(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('消警成功')
+
+              // 关闭对话框，并刷新列表的记录
+              this.dialogFormVisible = false
+              this.$emit('refreshList')
+            } else {
+              this.btnLoading = false
+              this.$message.error(response.message)
+            }
+          }).catch(() => {
+            this.btnLoading = false
+          })
+        } else {
+          this.btnLoading = false
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .dialog-footer {
+    margin-top: -20px;
+    text-align: center;
+  }
+</style>
diff --git a/src/views/alarm/alarmDetail.vue b/src/views/alarm/alarmDetail.vue
new file mode 100644
index 0000000..617d580
--- /dev/null
+++ b/src/views/alarm/alarmDetail.vue
@@ -0,0 +1,177 @@
+<!-- 报警详情 -->
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :close-on-click-modal="false" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :model="dataForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警编号">
+            <el-input v-model.trim="dataForm.alarmCode" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="报警时间">
+            <el-input v-model.trim="dataForm.alarmTime" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警状态">
+            <el-input v-model.trim="dataForm.validStr" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="区域名称">
+            <el-input v-model.trim="dataForm.areaPosition" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警内容">
+            <el-input v-model.trim="dataForm.alarmContent" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-show="dataForm.alarmValue !== ''" label="报警数值">
+            <el-input v-model.trim="dataForm.alarmValueStr" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号">
+            <el-input v-model.trim="dataForm.devcode" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备名称">
+            <el-input v-model.trim="dataForm.devName" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属防护">
+            <el-input v-model.trim="dataForm.areaType" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row v-show="!dataForm.valid" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="取消报警原因">
+            <el-input v-model.trim="dataForm.reason" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row v-show="!dataForm.valid" :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注">
+            <el-input v-model.trim="dataForm.remark" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+  </el-dialog>
+</template>
+
+<script>
+import { alarmDetail } from '@/api/alarm'
+
+export default {
+  name: 'AlarmDetail',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,detail
+      dataForm: {
+        id: '', // id
+        alarmCode: '', // 报警编号
+        alarmTime: '', // 报警事件
+        valid: '', // 报警状态
+        validStr: '', // 报警状态中文
+        areaPosition: '', // 区域名称
+        alarmContent: '', // 报警内容
+        alarmValue: '', // 报警值
+        alarmValueStr: '', // 报警值格式化
+        devcode: '', // 设备编号
+        devName: '', // 设备名
+        areaType: '', // 所属防护
+        reason: '', // 取消报警原因
+        remark: '' // 备注
+      }, // 表单
+      textMap: {
+        detail: '报警详情'
+      }, // 表头显示标题
+      isDetailMode: false // 是否详情模式
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+
+        this.dataForm = {
+          id: row.id
+        }
+
+        alarmDetail(this.dataForm.id).then(response => {
+          if (response.code === 200) {
+            this.dataForm = {
+              id: row.id,
+              alarmCode: response.data.alarmCode,
+              alarmTime: response.data.alarmTimeFmt,
+              areaPosition: response.data.areaPosition,
+              alarmContent: response.data.alarmContent,
+              alarmValue: response.data.alarmValue,
+              valid: response.data.valid,
+              devcode: response.data.devcode,
+              devName: response.data.devName,
+              reason: response.data.reson,
+              remark: response.data.remark
+            }
+
+            // 格式化报警状态
+            if (response.data.valid === 1) {
+              this.dataForm.validStr = '正在报警'
+            } else {
+              this.dataForm.validStr = '已消警'
+            }
+
+            // 格式化报警数值
+            if (response.data.alarmContent.indexOf('温度') >= 0) {
+              this.dataForm.alarmValueStr = response.data.alarmValue + '（℃）'
+            } else if (response.data.alarmContent.indexOf('湿度') >= 0) {
+              this.dataForm.alarmValueStr = response.data.alarmValue + '（%）'
+            }
+          }
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .dialog-footer {
+    margin-top: -20px;
+    text-align: center;
+  }
+</style>

diff --git a/src/api/alarm.js b/src/api/alarm.js
index 6e60037..f17086b 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -1,28 +1,39 @@
 import request from '@/utils/request'
 
-// 查询采集报警列表
-export function getCollectAlarmList(params) {
+// 查询当前报警列表
+export function getAlarmNowList(params) {
   return request({
-    url: '/irisGraAlarm/listPage',
+    url: '/alarm/listPage',
     method: 'get',
     params
   })
 }
 
-// 查询识别报警列表
-export function getRecognizeAlarmList(params) {
+// 查询历史报警记录
+export function getAlarmList(params) {
   return request({
-    url: '/recognition/alarms',
+    url: '/alarm/listPage',
     method: 'get',
     params
   })
 }
 
-// 查询识别报警详情
-export function getRecognizeAlarmDetail(params) {
+// 取消报警
+export function alarmCancel(params) {
   return request({
-    url: '/recognition/alarmDetail',
-    method: 'get',
+    url: '/alarm/cancel',
+    method: 'post',
     params
   })
 }
+
+// 查询报警详情
+export function alarmDetail(id) {
+  return request({
+    url: '/alarm/detail/' + id,
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+    }
+  })
+}
diff --git a/src/api/allDict.js b/src/api/allDict.js
index c567eb2..e7f9bc8 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -69,3 +69,11 @@
     method: 'get'
   })
 }
+
+// 报警内容
+export function getAlarmContent() {
+  return request({
+    url: '/dict/code/alarmContent',
+    method: 'get'
+  })
+}
diff --git a/src/permission.js b/src/permission.js
index c673350..fd3a535 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -14,7 +14,6 @@
   NProgress.start() // 加载进度条
   // 如果有token
   if (getToken()) {
-    console.log('to Path:' + to.path)
     // 登录后进入登录页
     if (to.path === '/login') {
       next({ path: '/login' })
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 64e8d5e..5d734c2 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -193,5 +193,32 @@
         meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
       }
     ]
+  },
+  {
+    path: '/alarm',
+    component: Layout,
+    redirect: '/alarm',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/alarm'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/alarm/list'], keepAlive: true }
+      }
+    ]
   }
 ]
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1b0e44b..73313ab 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,15 +44,12 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    console.log(tmp)
-
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
-        console.log(tmp.path + '->' + tmp.children[0].path)
         tmp.redirect = tmp.children[0].path
       }
       res.push(tmp)
@@ -66,12 +63,10 @@
 }
 
 function filterRedirect(routes) {
-  console.log('filterRedirect')
   const sysroutes = routes.filter(route => route.meta.isSys)
   const menuroutes = routes.filter(route => !route.meta.isSys)
   for (const sys of sysroutes) {
     const firstmenu = menuroutes.find(route => route.meta.sys === sys.path)
-    console.log(sys.path + ':' + firstmenu.path)
     sys.redirect = firstmenu.path
   }
   return [...sysroutes, ...menuroutes]
@@ -128,8 +123,6 @@
     },
     // 获取用户权限
     GetMenus({ commit, state }, currentSystem) {
-      // console.log('in store.permission.js:GetMenus:')
-      console.log('获取' + currentSystem.name + '的菜单')
       return new Promise((resolve, reject) => {
         // const params = {
         //   parentCode: currentSystem.code
diff --git a/src/views/alarm/alarmCancel.vue b/src/views/alarm/alarmCancel.vue
new file mode 100644
index 0000000..03bf52f
--- /dev/null
+++ b/src/views/alarm/alarmCancel.vue
@@ -0,0 +1,116 @@
+<!-- 取消报警 -->
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :close-on-click-modal="false" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="dataForm" label-well-code="right" label-width="120px">
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="取消报警原因" prop="reason">
+            <el-radio-group v-model="dataForm.reason">
+              <el-radio label="已解决" border>已解决</el-radio>
+              <el-radio label="无需处理" border>无需处理</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="dataForm.remark" type="text" />
+          </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>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { alarmCancel } from '@/api/alarm'
+
+export default {
+  name: 'AlarmCancel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,detail
+      dataForm: {
+        id: '', // id
+        reason: '', // 取消原因
+        remark: '' // 备注
+      }, // 表单
+      rules: {
+        reason: [{ required: true, message: '消警原因不能为空', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      textMap: {
+        detail: '取消报警'
+      }, // 表头显示标题
+      btnLoading: true // 保存按钮是否不允许点击
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.btnLoading = false
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+
+      if (dialogStatus === 'detail') {
+        // 清除
+        this.dataForm = {
+          id: row.id,
+          reason: '',
+          remark: ''
+        }
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.btnLoading = true
+
+      this.updateData()
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          alarmCancel(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('消警成功')
+
+              // 关闭对话框，并刷新列表的记录
+              this.dialogFormVisible = false
+              this.$emit('refreshList')
+            } else {
+              this.btnLoading = false
+              this.$message.error(response.message)
+            }
+          }).catch(() => {
+            this.btnLoading = false
+          })
+        } else {
+          this.btnLoading = false
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .dialog-footer {
+    margin-top: -20px;
+    text-align: center;
+  }
+</style>
diff --git a/src/views/alarm/alarmDetail.vue b/src/views/alarm/alarmDetail.vue
new file mode 100644
index 0000000..617d580
--- /dev/null
+++ b/src/views/alarm/alarmDetail.vue
@@ -0,0 +1,177 @@
+<!-- 报警详情 -->
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :close-on-click-modal="false" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :model="dataForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警编号">
+            <el-input v-model.trim="dataForm.alarmCode" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="报警时间">
+            <el-input v-model.trim="dataForm.alarmTime" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警状态">
+            <el-input v-model.trim="dataForm.validStr" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="区域名称">
+            <el-input v-model.trim="dataForm.areaPosition" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警内容">
+            <el-input v-model.trim="dataForm.alarmContent" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-show="dataForm.alarmValue !== ''" label="报警数值">
+            <el-input v-model.trim="dataForm.alarmValueStr" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号">
+            <el-input v-model.trim="dataForm.devcode" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备名称">
+            <el-input v-model.trim="dataForm.devName" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属防护">
+            <el-input v-model.trim="dataForm.areaType" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row v-show="!dataForm.valid" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="取消报警原因">
+            <el-input v-model.trim="dataForm.reason" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row v-show="!dataForm.valid" :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注">
+            <el-input v-model.trim="dataForm.remark" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+  </el-dialog>
+</template>
+
+<script>
+import { alarmDetail } from '@/api/alarm'
+
+export default {
+  name: 'AlarmDetail',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,detail
+      dataForm: {
+        id: '', // id
+        alarmCode: '', // 报警编号
+        alarmTime: '', // 报警事件
+        valid: '', // 报警状态
+        validStr: '', // 报警状态中文
+        areaPosition: '', // 区域名称
+        alarmContent: '', // 报警内容
+        alarmValue: '', // 报警值
+        alarmValueStr: '', // 报警值格式化
+        devcode: '', // 设备编号
+        devName: '', // 设备名
+        areaType: '', // 所属防护
+        reason: '', // 取消报警原因
+        remark: '' // 备注
+      }, // 表单
+      textMap: {
+        detail: '报警详情'
+      }, // 表头显示标题
+      isDetailMode: false // 是否详情模式
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+
+        this.dataForm = {
+          id: row.id
+        }
+
+        alarmDetail(this.dataForm.id).then(response => {
+          if (response.code === 200) {
+            this.dataForm = {
+              id: row.id,
+              alarmCode: response.data.alarmCode,
+              alarmTime: response.data.alarmTimeFmt,
+              areaPosition: response.data.areaPosition,
+              alarmContent: response.data.alarmContent,
+              alarmValue: response.data.alarmValue,
+              valid: response.data.valid,
+              devcode: response.data.devcode,
+              devName: response.data.devName,
+              reason: response.data.reson,
+              remark: response.data.remark
+            }
+
+            // 格式化报警状态
+            if (response.data.valid === 1) {
+              this.dataForm.validStr = '正在报警'
+            } else {
+              this.dataForm.validStr = '已消警'
+            }
+
+            // 格式化报警数值
+            if (response.data.alarmContent.indexOf('温度') >= 0) {
+              this.dataForm.alarmValueStr = response.data.alarmValue + '（℃）'
+            } else if (response.data.alarmContent.indexOf('湿度') >= 0) {
+              this.dataForm.alarmValueStr = response.data.alarmValue + '（%）'
+            }
+          }
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .dialog-footer {
+    margin-top: -20px;
+    text-align: center;
+  }
+</style>
diff --git a/src/views/alarm/alarmList.vue b/src/views/alarm/alarmList.vue
new file mode 100644
index 0000000..be50016
--- /dev/null
+++ b/src/views/alarm/alarmList.vue
@@ -0,0 +1,280 @@
+<!--报警记录-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <div class="search-left">
+        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+          <el-row>
+            <el-col :span="4">
+              <el-form-item class="selectForm-container-item">
+                <el-input v-model.trim="listQuery.alarmCode" placeholder="报警编号" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.alarmContent" placeholder="报警内容" clearable>
+                  <el-option v-for="item in alarmContents" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.areaId" placeholder="区域" clearable filterable>
+                  <el-option v-for="item in regions" :key="item.id" :label="item.name" :value="item.id"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="selectForm-container-item">
+                <el-date-picker
+                  v-model="timeRange"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="4" class="search-right">
+              <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small">导出</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border @selection-change="handleSelectionChange">
+        <!--序号列-->
+        <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-button v-if="column.value === 'alarmCode'" type="text" @click="detailAlarm(scope.row)">{{ scope.row[column.value] }}</el-button>
+            <el-button v-else-if="column.value === 'devcode'" type="text" @click="detailDevice(scope.row)">{{ scope.row[column.value] }}</el-button>
+            <span v-else-if="column.value === 'valid'" :class="column.class">{{ formatStatus(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <!--操作列-->
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="detail(scope.row)">位置</el-button>
+            <el-button v-if="hasPerm('/car/update')" type="text" @click="edit(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="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+
+    <device-detail ref="devDetail" />
+    <alarm-detail ref="alarmDetail" />
+  </div>
+</template>
+
+<script>
+import { getAlarmList } from '@/api/alarm'
+import { getRegion } from '@/api/area'
+import { getDetailDevice } from '@/api/device'
+import { getAlarmContent } from '@/api/allDict'
+import { formatToString } from '@/utils/calendarUtil'
+import DeviceDetail from '@/views/deviceManage/deviceDetail'
+import AlarmDetail from '@/views/alarm/alarmDetail'
+
+export default {
+  name: 'CarList',
+  components: { DeviceDetail, AlarmDetail },
+  data() {
+    return {
+      listQuery: {
+        alarmCode: '',
+        alarmContent: '',
+        areaType: '',
+        areaId: '',
+        startTime: '',
+        endTime: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '报警编号',
+          value: 'alarmCode',
+          align: 'center'
+        },
+        {
+          text: '报警内容',
+          value: 'alarmContent',
+          align: 'center'
+        },
+        {
+          text: '区域名称',
+          value: 'areaPosition',
+          align: 'center'
+        },
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '报警时间',
+          value: 'alarmTime',
+          align: 'center',
+          width: 160
+        },
+        {
+          text: '报警状态',
+          value: 'valid',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      alarmContents: [],
+      regions: [],
+      timeRange: [],
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      dialogFormVisible: false,
+      dialogDetailVisible: false
+    }
+  },
+  watch: {
+    timeRange: function(newV) {
+      if (newV) {
+        this.listQuery.startTime = formatToString(newV[0], 'DATE')
+        this.listQuery.endTime = formatToString(newV[1], 'DATE')
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
+      this.fetchData()
+    }
+  },
+  created() {
+    this.fetchAlarmContentsData()
+    this.fetchRegionsData()
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    detailAlarm(row) {
+      this.dialogDetailVisible = true
+      this.$refs.alarmDetail.initDialog('detail', this.dialogDetailVisible, row)
+    },
+    detailDevice(row) {
+      getDetailDevice(row.deviceId).then(response => {
+        if (response.code === 200) {
+          this.dialogFormVisible = true
+          this.$refs.devDetail.initDialog('detail', this.dialogFormVisible, response.data)
+        }
+      })
+    },
+    formatStatus(valid) {
+      if (valid === 1) {
+        return '正在报警'
+      } else if (valid === 0) {
+        return '已消警'
+      } else {
+        return '-'
+      }
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    fetchAlarmContentsData() {
+      getAlarmContent().then(response => {
+        this.alarmContents = response.data
+      })
+    },
+    fetchRegionsData() {
+      getRegion({ limit: 1000, areaType: this.listQuery.areaType }).then(response => {
+        this.regions = response.data.rows
+      })
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getAlarmList(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+        } else {
+          this.$message.error(response.message)
+        }
+        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()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .app-container{
+    margin-bottom:20px
+  }
+  .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>

diff --git a/src/api/alarm.js b/src/api/alarm.js
index 6e60037..f17086b 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -1,28 +1,39 @@
 import request from '@/utils/request'
 
-// 查询采集报警列表
-export function getCollectAlarmList(params) {
+// 查询当前报警列表
+export function getAlarmNowList(params) {
   return request({
-    url: '/irisGraAlarm/listPage',
+    url: '/alarm/listPage',
     method: 'get',
     params
   })
 }
 
-// 查询识别报警列表
-export function getRecognizeAlarmList(params) {
+// 查询历史报警记录
+export function getAlarmList(params) {
   return request({
-    url: '/recognition/alarms',
+    url: '/alarm/listPage',
     method: 'get',
     params
   })
 }
 
-// 查询识别报警详情
-export function getRecognizeAlarmDetail(params) {
+// 取消报警
+export function alarmCancel(params) {
   return request({
-    url: '/recognition/alarmDetail',
-    method: 'get',
+    url: '/alarm/cancel',
+    method: 'post',
     params
   })
 }
+
+// 查询报警详情
+export function alarmDetail(id) {
+  return request({
+    url: '/alarm/detail/' + id,
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+    }
+  })
+}
diff --git a/src/api/allDict.js b/src/api/allDict.js
index c567eb2..e7f9bc8 100644
--- a/src/api/allDict.js
+++ b/src/api/allDict.js
@@ -69,3 +69,11 @@
     method: 'get'
   })
 }
+
+// 报警内容
+export function getAlarmContent() {
+  return request({
+    url: '/dict/code/alarmContent',
+    method: 'get'
+  })
+}
diff --git a/src/permission.js b/src/permission.js
index c673350..fd3a535 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -14,7 +14,6 @@
   NProgress.start() // 加载进度条
   // 如果有token
   if (getToken()) {
-    console.log('to Path:' + to.path)
     // 登录后进入登录页
     if (to.path === '/login') {
       next({ path: '/login' })
diff --git a/src/router/modules/doorSys.js b/src/router/modules/doorSys.js
index 64e8d5e..5d734c2 100644
--- a/src/router/modules/doorSys.js
+++ b/src/router/modules/doorSys.js
@@ -193,5 +193,32 @@
         meta: { title: '车辆进出记录', icon: '', permission: ['/statistics/inOutCar'], keepAlive: true }
       }
     ]
+  },
+  {
+    path: '/alarm',
+    component: Layout,
+    redirect: '/alarm',
+    name: 'Alarm',
+    alwaysShow: true,
+    meta: {
+      title: '报警管理',
+      icon: 'icon-alarm', // 图标
+      permission: ['/alarm'], // 权限名称
+      sys: '/door'
+    },
+    children: [
+      {
+        path: '/alarm/now',
+        name: 'AlarmNow',
+        component: () => import('@/views/alarm/alarmNow'),
+        meta: { title: '当前报警', icon: '', permission: ['/alarm/now'], keepAlive: true }
+      },
+      {
+        path: '/alarm/list',
+        name: 'AlarmList',
+        component: () => import('@/views/alarm/alarmList'),
+        meta: { title: '报警记录', icon: '', permission: ['/alarm/list'], keepAlive: true }
+      }
+    ]
   }
 ]
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1b0e44b..73313ab 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,15 +44,12 @@
   // 遍历每一个路由，判断是否有权限
   routes.forEach(route => {
     const tmp = { ...route }
-    console.log(tmp)
-
     const menu = getMenu(menus, tmp)
     if (menu) { // 如果有权限,添加该路由,并根据url的icon更新图标
       tmp.meta.icon = menu.icon // 给route更新icon
       tmp.meta.title = menu.name // 给route更新名称
       if (tmp.children) {
         tmp.children = filterAsyncRouter(tmp.children, menus)
-        console.log(tmp.path + '->' + tmp.children[0].path)
         tmp.redirect = tmp.children[0].path
       }
       res.push(tmp)
@@ -66,12 +63,10 @@
 }
 
 function filterRedirect(routes) {
-  console.log('filterRedirect')
   const sysroutes = routes.filter(route => route.meta.isSys)
   const menuroutes = routes.filter(route => !route.meta.isSys)
   for (const sys of sysroutes) {
     const firstmenu = menuroutes.find(route => route.meta.sys === sys.path)
-    console.log(sys.path + ':' + firstmenu.path)
     sys.redirect = firstmenu.path
   }
   return [...sysroutes, ...menuroutes]
@@ -128,8 +123,6 @@
     },
     // 获取用户权限
     GetMenus({ commit, state }, currentSystem) {
-      // console.log('in store.permission.js:GetMenus:')
-      console.log('获取' + currentSystem.name + '的菜单')
       return new Promise((resolve, reject) => {
         // const params = {
         //   parentCode: currentSystem.code
diff --git a/src/views/alarm/alarmCancel.vue b/src/views/alarm/alarmCancel.vue
new file mode 100644
index 0000000..03bf52f
--- /dev/null
+++ b/src/views/alarm/alarmCancel.vue
@@ -0,0 +1,116 @@
+<!-- 取消报警 -->
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :close-on-click-modal="false" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :rules="rules" :model="dataForm" label-well-code="right" label-width="120px">
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="取消报警原因" prop="reason">
+            <el-radio-group v-model="dataForm.reason">
+              <el-radio label="已解决" border>已解决</el-radio>
+              <el-radio label="无需处理" border>无需处理</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model.trim="dataForm.remark" type="text" />
+          </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>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { alarmCancel } from '@/api/alarm'
+
+export default {
+  name: 'AlarmCancel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,detail
+      dataForm: {
+        id: '', // id
+        reason: '', // 取消原因
+        remark: '' // 备注
+      }, // 表单
+      rules: {
+        reason: [{ required: true, message: '消警原因不能为空', trigger: ['blur', 'change'] }]
+      }, // 前端校验规则
+      textMap: {
+        detail: '取消报警'
+      }, // 表头显示标题
+      btnLoading: true // 保存按钮是否不允许点击
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.btnLoading = false
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+
+      if (dialogStatus === 'detail') {
+        // 清除
+        this.dataForm = {
+          id: row.id,
+          reason: '',
+          remark: ''
+        }
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      }
+    },
+    // 保存数据
+    saveData: function() {
+      this.btnLoading = true
+
+      this.updateData()
+    },
+    // 修改数据
+    updateData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          alarmCancel(this.dataForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('消警成功')
+
+              // 关闭对话框，并刷新列表的记录
+              this.dialogFormVisible = false
+              this.$emit('refreshList')
+            } else {
+              this.btnLoading = false
+              this.$message.error(response.message)
+            }
+          }).catch(() => {
+            this.btnLoading = false
+          })
+        } else {
+          this.btnLoading = false
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .dialog-footer {
+    margin-top: -20px;
+    text-align: center;
+  }
+</style>
diff --git a/src/views/alarm/alarmDetail.vue b/src/views/alarm/alarmDetail.vue
new file mode 100644
index 0000000..617d580
--- /dev/null
+++ b/src/views/alarm/alarmDetail.vue
@@ -0,0 +1,177 @@
+<!-- 报警详情 -->
+<template>
+  <el-dialog :title="textMap[dialogStatus]" :close-on-click-modal="false" :visible.sync="dialogFormVisible" append-to-body>
+    <el-form ref="dataForm" :model="dataForm" label-well-code="right" label-width="110px">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警编号">
+            <el-input v-model.trim="dataForm.alarmCode" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="报警时间">
+            <el-input v-model.trim="dataForm.alarmTime" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警状态">
+            <el-input v-model.trim="dataForm.validStr" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="区域名称">
+            <el-input v-model.trim="dataForm.areaPosition" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报警内容">
+            <el-input v-model.trim="dataForm.alarmContent" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-show="dataForm.alarmValue !== ''" label="报警数值">
+            <el-input v-model.trim="dataForm.alarmValueStr" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号">
+            <el-input v-model.trim="dataForm.devcode" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备名称">
+            <el-input v-model.trim="dataForm.devName" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属防护">
+            <el-input v-model.trim="dataForm.areaType" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row v-show="!dataForm.valid" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="取消报警原因">
+            <el-input v-model.trim="dataForm.reason" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row v-show="!dataForm.valid" :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="备注">
+            <el-input v-model.trim="dataForm.remark" :disabled="isDetailMode" type="text" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+  </el-dialog>
+</template>
+
+<script>
+import { alarmDetail } from '@/api/alarm'
+
+export default {
+  name: 'AlarmDetail',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框是否显示
+      dialogStatus: '', // 对话框类型：create,update,detail
+      dataForm: {
+        id: '', // id
+        alarmCode: '', // 报警编号
+        alarmTime: '', // 报警事件
+        valid: '', // 报警状态
+        validStr: '', // 报警状态中文
+        areaPosition: '', // 区域名称
+        alarmContent: '', // 报警内容
+        alarmValue: '', // 报警值
+        alarmValueStr: '', // 报警值格式化
+        devcode: '', // 设备编号
+        devName: '', // 设备名
+        areaType: '', // 所属防护
+        reason: '', // 取消报警原因
+        remark: '' // 备注
+      }, // 表单
+      textMap: {
+        detail: '报警详情'
+      }, // 表头显示标题
+      isDetailMode: false // 是否详情模式
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
+      this.dialogStatus = dialogStatus
+      this.dialogFormVisible = dialogFormVisible
+
+      if (dialogStatus === 'detail') {
+        this.isDetailMode = true
+
+        this.dataForm = {
+          id: row.id
+        }
+
+        alarmDetail(this.dataForm.id).then(response => {
+          if (response.code === 200) {
+            this.dataForm = {
+              id: row.id,
+              alarmCode: response.data.alarmCode,
+              alarmTime: response.data.alarmTimeFmt,
+              areaPosition: response.data.areaPosition,
+              alarmContent: response.data.alarmContent,
+              alarmValue: response.data.alarmValue,
+              valid: response.data.valid,
+              devcode: response.data.devcode,
+              devName: response.data.devName,
+              reason: response.data.reson,
+              remark: response.data.remark
+            }
+
+            // 格式化报警状态
+            if (response.data.valid === 1) {
+              this.dataForm.validStr = '正在报警'
+            } else {
+              this.dataForm.validStr = '已消警'
+            }
+
+            // 格式化报警数值
+            if (response.data.alarmContent.indexOf('温度') >= 0) {
+              this.dataForm.alarmValueStr = response.data.alarmValue + '（℃）'
+            } else if (response.data.alarmContent.indexOf('湿度') >= 0) {
+              this.dataForm.alarmValueStr = response.data.alarmValue + '（%）'
+            }
+          }
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+  .el-date-editor{
+    width: 100%;
+  }
+  .dialog-footer {
+    margin-top: -20px;
+    text-align: center;
+  }
+</style>
diff --git a/src/views/alarm/alarmList.vue b/src/views/alarm/alarmList.vue
new file mode 100644
index 0000000..be50016
--- /dev/null
+++ b/src/views/alarm/alarmList.vue
@@ -0,0 +1,280 @@
+<!--报警记录-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <div class="search-left">
+        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+          <el-row>
+            <el-col :span="4">
+              <el-form-item class="selectForm-container-item">
+                <el-input v-model.trim="listQuery.alarmCode" placeholder="报警编号" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.alarmContent" placeholder="报警内容" clearable>
+                  <el-option v-for="item in alarmContents" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.areaId" placeholder="区域" clearable filterable>
+                  <el-option v-for="item in regions" :key="item.id" :label="item.name" :value="item.id"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="selectForm-container-item">
+                <el-date-picker
+                  v-model="timeRange"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="4" class="search-right">
+              <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small">导出</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border @selection-change="handleSelectionChange">
+        <!--序号列-->
+        <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-button v-if="column.value === 'alarmCode'" type="text" @click="detailAlarm(scope.row)">{{ scope.row[column.value] }}</el-button>
+            <el-button v-else-if="column.value === 'devcode'" type="text" @click="detailDevice(scope.row)">{{ scope.row[column.value] }}</el-button>
+            <span v-else-if="column.value === 'valid'" :class="column.class">{{ formatStatus(scope.row[column.value]) }}</span>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <!--操作列-->
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="detail(scope.row)">位置</el-button>
+            <el-button v-if="hasPerm('/car/update')" type="text" @click="edit(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="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+
+    <device-detail ref="devDetail" />
+    <alarm-detail ref="alarmDetail" />
+  </div>
+</template>
+
+<script>
+import { getAlarmList } from '@/api/alarm'
+import { getRegion } from '@/api/area'
+import { getDetailDevice } from '@/api/device'
+import { getAlarmContent } from '@/api/allDict'
+import { formatToString } from '@/utils/calendarUtil'
+import DeviceDetail from '@/views/deviceManage/deviceDetail'
+import AlarmDetail from '@/views/alarm/alarmDetail'
+
+export default {
+  name: 'CarList',
+  components: { DeviceDetail, AlarmDetail },
+  data() {
+    return {
+      listQuery: {
+        alarmCode: '',
+        alarmContent: '',
+        areaType: '',
+        areaId: '',
+        startTime: '',
+        endTime: '',
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '报警编号',
+          value: 'alarmCode',
+          align: 'center'
+        },
+        {
+          text: '报警内容',
+          value: 'alarmContent',
+          align: 'center'
+        },
+        {
+          text: '区域名称',
+          value: 'areaPosition',
+          align: 'center'
+        },
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '报警时间',
+          value: 'alarmTime',
+          align: 'center',
+          width: 160
+        },
+        {
+          text: '报警状态',
+          value: 'valid',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      alarmContents: [],
+      regions: [],
+      timeRange: [],
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      dialogFormVisible: false,
+      dialogDetailVisible: false
+    }
+  },
+  watch: {
+    timeRange: function(newV) {
+      if (newV) {
+        this.listQuery.startTime = formatToString(newV[0], 'DATE')
+        this.listQuery.endTime = formatToString(newV[1], 'DATE')
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
+      this.fetchData()
+    }
+  },
+  created() {
+    this.fetchAlarmContentsData()
+    this.fetchRegionsData()
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    detailAlarm(row) {
+      this.dialogDetailVisible = true
+      this.$refs.alarmDetail.initDialog('detail', this.dialogDetailVisible, row)
+    },
+    detailDevice(row) {
+      getDetailDevice(row.deviceId).then(response => {
+        if (response.code === 200) {
+          this.dialogFormVisible = true
+          this.$refs.devDetail.initDialog('detail', this.dialogFormVisible, response.data)
+        }
+      })
+    },
+    formatStatus(valid) {
+      if (valid === 1) {
+        return '正在报警'
+      } else if (valid === 0) {
+        return '已消警'
+      } else {
+        return '-'
+      }
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    fetchAlarmContentsData() {
+      getAlarmContent().then(response => {
+        this.alarmContents = response.data
+      })
+    },
+    fetchRegionsData() {
+      getRegion({ limit: 1000, areaType: this.listQuery.areaType }).then(response => {
+        this.regions = response.data.rows
+      })
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getAlarmList(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+        } else {
+          this.$message.error(response.message)
+        }
+        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()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .app-container{
+    margin-bottom:20px
+  }
+  .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>
diff --git a/src/views/alarm/alarmNow.vue b/src/views/alarm/alarmNow.vue
new file mode 100644
index 0000000..fa8ba38
--- /dev/null
+++ b/src/views/alarm/alarmNow.vue
@@ -0,0 +1,279 @@
+<!--当前报警-->
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <div class="search-left">
+        <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+          <el-row>
+            <el-col :span="4">
+              <el-form-item class="selectForm-container-item">
+                <el-input v-model.trim="listQuery.alarmCode" placeholder="报警编号" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.alarmContent" placeholder="报警内容" clearable>
+                  <el-option v-for="item in alarmContents" :key="item.value" :label="item.name" :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item class="selectForm-container-item">
+                <el-select v-model="listQuery.areaId" placeholder="区域" clearable filterable>
+                  <el-option v-for="item in regions" :key="item.id" :label="item.name" :value="item.id"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="selectForm-container-item">
+                <el-date-picker
+                  v-model="timeRange"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="4" class="search-right">
+              <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!--查询结果Table显示-->
+    <div>
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button class="edit_btn" size="small">导出</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" row-class-name="small-row-class" border>
+        <!--序号列-->
+        <el-table-column :index="indexMethod" align="center" type="index" label="#" width="55"/>
+        <!--内容列-->
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-button v-if="column.value === 'alarmCode'" type="text" @click="detailAlarm(scope.row)">{{ scope.row[column.value] }}</el-button>
+            <el-button v-else-if="column.value === 'devcode'" type="text" @click="detailDevice(scope.row)">{{ scope.row[column.value] }}</el-button>
+            <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <!--操作列-->
+        <el-table-column label="操作" align="center" width="180">
+          <template slot-scope="scope">
+            <el-button v-if="hasPerm('/car/update')" type="text" @click="alarmCancel(scope.row)">取消报警</el-button>
+            <el-button type="text" @click="detail(scope.row)">位置</el-button>
+            <el-button v-if="hasPerm('/car/update')" type="text" @click="edit(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="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+
+    <device-detail ref="devDetail" />
+    <alarm-cancel ref="alarmCancel" @refreshList="fetchData" />
+    <alarm-detail ref="alarmDetail" />
+  </div>
+</template>
+
+<script>
+import { getAlarmNowList } from '@/api/alarm'
+import { getRegion } from '@/api/area'
+import { getDetailDevice } from '@/api/device'
+import { getAlarmContent } from '@/api/allDict'
+import { formatToString } from '@/utils/calendarUtil'
+import DeviceDetail from '@/views/deviceManage/deviceDetail'
+import AlarmCancel from '@/views/alarm/alarmCancel'
+import AlarmDetail from '@/views/alarm/alarmDetail'
+
+export default {
+  name: 'AlarmNow',
+  components: { DeviceDetail, AlarmCancel, AlarmDetail },
+  data() {
+    return {
+      listQuery: {
+        alarmCode: '',
+        alarmContent: '',
+        areaType: '',
+        areaId: '',
+        startTime: '',
+        endTime: '',
+        valid: 1, // 1表示当前报警
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      columns: [
+        {
+          text: '报警编号',
+          value: 'alarmCode',
+          align: 'center'
+        },
+        {
+          text: '报警内容',
+          value: 'alarmContent',
+          align: 'center'
+        },
+        {
+          text: '区域名称',
+          value: 'areaPosition',
+          align: 'center'
+        },
+        // {
+        //   text: '所属防护',
+        //   value: 'areaType',
+        //   align: 'center'
+        // },
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '报警时间',
+          value: 'alarmTime',
+          align: 'center',
+          width: 160
+        }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      alarmContents: [],
+      regions: [],
+      timeRange: [],
+      listLoading: false, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      dialogFormVisible: false,
+      dialogCancelVisible: false,
+      dialogDetailVisible: false
+    }
+  },
+  watch: {
+    timeRange: function(newV) {
+      if (newV) {
+        this.listQuery.startTime = formatToString(newV[0], 'DATE')
+        this.listQuery.endTime = formatToString(newV[1], 'DATE')
+      } else {
+        this.listQuery.startTime = ''
+        this.listQuery.endTime = ''
+      }
+      this.fetchData()
+    }
+  },
+  created() {
+    this.fetchAlarmContentsData()
+    this.fetchRegionsData()
+    this.fetchData()// 获取数据
+  },
+  methods: {
+    alarmCancel(row) {
+      this.dialogCancelVisible = true
+      this.$refs.alarmCancel.initDialog('detail', this.dialogCancelVisible, row)
+    },
+    detailAlarm(row) {
+      this.dialogDetailVisible = true
+      this.$refs.alarmDetail.initDialog('detail', this.dialogDetailVisible, row)
+    },
+    detailDevice(row) {
+      getDetailDevice(row.deviceId).then(response => {
+        if (response.code === 200) {
+          this.dialogFormVisible = true
+          this.$refs.devDetail.initDialog('detail', this.dialogFormVisible, response.data)
+        }
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    fetchAlarmContentsData() {
+      getAlarmContent().then(response => {
+        this.alarmContents = response.data
+      })
+    },
+    fetchRegionsData() {
+      getRegion({ limit: 1000, areaType: this.listQuery.areaType }).then(response => {
+        this.regions = response.data.rows
+      })
+    },
+    // 获取列表
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getAlarmNowList(this.listQuery).then(response => {
+        if (response.code === 200) {
+          this.list = response.data.rows
+          this.total = parseInt(response.data.total)
+        } else {
+          this.$message.error(response.message)
+        }
+        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()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  $tableTitleHeight:46px;
+  .app-container{
+    margin-bottom:20px
+  }
+  .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>