diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 9e2b0b9..95a6853 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -1,5 +1,43 @@
 <template>
   <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item" prop="keywords">
+            <el-input v-model.trim="listQuery.keywords" placeholder="闸井编号" clearable/>
+          </el-form-item>
+          <el-form-item v-if="showAlarmType" class="selectForm-container-item" prop="alarmType">
+            <el-select v-model="listQuery.alarmType" placeholder="告警类型" clearable>
+              <el-option
+                v-for="item in alarmTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="alarmType">
+            <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" clearable>
+              <el-option
+                v-for="item in alarmContentTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item" prop="beginTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="报警开始时间"
+              end-placeholder="报警结束时间"/>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        </el-row>
+      </el-form>
+    </div>
     <!--查询结果Table显示-->
     <div>
       <el-row class="table-title">
@@ -42,7 +80,7 @@
 
 <script>
 import infoWell from '@/views/wellManage/infoWell'
-import { getAlarmList, batchExportAlarm } from '@/api/alarm'
+import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm'
 
 export default {
   name: 'ListAlarmNow',
@@ -50,12 +88,18 @@
   data() {
     return {
       listQuery: {
+        keywords: '',
+        alarmType: '',
+        alarmContentType: '',
+        beginTime: '',
+        endTime: '',
         status: '1',
         offset: 1,
         limit: 20,
         sort: '',
         order: ''
       }, // 筛选条件
+      timeRange: [], // 时间范围
       columns: [
         {
           text: '设备编号',
@@ -119,15 +163,53 @@
       }, // 权属单位树形下拉菜单
       deptTreeList: null, // 组织树列表数据
       showDeptTree: 0, // 是否显示权属单位下拉
-      showDeviceType: true, // 是否显示设备类型下拉
+      alarmTypeList: [], // 告警类型列表
+      alarmContentTypeList: [], // 告警内容类型列表
+      showAlarmType: true, // 是否显示告警类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
       wellShow: false, // 是否显示闸井详情
       detailShow: false // 是否显示编辑框
     }
   },
+  computed: {
+    alarmType() {
+      return this.listQuery.alarmType
+    }
+  },
+  watch: {
+    alarmType(val) {
+      this.listQuery.alarmContentType = ''
+      if (val && val !== '') {
+        this.fetchAlarmContentType()
+      } else {
+        this.alarmContentTypeList = []
+      }
+    },
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
   created() {
-    this.fetchData()// 获取数据
+    console.log('now created')
+    this.fetchAlarmType()
+    // this.fetchData()// 获取数据
+  },
+  activated() {
+    console.log('now activated')
+    this.listQuery.keywords = ''
+    this.listQuery.alarmType = ''
+    this.listQuery.alarmContentType = ''
+    this.listQuery.beginTime = ''
+    this.listQuery.endTime = ''
+    this.timeRange = []
+    this.fetchData(false)
   },
   methods: {
     formatValue(row, column, cellValue) {
@@ -187,6 +269,27 @@
         this.listLoading = false
       })
     },
+    // 获取告警类型
+    fetchAlarmType() {
+      getAlarmType().then(response => {
+        this.alarmTypeList = response.data
+        if (this.alarmTypeList.length <= 1) {
+          this.showAlarmType = false
+        }
+      })
+    },
+    // 获取告警内容类别
+    fetchAlarmContentType() {
+      this.alarmContentTypeList = []
+      getAlarmContentType(this.listQuery.alarmType).then(response => {
+        const supportDeviceTypes = this.$store.getters.deviceTypes
+        for (const item of response.data.list) {
+          if (supportDeviceTypes.indexOf(item.deviceType) !== -1) {
+            this.alarmContentTypeList.push(item)
+          }
+        }
+      })
+    },
     indexMethod(index) {
       return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
     },