diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 96d7e6b..0388e34 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -105,16 +105,16 @@
 import HandlePrompt from './components/HandlePrompt'
 import { isOperation } from '@/utils/permission'
 import { dateToString, getLastWeek } from '@/utils/formatDate'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 export default {
   name: 'ListAlarmNow',
-  components: {AreaSelectTree, HandlePrompt, infoWell },
+  components: { AreaSelectTree, HandlePrompt, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -261,11 +261,12 @@
           type: 'warning'
         }
       ).then(() => {
-          const formData = {alarmId: id}
-          // console.log(formData)
-          cancelAlarm(formData).then(response => {
-            this.$message.success('取消报警成功')
-          })
+        const formData = { alarmId: id }
+        // console.log(formData)
+        cancelAlarm(formData).then(response => {
+          this.$message.success('取消报警成功')
+          this.fetchData(false)
+        })
       })
     },
     // 取消报警,调用结束工单接口

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 96d7e6b..0388e34 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -105,16 +105,16 @@
 import HandlePrompt from './components/HandlePrompt'
 import { isOperation } from '@/utils/permission'
 import { dateToString, getLastWeek } from '@/utils/formatDate'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 export default {
   name: 'ListAlarmNow',
-  components: {AreaSelectTree, HandlePrompt, infoWell },
+  components: { AreaSelectTree, HandlePrompt, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -261,11 +261,12 @@
           type: 'warning'
         }
       ).then(() => {
-          const formData = {alarmId: id}
-          // console.log(formData)
-          cancelAlarm(formData).then(response => {
-            this.$message.success('取消报警成功')
-          })
+        const formData = { alarmId: id }
+        // console.log(formData)
+        cancelAlarm(formData).then(response => {
+          this.$message.success('取消报警成功')
+          this.fetchData(false)
+        })
       })
     },
     // 取消报警,调用结束工单接口
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index a0f1cde..db1d2bd 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -95,17 +95,17 @@
 import { dateToString, getLastWeek } from '@/utils/formatDate'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 
 export default {
   name: 'ListAlarmRecords',
-  components: {AreaSelectTree, infoWell },
+  components: { AreaSelectTree, infoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         alarmType: '',
-        areaId:'',
+        areaId: '',
         alarmContentType: '',
         beginTime: '',
         endTime: '',
@@ -132,17 +132,17 @@
           value: 'position',
           align: 'center'
         },
-        {
-          text: '告警类型',
-          value: 'alarmTypeName',
-          align: 'center'
-        },
-        {
-          text: '告警等级',
-          value: 'alarmLevel',
-          align: 'center',
-          level: true
-        },
+        // {
+        //   text: '告警类型',
+        //   value: 'alarmTypeName',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '告警等级',
+        //   value: 'alarmLevel',
+        //   align: 'center',
+        //   level: true
+        // },
         {
           text: '告警原因',
           value: 'alarmContentName',
@@ -155,18 +155,22 @@
           align: 'center',
           class: 'warning'
         },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
+        // {
+        //   text: '权属单位',
+        //   value: 'deptName',
+        //   align: 'center'
+        // },
         {
           text: '告警时间',
           value: 'alarmTime',
           width: 170,
           align: 'center'
+        },
+        {
+          text: '告警状态',
+          value: 'statusName',
+          align: 'center'
         }
-
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
@@ -188,7 +192,7 @@
   watch: {
     alarmType(val) {
       this.listQuery.alarmContentType = ''
-      if (val && val !== '') {
+      if (val) {
         this.fetchAlarmContentType()
       } else {
         this.alarmContentTypeList = []
@@ -245,7 +249,6 @@
         this.fetchData(false)
       } else {
         this.listQuery.keywords = ''
-        this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
         this.listQuery.endTime = dateToString(new Date(), 'y-m-d') + ' 23:59:59'
         this.listQuery.beginTime = dateToString(getLastWeek(), 'y-m-d') + ' 00:00:00'
@@ -313,7 +316,9 @@
         this.listQuery.offset = 1
       }
       getAlarmList(this.listQuery).then(response => {
-        this.list = response.data.rows
+        this.list = response.data.rows.map(item => {
+          return { ...item, statusName: item.statusName === '正在报警' ? '正在告警' : '已消警' }
+        })
         this.total = parseInt(response.data.total)
         this.listLoading = false
       })