diff --git a/src/views/oneCompany/alarmList/components/list.vue b/src/views/oneCompany/alarmList/components/list.vue
index 892e8fa..64997eb 100644
--- a/src/views/oneCompany/alarmList/components/list.vue
+++ b/src/views/oneCompany/alarmList/components/list.vue
@@ -2,18 +2,18 @@
   <div class="app-container">
     <el-form ref="searchForm" :model="searchForm" label-width="80px">
       <el-row>
-        <el-col :span="6">
+        <el-col :span="4">
           <el-form-item label="报警状态" prop="status">
             <el-select v-model="searchForm.status" style="width: 100%;">
-              <el-option v-for="item in statusList" :key="item.DICTIONARIES_ID" :value="item.BIANMA" :label="item.NAME"/>
+              <el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.name"/>
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="4" label-width="10px" style="margin-left: 20px">
           <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getList">
             搜索
           </el-button>
-          <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="chongzhi">
+          <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="resetSearchForm">
             重置
           </el-button>
         </el-col>
@@ -116,13 +116,14 @@ export default {
       searchForm: {
         status: ''
       },
-      statusList: []
+      alarmStatusList: []
     }
   },
   created() {
     this.getList()
     this.getEditMyInfo()
     this.getDictTreeData()
+    this.getDictionary()
   },
   methods: {
     getRowKey(row) {
@@ -141,15 +142,22 @@ export default {
       ).then((data) => {
         this.loginUserID = data.pd.USER_ID				// 主职角色ID
       }).catch((e) => {
-
       })
     },
+    resetSearchForm() {
+      this.searchForm = {
+        status: ''
+      }
+      this.getList()
+    },
     // 获取列表
     getList() {
       this.listLoading = true
       requestFN(
         '/dingWei/getAlarmList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
-        {}
+        {
+          status: this.searchForm.status
+        }
       ).then((data) => {
         this.listLoading = false
         this.varList = data.list
@@ -158,6 +166,19 @@ export default {
         this.listLoading = false
       })
     },
+    getDictionary() {
+      requestFN(
+        '/dingWei/getDictionary',
+        {}
+      ).then((data) => {
+        if (data.code === 200) {
+          var alarmStatusList = JSON.parse(data.AlarmStatus)
+          this.alarmStatusList = alarmStatusList
+        }
+      }).catch((e) => {
+
+      })
+    },
     goInfo(id, type) {
       this.dialogManageAlarm = true
       this.dialogType = type