diff --git a/src/config/getData2.js b/src/config/getData2.js
index 04cf190..0ef6ab4 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -171,3 +171,22 @@ export const orderOperation = (type, uuid, ouuid) => post('api/hand/orderOperati
 
 // 1.查询工单及明细
 export const handOrder = () => post('api/hand/order', {})
+
+/**
+ * 设备报警记录
+ */
+export const queryDeviceErrorInfo = (code, ecode, info, page, size) => post('api/hand/queryDeviceErrorInfo', {
+  device_code: code,
+  error_code: ecode,
+  error_info: info,
+  page: page,
+  size: size
+})
+// export const queryDeviceErrorInfo = (code, ecode, info) => {
+//   let res = {
+//     code: '1',
+//     result: [{device_code: '001', error_code: ' 99', error_info: '11', error_time: '11'}, {device_code: '002', error_code: ' 99', error_info: '11', error_time: '11'}, {device_code: '003', error_code: ' 99', error_info: '11', error_time: '11'}, {device_code: '004', error_code: ' 99', error_info: '11', error_time: '11'}, {device_code: '005', error_code: ' 99', error_info: '11', error_time: '11'}, {device_code: '006', error_code: ' 99', error_info: '11', error_time: '11'}, {device_code: '007', error_code: ' 99', error_info: '11', error_time: '11'}, {device_code: '008', error_code: ' 99', error_info: '11', error_time: '11'}, {device_code: '009', error_code: ' 99', error_info: '11', error_time: '11'}, {device_code: '010', error_code: ' 99', error_info: '11', error_time: '11'}],
+//     desc: 'wuwuw'
+//   }
+//   return res
+// }
diff --git a/src/pages/proj/AlarmRecord.vue b/src/pages/proj/AlarmRecord.vue
new file mode 100644
index 0000000..c6cbfad
--- /dev/null
+++ b/src/pages/proj/AlarmRecord.vue
@@ -0,0 +1,131 @@
+<template>
+  <div class="inner-wrap">
+    <nav-bar title="指令管理"></nav-bar>
+    <div class="wrap2" v-infinite-scroll="loadMore" infinite-scroll-disabled="busy" infinite-scroll-distance="0" infinite-scroll-immediate-check="false">
+      <div class="wrap-filter-button">
+        <div class="wrap-filter clearfix">
+          <div class="fl filter_item">
+            <div class="filter_input">
+              <label class="filter-label">报警设备</label>
+              <div class="iliblock">
+                <input type="text" class="input" v-model="val1">
+              </div>
+            </div>
+          </div>
+          <div class="fl filter_item">
+            <div class="filter_input">
+              <label class="filter-label">报警编码</label>
+              <div class="iliblock">
+                <input type="text" class="input" v-model="val2">
+              </div>
+            </div>
+          </div>
+          <div class="fl filter_item">
+            <div class="filter_input">
+              <label class="filter-label">报警信息</label>
+              <div class="iliblock">
+                <input type="text" class="input" v-model="val3">
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="wrap-button clearfix">
+          <button class="button--primary" @click="toSearch()">查询</button>
+        </div>
+      </div>
+      <section class="grid-wraper mgt15">
+        <table class="filter-table">
+          <tr>
+            <th>报警设备</th>
+            <th>报警编码</th>
+            <th>报警信息</th>
+            <th>报警时间</th>
+          </tr>
+          <tr v-for="(e,i) in dataList" :key="i">
+            <td>{{e.device_code}}</td>
+            <td>{{e.error_code}}</td>
+            <td>{{e.error_info}}</td>
+            <td>{{e.error_time}}</td>
+          </tr>
+        </table>
+      </section>
+      <div class="loading-tips">{{desc}}</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {queryDeviceErrorInfo} from '@config/getData2.js'
+import NavBar from '@components/NavBar.vue'
+export default {
+  name: 'AlarmRecord',
+  components: {
+    NavBar
+  },
+  data () {
+    return {
+      dataList: [],
+      val1: '',
+      val2: '',
+      val3: '',
+      page: 1,
+      size: '10',
+      busy: false,
+      desc: ''
+    }
+  },
+  methods: {
+    async _queryDeviceErrorInfo () {
+      let res = await queryDeviceErrorInfo(this.val1, this.val2, this.val3, this.page + '', this.size)
+      if (res.code === '1') {
+        this.dataList = []
+        this.dataList = [...res.result]
+        if (res.result.length < 10) {
+          this.busy = true
+          this.desc = '已加载全部数据'
+        }
+      } else {
+        this.Dialog(res.desc)
+        this.desc = res.desc
+      }
+    },
+    async loadMore () {
+      this.busy = true
+      this.page++
+      let res = await queryDeviceErrorInfo(this.val1, this.val2, this.val3, this.page + '', this.size)
+      if (res.code === '1') {
+        this.dataList = [...this.dataList, ...res.result]
+        if (res.result.length < 10) {
+          this.busy = true
+          this.desc = '已加载全部数据'
+        } else {
+          this.busy = false
+        }
+      } else {
+        this.Dialog(res.desc)
+        this.desc = res.desc
+      }
+    },
+    toSearch () {
+      this.page = 1
+      this.busy = false
+      this.desc = ''
+      this._queryDeviceErrorInfo()
+    }
+  }
+}
+</script>
+<style lang="stylus" scoped>
+.wrap2
+  height calc(100% - .4rem)
+  overflow-y auto
+.wrap-filter-button
+  padding 0.05rem 0.2rem
+  margin 0
+.wrap-button
+  margin 0.01rem auto
+.filter-table
+  margin 0.08rem 0
+.filter_item
+  margin 0.08rem 0 0 0
+</style>
diff --git a/src/pages/proj/HomePage.vue b/src/pages/proj/HomePage.vue
index cd8263c..506bd60 100644
--- a/src/pages/proj/HomePage.vue
+++ b/src/pages/proj/HomePage.vue
@@ -21,6 +21,7 @@
         <li @click="toSure('OrderManage')">工单管理</li>
         <!-- <li @click="toSure('SignalSend')">信号下发</li> -->
         <li @click="toSure('RunOperate')">运行操作</li>
+        <li @click="toSure('AlarmRecord')">设备报警记录</li>
       </ul>
     </div>
   </div>
diff --git a/src/router/index.js b/src/router/index.js
index eaf2d3c..311b06f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,6 +8,7 @@ const SignalSend = r => require.ensure([], () => r(require('@page/proj/SignalSen
 const RunOperate = r => require.ensure([], () => r(require('@page/proj/RunOperate')), 'RunOperate')
 const SortingManage = r => require.ensure([], () => r(require('@page/proj/SortingManage')), 'SortingManage')
 const OrderManage = r => require.ensure([], () => r(require('@page/proj/OrderManage')), 'OrderManage')
+const AlarmRecord = r => require.ensure([], () => r(require('@page/proj/AlarmRecord')), 'AlarmRecord')
 Vue.use(Router)
 
 export default new Router({
@@ -40,6 +41,10 @@ export default new Router({
     {
       path: '/OrderManage',
       component: OrderManage
+    },
+    {
+      path: '/AlarmRecord',
+      component: AlarmRecord
     }
   ]
 })