diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index d7dc9b2..97345d9 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -285,6 +285,7 @@
         // console.log(this.listQuery)
         batchCancel(this.listQuery).then(res => {
           this.$message.success('批量消警成功')
+          this.fetchData(false)
         })
       })
     },

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index d7dc9b2..97345d9 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -285,6 +285,7 @@
         // console.log(this.listQuery)
         batchCancel(this.listQuery).then(res => {
           this.$message.success('批量消警成功')
+          this.fetchData(false)
         })
       })
     },
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index ef519d6..bf03fd1 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -192,14 +192,14 @@
           value: 'totalCount',
           align: 'center',
           width: 80
-        },
-        {
-          text: '阀门状态',
-          value: 'statusName',
-          align: 'center',
-          width: 80
         }
         // {
+        //   text: '阀门状态',
+        //   value: 'statusName',
+        //   align: 'center',
+        //   width: 80
+        // }
+        // {
         //   text: '分区',
         //   value: 'deptName',
         //   align: 'center'

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index d7dc9b2..97345d9 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -285,6 +285,7 @@
         // console.log(this.listQuery)
         batchCancel(this.listQuery).then(res => {
           this.$message.success('批量消警成功')
+          this.fetchData(false)
         })
       })
     },
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index ef519d6..bf03fd1 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -192,14 +192,14 @@
           value: 'totalCount',
           align: 'center',
           width: 80
-        },
-        {
-          text: '阀门状态',
-          value: 'statusName',
-          align: 'center',
-          width: 80
         }
         // {
+        //   text: '阀门状态',
+        //   value: 'statusName',
+        //   align: 'center',
+        //   width: 80
+        // }
+        // {
         //   text: '分区',
         //   value: 'deptName',
         //   align: 'center'
diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue
index cc79e85..14f7243 100644
--- a/src/views/dataManage/deviceData/watchSevenDay.vue
+++ b/src/views/dataManage/deviceData/watchSevenDay.vue
@@ -105,7 +105,7 @@
       this.fetchData() // 传row
     },
     fetchData() {
-      if (this.timeRange.length === 2) {
+      if (this.timeRange && this.timeRange.length === 2) {
         this.listQuery.beginTime = this.timeRange[0]
         this.listQuery.endTime = this.timeRange[1]
       } else {

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index d7dc9b2..97345d9 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -285,6 +285,7 @@
         // console.log(this.listQuery)
         batchCancel(this.listQuery).then(res => {
           this.$message.success('批量消警成功')
+          this.fetchData(false)
         })
       })
     },
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index ef519d6..bf03fd1 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -192,14 +192,14 @@
           value: 'totalCount',
           align: 'center',
           width: 80
-        },
-        {
-          text: '阀门状态',
-          value: 'statusName',
-          align: 'center',
-          width: 80
         }
         // {
+        //   text: '阀门状态',
+        //   value: 'statusName',
+        //   align: 'center',
+        //   width: 80
+        // }
+        // {
         //   text: '分区',
         //   value: 'deptName',
         //   align: 'center'
diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue
index cc79e85..14f7243 100644
--- a/src/views/dataManage/deviceData/watchSevenDay.vue
+++ b/src/views/dataManage/deviceData/watchSevenDay.vue
@@ -105,7 +105,7 @@
       this.fetchData() // 传row
     },
     fetchData() {
-      if (this.timeRange.length === 2) {
+      if (this.timeRange && this.timeRange.length === 2) {
         this.listQuery.beginTime = this.timeRange[0]
         this.listQuery.endTime = this.timeRange[1]
       } else {
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index d8b75b2..160dab7 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -48,17 +48,6 @@
 
     }
   },
-  watch: {
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
-    }
-  },
   methods: {
     initDialog: function(dialogFormVisible, row = null) {
       this.listQuery.devCode = row.devcode
@@ -70,7 +59,7 @@
     },
     fetchData() {
       this.loading1 = true
-      if (this.timeRange.length == 2) {
+      if (this.timeRange && this.timeRange.length === 2) {
         this.listQuery.beginTime = this.timeRange[0]
         this.listQuery.endTime = this.timeRange[1]
       } else {