diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index 4a558d1..9dcc38f 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -34,15 +34,9 @@
   },
   mounted() {
     this.fetchData()
-    // 模拟数据
-    // this.chartData.rows = [
-    //   { 'date': '9月20日', 'alarmTimes': 153, 'alarmWells': 43 },
-    //   { 'date': '9月21日', 'alarmTimes': 150, 'alarmWells': 30 },
-    //   { 'date': '9月22日', 'alarmTimes': 143, 'alarmWells': 23 },
-    //   { 'date': '9月23日', 'alarmTimes': 173, 'alarmWells': 23 },
-    //   { 'date': '9月24日', 'alarmTimes': 272, 'alarmWells': 52 },
-    //   { 'date': '9月25日', 'alarmTimes': 253, 'alarmWells': 53 }
-    // ]
+  },
+  activated() {
+    this.fetchData()
   },
   methods: {
     fetchData() {

diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index 4a558d1..9dcc38f 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -34,15 +34,9 @@
   },
   mounted() {
     this.fetchData()
-    // 模拟数据
-    // this.chartData.rows = [
-    //   { 'date': '9月20日', 'alarmTimes': 153, 'alarmWells': 43 },
-    //   { 'date': '9月21日', 'alarmTimes': 150, 'alarmWells': 30 },
-    //   { 'date': '9月22日', 'alarmTimes': 143, 'alarmWells': 23 },
-    //   { 'date': '9月23日', 'alarmTimes': 173, 'alarmWells': 23 },
-    //   { 'date': '9月24日', 'alarmTimes': 272, 'alarmWells': 52 },
-    //   { 'date': '9月25日', 'alarmTimes': 253, 'alarmWells': 53 }
-    // ]
+  },
+  activated() {
+    this.fetchData()
   },
   methods: {
     fetchData() {
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
deleted file mode 100644
index 890325f..0000000
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-
-</template>
-
-<script>
-export default {
-  name: 'AlarmNowList',
-  data() {
-    this.title = {
-      text: '7日报警趋势'
-    }
-    this.chartSettings = {
-      labelMap: {
-        'alarmWells': '报警井数',
-        'alarmTimes': '报警次数'
-      },
-      metrics: ['alarmTimes', 'alarmWells'],
-      dimension: ['date']
-    }
-    return {
-      chartData: {
-        columns: ['date', 'alarmTimes', 'alarmWells', '下单率'],
-        rows: [
-          { 'date': '9月20日', 'alarmTimes': 1393, 'alarmWells': 1093, '下单率': 0.32 },
-          { 'date': '9月21日', 'alarmTimes': 3530, 'alarmWells': 3230, '下单率': 0.26 },
-          { 'date': '9月22日', 'alarmTimes': 2923, 'alarmWells': 2623, '下单率': 0.76 },
-          { 'date': '9月23日', 'alarmTimes': 1723, 'alarmWells': 1423, '下单率': 0.49 },
-          { 'date': '9月24日', 'alarmTimes': 3792, 'alarmWells': 3492, '下单率': 0.323 },
-          { 'date': '9月25日', 'alarmTimes': 4593, 'alarmWells': 4293, '下单率': 0.78 }
-        ]
-      }
-    }
-  }
-}
-</script>

diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index 4a558d1..9dcc38f 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -34,15 +34,9 @@
   },
   mounted() {
     this.fetchData()
-    // 模拟数据
-    // this.chartData.rows = [
-    //   { 'date': '9月20日', 'alarmTimes': 153, 'alarmWells': 43 },
-    //   { 'date': '9月21日', 'alarmTimes': 150, 'alarmWells': 30 },
-    //   { 'date': '9月22日', 'alarmTimes': 143, 'alarmWells': 23 },
-    //   { 'date': '9月23日', 'alarmTimes': 173, 'alarmWells': 23 },
-    //   { 'date': '9月24日', 'alarmTimes': 272, 'alarmWells': 52 },
-    //   { 'date': '9月25日', 'alarmTimes': 253, 'alarmWells': 53 }
-    // ]
+  },
+  activated() {
+    this.fetchData()
   },
   methods: {
     fetchData() {
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
deleted file mode 100644
index 890325f..0000000
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-
-</template>
-
-<script>
-export default {
-  name: 'AlarmNowList',
-  data() {
-    this.title = {
-      text: '7日报警趋势'
-    }
-    this.chartSettings = {
-      labelMap: {
-        'alarmWells': '报警井数',
-        'alarmTimes': '报警次数'
-      },
-      metrics: ['alarmTimes', 'alarmWells'],
-      dimension: ['date']
-    }
-    return {
-      chartData: {
-        columns: ['date', 'alarmTimes', 'alarmWells', '下单率'],
-        rows: [
-          { 'date': '9月20日', 'alarmTimes': 1393, 'alarmWells': 1093, '下单率': 0.32 },
-          { 'date': '9月21日', 'alarmTimes': 3530, 'alarmWells': 3230, '下单率': 0.26 },
-          { 'date': '9月22日', 'alarmTimes': 2923, 'alarmWells': 2623, '下单率': 0.76 },
-          { 'date': '9月23日', 'alarmTimes': 1723, 'alarmWells': 1423, '下单率': 0.49 },
-          { 'date': '9月24日', 'alarmTimes': 3792, 'alarmWells': 3492, '下单率': 0.323 },
-          { 'date': '9月25日', 'alarmTimes': 4593, 'alarmWells': 4293, '下单率': 0.78 }
-        ]
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index 7ff9ba3..0b2776a 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -52,6 +52,9 @@
     //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
     // ]
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       deviceStaticsByType().then(response => {

diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index 4a558d1..9dcc38f 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -34,15 +34,9 @@
   },
   mounted() {
     this.fetchData()
-    // 模拟数据
-    // this.chartData.rows = [
-    //   { 'date': '9月20日', 'alarmTimes': 153, 'alarmWells': 43 },
-    //   { 'date': '9月21日', 'alarmTimes': 150, 'alarmWells': 30 },
-    //   { 'date': '9月22日', 'alarmTimes': 143, 'alarmWells': 23 },
-    //   { 'date': '9月23日', 'alarmTimes': 173, 'alarmWells': 23 },
-    //   { 'date': '9月24日', 'alarmTimes': 272, 'alarmWells': 52 },
-    //   { 'date': '9月25日', 'alarmTimes': 253, 'alarmWells': 53 }
-    // ]
+  },
+  activated() {
+    this.fetchData()
   },
   methods: {
     fetchData() {
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
deleted file mode 100644
index 890325f..0000000
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-
-</template>
-
-<script>
-export default {
-  name: 'AlarmNowList',
-  data() {
-    this.title = {
-      text: '7日报警趋势'
-    }
-    this.chartSettings = {
-      labelMap: {
-        'alarmWells': '报警井数',
-        'alarmTimes': '报警次数'
-      },
-      metrics: ['alarmTimes', 'alarmWells'],
-      dimension: ['date']
-    }
-    return {
-      chartData: {
-        columns: ['date', 'alarmTimes', 'alarmWells', '下单率'],
-        rows: [
-          { 'date': '9月20日', 'alarmTimes': 1393, 'alarmWells': 1093, '下单率': 0.32 },
-          { 'date': '9月21日', 'alarmTimes': 3530, 'alarmWells': 3230, '下单率': 0.26 },
-          { 'date': '9月22日', 'alarmTimes': 2923, 'alarmWells': 2623, '下单率': 0.76 },
-          { 'date': '9月23日', 'alarmTimes': 1723, 'alarmWells': 1423, '下单率': 0.49 },
-          { 'date': '9月24日', 'alarmTimes': 3792, 'alarmWells': 3492, '下单率': 0.323 },
-          { 'date': '9月25日', 'alarmTimes': 4593, 'alarmWells': 4293, '下单率': 0.78 }
-        ]
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index 7ff9ba3..0b2776a 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -52,6 +52,9 @@
     //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
     // ]
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       deviceStaticsByType().then(response => {
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..295c995 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -31,7 +31,9 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
+    this.fetchData()
+  },
+  activated() {
     this.fetchData()
   },
   methods: {

diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index 4a558d1..9dcc38f 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -34,15 +34,9 @@
   },
   mounted() {
     this.fetchData()
-    // 模拟数据
-    // this.chartData.rows = [
-    //   { 'date': '9月20日', 'alarmTimes': 153, 'alarmWells': 43 },
-    //   { 'date': '9月21日', 'alarmTimes': 150, 'alarmWells': 30 },
-    //   { 'date': '9月22日', 'alarmTimes': 143, 'alarmWells': 23 },
-    //   { 'date': '9月23日', 'alarmTimes': 173, 'alarmWells': 23 },
-    //   { 'date': '9月24日', 'alarmTimes': 272, 'alarmWells': 52 },
-    //   { 'date': '9月25日', 'alarmTimes': 253, 'alarmWells': 53 }
-    // ]
+  },
+  activated() {
+    this.fetchData()
   },
   methods: {
     fetchData() {
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
deleted file mode 100644
index 890325f..0000000
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-
-</template>
-
-<script>
-export default {
-  name: 'AlarmNowList',
-  data() {
-    this.title = {
-      text: '7日报警趋势'
-    }
-    this.chartSettings = {
-      labelMap: {
-        'alarmWells': '报警井数',
-        'alarmTimes': '报警次数'
-      },
-      metrics: ['alarmTimes', 'alarmWells'],
-      dimension: ['date']
-    }
-    return {
-      chartData: {
-        columns: ['date', 'alarmTimes', 'alarmWells', '下单率'],
-        rows: [
-          { 'date': '9月20日', 'alarmTimes': 1393, 'alarmWells': 1093, '下单率': 0.32 },
-          { 'date': '9月21日', 'alarmTimes': 3530, 'alarmWells': 3230, '下单率': 0.26 },
-          { 'date': '9月22日', 'alarmTimes': 2923, 'alarmWells': 2623, '下单率': 0.76 },
-          { 'date': '9月23日', 'alarmTimes': 1723, 'alarmWells': 1423, '下单率': 0.49 },
-          { 'date': '9月24日', 'alarmTimes': 3792, 'alarmWells': 3492, '下单率': 0.323 },
-          { 'date': '9月25日', 'alarmTimes': 4593, 'alarmWells': 4293, '下单率': 0.78 }
-        ]
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index 7ff9ba3..0b2776a 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -52,6 +52,9 @@
     //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
     // ]
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       deviceStaticsByType().then(response => {
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..295c995 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -31,7 +31,9 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
+    this.fetchData()
+  },
+  activated() {
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dashboard/components/JobByStatus.vue b/src/views/dashboard/components/JobByStatus.vue
index 9e0d75f..1109bb0 100644
--- a/src/views/dashboard/components/JobByStatus.vue
+++ b/src/views/dashboard/components/JobByStatus.vue
@@ -32,17 +32,10 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deptName': '电力公司', 'beforeGet': 139, 'beforeConfirm': 109, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '开拓热力', 'beforeGet': 353, 'beforeConfirm': 323, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '市政集团', 'beforeGet': 292, 'beforeConfirm': 262, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '博大网信', 'beforeGet': 172, 'beforeConfirm': 142, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '信息办', 'beforeGet': 379, 'beforeConfirm': 349, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '燃气四分', 'beforeGet': 459, 'beforeConfirm': 429, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '其他', 'beforeGet': 459, 'beforeConfirm': 429, 'inHandle': 123, 'over': 456 }
-    // ]
+  },
+  activated() {
+    this.fetchData()
   },
   methods: {
     fetchData() {

diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index 4a558d1..9dcc38f 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -34,15 +34,9 @@
   },
   mounted() {
     this.fetchData()
-    // 模拟数据
-    // this.chartData.rows = [
-    //   { 'date': '9月20日', 'alarmTimes': 153, 'alarmWells': 43 },
-    //   { 'date': '9月21日', 'alarmTimes': 150, 'alarmWells': 30 },
-    //   { 'date': '9月22日', 'alarmTimes': 143, 'alarmWells': 23 },
-    //   { 'date': '9月23日', 'alarmTimes': 173, 'alarmWells': 23 },
-    //   { 'date': '9月24日', 'alarmTimes': 272, 'alarmWells': 52 },
-    //   { 'date': '9月25日', 'alarmTimes': 253, 'alarmWells': 53 }
-    // ]
+  },
+  activated() {
+    this.fetchData()
   },
   methods: {
     fetchData() {
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
deleted file mode 100644
index 890325f..0000000
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-
-</template>
-
-<script>
-export default {
-  name: 'AlarmNowList',
-  data() {
-    this.title = {
-      text: '7日报警趋势'
-    }
-    this.chartSettings = {
-      labelMap: {
-        'alarmWells': '报警井数',
-        'alarmTimes': '报警次数'
-      },
-      metrics: ['alarmTimes', 'alarmWells'],
-      dimension: ['date']
-    }
-    return {
-      chartData: {
-        columns: ['date', 'alarmTimes', 'alarmWells', '下单率'],
-        rows: [
-          { 'date': '9月20日', 'alarmTimes': 1393, 'alarmWells': 1093, '下单率': 0.32 },
-          { 'date': '9月21日', 'alarmTimes': 3530, 'alarmWells': 3230, '下单率': 0.26 },
-          { 'date': '9月22日', 'alarmTimes': 2923, 'alarmWells': 2623, '下单率': 0.76 },
-          { 'date': '9月23日', 'alarmTimes': 1723, 'alarmWells': 1423, '下单率': 0.49 },
-          { 'date': '9月24日', 'alarmTimes': 3792, 'alarmWells': 3492, '下单率': 0.323 },
-          { 'date': '9月25日', 'alarmTimes': 4593, 'alarmWells': 4293, '下单率': 0.78 }
-        ]
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index 7ff9ba3..0b2776a 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -52,6 +52,9 @@
     //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
     // ]
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       deviceStaticsByType().then(response => {
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..295c995 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -31,7 +31,9 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
+    this.fetchData()
+  },
+  activated() {
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dashboard/components/JobByStatus.vue b/src/views/dashboard/components/JobByStatus.vue
index 9e0d75f..1109bb0 100644
--- a/src/views/dashboard/components/JobByStatus.vue
+++ b/src/views/dashboard/components/JobByStatus.vue
@@ -32,17 +32,10 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deptName': '电力公司', 'beforeGet': 139, 'beforeConfirm': 109, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '开拓热力', 'beforeGet': 353, 'beforeConfirm': 323, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '市政集团', 'beforeGet': 292, 'beforeConfirm': 262, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '博大网信', 'beforeGet': 172, 'beforeConfirm': 142, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '信息办', 'beforeGet': 379, 'beforeConfirm': 349, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '燃气四分', 'beforeGet': 459, 'beforeConfirm': 429, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '其他', 'beforeGet': 459, 'beforeConfirm': 429, 'inHandle': 123, 'over': 456 }
-    // ]
+  },
+  activated() {
+    this.fetchData()
   },
   methods: {
     fetchData() {
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index bbda98e..df0acd2 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -55,7 +55,18 @@
     this.getAlarmCount()
     this.getJobCount()
   },
+  activated() {
+    this.getWellCount()
+    this.getDeviceCount()
+    this.getAlarmCount()
+    this.getJobCount()
+  },
   methods: {
+    // 刷新报警和工单数
+    refreshData() {
+      this.getAlarmCount()
+      this.getJobCount()
+    },
     goPage(path) {
       this.$router.push(path)
     },

diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index 4a558d1..9dcc38f 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -34,15 +34,9 @@
   },
   mounted() {
     this.fetchData()
-    // 模拟数据
-    // this.chartData.rows = [
-    //   { 'date': '9月20日', 'alarmTimes': 153, 'alarmWells': 43 },
-    //   { 'date': '9月21日', 'alarmTimes': 150, 'alarmWells': 30 },
-    //   { 'date': '9月22日', 'alarmTimes': 143, 'alarmWells': 23 },
-    //   { 'date': '9月23日', 'alarmTimes': 173, 'alarmWells': 23 },
-    //   { 'date': '9月24日', 'alarmTimes': 272, 'alarmWells': 52 },
-    //   { 'date': '9月25日', 'alarmTimes': 253, 'alarmWells': 53 }
-    // ]
+  },
+  activated() {
+    this.fetchData()
   },
   methods: {
     fetchData() {
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
deleted file mode 100644
index 890325f..0000000
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-
-</template>
-
-<script>
-export default {
-  name: 'AlarmNowList',
-  data() {
-    this.title = {
-      text: '7日报警趋势'
-    }
-    this.chartSettings = {
-      labelMap: {
-        'alarmWells': '报警井数',
-        'alarmTimes': '报警次数'
-      },
-      metrics: ['alarmTimes', 'alarmWells'],
-      dimension: ['date']
-    }
-    return {
-      chartData: {
-        columns: ['date', 'alarmTimes', 'alarmWells', '下单率'],
-        rows: [
-          { 'date': '9月20日', 'alarmTimes': 1393, 'alarmWells': 1093, '下单率': 0.32 },
-          { 'date': '9月21日', 'alarmTimes': 3530, 'alarmWells': 3230, '下单率': 0.26 },
-          { 'date': '9月22日', 'alarmTimes': 2923, 'alarmWells': 2623, '下单率': 0.76 },
-          { 'date': '9月23日', 'alarmTimes': 1723, 'alarmWells': 1423, '下单率': 0.49 },
-          { 'date': '9月24日', 'alarmTimes': 3792, 'alarmWells': 3492, '下单率': 0.323 },
-          { 'date': '9月25日', 'alarmTimes': 4593, 'alarmWells': 4293, '下单率': 0.78 }
-        ]
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index 7ff9ba3..0b2776a 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -52,6 +52,9 @@
     //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
     // ]
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       deviceStaticsByType().then(response => {
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..295c995 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -31,7 +31,9 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
+    this.fetchData()
+  },
+  activated() {
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dashboard/components/JobByStatus.vue b/src/views/dashboard/components/JobByStatus.vue
index 9e0d75f..1109bb0 100644
--- a/src/views/dashboard/components/JobByStatus.vue
+++ b/src/views/dashboard/components/JobByStatus.vue
@@ -32,17 +32,10 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deptName': '电力公司', 'beforeGet': 139, 'beforeConfirm': 109, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '开拓热力', 'beforeGet': 353, 'beforeConfirm': 323, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '市政集团', 'beforeGet': 292, 'beforeConfirm': 262, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '博大网信', 'beforeGet': 172, 'beforeConfirm': 142, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '信息办', 'beforeGet': 379, 'beforeConfirm': 349, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '燃气四分', 'beforeGet': 459, 'beforeConfirm': 429, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '其他', 'beforeGet': 459, 'beforeConfirm': 429, 'inHandle': 123, 'over': 456 }
-    // ]
+  },
+  activated() {
+    this.fetchData()
   },
   methods: {
     fetchData() {
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index bbda98e..df0acd2 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -55,7 +55,18 @@
     this.getAlarmCount()
     this.getJobCount()
   },
+  activated() {
+    this.getWellCount()
+    this.getDeviceCount()
+    this.getAlarmCount()
+    this.getJobCount()
+  },
   methods: {
+    // 刷新报警和工单数
+    refreshData() {
+      this.getAlarmCount()
+      this.getJobCount()
+    },
     goPage(path) {
       this.$router.push(path)
     },
diff --git a/src/views/dashboard/components/WellCountByBfzt.vue b/src/views/dashboard/components/WellCountByBfzt.vue
index ae8b829..1fc15f6 100644
--- a/src/views/dashboard/components/WellCountByBfzt.vue
+++ b/src/views/dashboard/components/WellCountByBfzt.vue
@@ -30,7 +30,9 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
+    this.fetchData()
+  },
+  activated() {
     this.fetchData()
   },
   methods: {

diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index 4a558d1..9dcc38f 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -34,15 +34,9 @@
   },
   mounted() {
     this.fetchData()
-    // 模拟数据
-    // this.chartData.rows = [
-    //   { 'date': '9月20日', 'alarmTimes': 153, 'alarmWells': 43 },
-    //   { 'date': '9月21日', 'alarmTimes': 150, 'alarmWells': 30 },
-    //   { 'date': '9月22日', 'alarmTimes': 143, 'alarmWells': 23 },
-    //   { 'date': '9月23日', 'alarmTimes': 173, 'alarmWells': 23 },
-    //   { 'date': '9月24日', 'alarmTimes': 272, 'alarmWells': 52 },
-    //   { 'date': '9月25日', 'alarmTimes': 253, 'alarmWells': 53 }
-    // ]
+  },
+  activated() {
+    this.fetchData()
   },
   methods: {
     fetchData() {
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
deleted file mode 100644
index 890325f..0000000
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-
-</template>
-
-<script>
-export default {
-  name: 'AlarmNowList',
-  data() {
-    this.title = {
-      text: '7日报警趋势'
-    }
-    this.chartSettings = {
-      labelMap: {
-        'alarmWells': '报警井数',
-        'alarmTimes': '报警次数'
-      },
-      metrics: ['alarmTimes', 'alarmWells'],
-      dimension: ['date']
-    }
-    return {
-      chartData: {
-        columns: ['date', 'alarmTimes', 'alarmWells', '下单率'],
-        rows: [
-          { 'date': '9月20日', 'alarmTimes': 1393, 'alarmWells': 1093, '下单率': 0.32 },
-          { 'date': '9月21日', 'alarmTimes': 3530, 'alarmWells': 3230, '下单率': 0.26 },
-          { 'date': '9月22日', 'alarmTimes': 2923, 'alarmWells': 2623, '下单率': 0.76 },
-          { 'date': '9月23日', 'alarmTimes': 1723, 'alarmWells': 1423, '下单率': 0.49 },
-          { 'date': '9月24日', 'alarmTimes': 3792, 'alarmWells': 3492, '下单率': 0.323 },
-          { 'date': '9月25日', 'alarmTimes': 4593, 'alarmWells': 4293, '下单率': 0.78 }
-        ]
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index 7ff9ba3..0b2776a 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -52,6 +52,9 @@
     //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
     // ]
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       deviceStaticsByType().then(response => {
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..295c995 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -31,7 +31,9 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
+    this.fetchData()
+  },
+  activated() {
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dashboard/components/JobByStatus.vue b/src/views/dashboard/components/JobByStatus.vue
index 9e0d75f..1109bb0 100644
--- a/src/views/dashboard/components/JobByStatus.vue
+++ b/src/views/dashboard/components/JobByStatus.vue
@@ -32,17 +32,10 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deptName': '电力公司', 'beforeGet': 139, 'beforeConfirm': 109, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '开拓热力', 'beforeGet': 353, 'beforeConfirm': 323, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '市政集团', 'beforeGet': 292, 'beforeConfirm': 262, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '博大网信', 'beforeGet': 172, 'beforeConfirm': 142, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '信息办', 'beforeGet': 379, 'beforeConfirm': 349, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '燃气四分', 'beforeGet': 459, 'beforeConfirm': 429, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '其他', 'beforeGet': 459, 'beforeConfirm': 429, 'inHandle': 123, 'over': 456 }
-    // ]
+  },
+  activated() {
+    this.fetchData()
   },
   methods: {
     fetchData() {
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index bbda98e..df0acd2 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -55,7 +55,18 @@
     this.getAlarmCount()
     this.getJobCount()
   },
+  activated() {
+    this.getWellCount()
+    this.getDeviceCount()
+    this.getAlarmCount()
+    this.getJobCount()
+  },
   methods: {
+    // 刷新报警和工单数
+    refreshData() {
+      this.getAlarmCount()
+      this.getJobCount()
+    },
     goPage(path) {
       this.$router.push(path)
     },
diff --git a/src/views/dashboard/components/WellCountByBfzt.vue b/src/views/dashboard/components/WellCountByBfzt.vue
index ae8b829..1fc15f6 100644
--- a/src/views/dashboard/components/WellCountByBfzt.vue
+++ b/src/views/dashboard/components/WellCountByBfzt.vue
@@ -30,7 +30,9 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
+    this.fetchData()
+  },
+  activated() {
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 0eef65f..6694f4d 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -42,6 +42,9 @@
   mounted() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       wellStaticByType().then(response => {

diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index 4a558d1..9dcc38f 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -34,15 +34,9 @@
   },
   mounted() {
     this.fetchData()
-    // 模拟数据
-    // this.chartData.rows = [
-    //   { 'date': '9月20日', 'alarmTimes': 153, 'alarmWells': 43 },
-    //   { 'date': '9月21日', 'alarmTimes': 150, 'alarmWells': 30 },
-    //   { 'date': '9月22日', 'alarmTimes': 143, 'alarmWells': 23 },
-    //   { 'date': '9月23日', 'alarmTimes': 173, 'alarmWells': 23 },
-    //   { 'date': '9月24日', 'alarmTimes': 272, 'alarmWells': 52 },
-    //   { 'date': '9月25日', 'alarmTimes': 253, 'alarmWells': 53 }
-    // ]
+  },
+  activated() {
+    this.fetchData()
   },
   methods: {
     fetchData() {
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
deleted file mode 100644
index 890325f..0000000
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-
-</template>
-
-<script>
-export default {
-  name: 'AlarmNowList',
-  data() {
-    this.title = {
-      text: '7日报警趋势'
-    }
-    this.chartSettings = {
-      labelMap: {
-        'alarmWells': '报警井数',
-        'alarmTimes': '报警次数'
-      },
-      metrics: ['alarmTimes', 'alarmWells'],
-      dimension: ['date']
-    }
-    return {
-      chartData: {
-        columns: ['date', 'alarmTimes', 'alarmWells', '下单率'],
-        rows: [
-          { 'date': '9月20日', 'alarmTimes': 1393, 'alarmWells': 1093, '下单率': 0.32 },
-          { 'date': '9月21日', 'alarmTimes': 3530, 'alarmWells': 3230, '下单率': 0.26 },
-          { 'date': '9月22日', 'alarmTimes': 2923, 'alarmWells': 2623, '下单率': 0.76 },
-          { 'date': '9月23日', 'alarmTimes': 1723, 'alarmWells': 1423, '下单率': 0.49 },
-          { 'date': '9月24日', 'alarmTimes': 3792, 'alarmWells': 3492, '下单率': 0.323 },
-          { 'date': '9月25日', 'alarmTimes': 4593, 'alarmWells': 4293, '下单率': 0.78 }
-        ]
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index 7ff9ba3..0b2776a 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -52,6 +52,9 @@
     //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
     // ]
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       deviceStaticsByType().then(response => {
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..295c995 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -31,7 +31,9 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
+    this.fetchData()
+  },
+  activated() {
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dashboard/components/JobByStatus.vue b/src/views/dashboard/components/JobByStatus.vue
index 9e0d75f..1109bb0 100644
--- a/src/views/dashboard/components/JobByStatus.vue
+++ b/src/views/dashboard/components/JobByStatus.vue
@@ -32,17 +32,10 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deptName': '电力公司', 'beforeGet': 139, 'beforeConfirm': 109, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '开拓热力', 'beforeGet': 353, 'beforeConfirm': 323, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '市政集团', 'beforeGet': 292, 'beforeConfirm': 262, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '博大网信', 'beforeGet': 172, 'beforeConfirm': 142, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '信息办', 'beforeGet': 379, 'beforeConfirm': 349, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '燃气四分', 'beforeGet': 459, 'beforeConfirm': 429, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '其他', 'beforeGet': 459, 'beforeConfirm': 429, 'inHandle': 123, 'over': 456 }
-    // ]
+  },
+  activated() {
+    this.fetchData()
   },
   methods: {
     fetchData() {
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index bbda98e..df0acd2 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -55,7 +55,18 @@
     this.getAlarmCount()
     this.getJobCount()
   },
+  activated() {
+    this.getWellCount()
+    this.getDeviceCount()
+    this.getAlarmCount()
+    this.getJobCount()
+  },
   methods: {
+    // 刷新报警和工单数
+    refreshData() {
+      this.getAlarmCount()
+      this.getJobCount()
+    },
     goPage(path) {
       this.$router.push(path)
     },
diff --git a/src/views/dashboard/components/WellCountByBfzt.vue b/src/views/dashboard/components/WellCountByBfzt.vue
index ae8b829..1fc15f6 100644
--- a/src/views/dashboard/components/WellCountByBfzt.vue
+++ b/src/views/dashboard/components/WellCountByBfzt.vue
@@ -30,7 +30,9 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
+    this.fetchData()
+  },
+  activated() {
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 0eef65f..6694f4d 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -42,6 +42,9 @@
   mounted() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       wellStaticByType().then(response => {
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 8a3748c..f456d70 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="dashboard-container">
-    <panel-group/>
+    <panel-group ref="panelgroup"/>
     <el-row>
       <!--井盖布防撤防统计-->
       <el-col :span="10">
@@ -107,8 +107,9 @@
         this.socket.onmessage = function(msg) {
           // 转换为json对象
           const data = JSON.parse(msg.data)
+          console.log(data)
           if (data.type === 'alarm') {
-            this.playAudio()
+            that.$refs.panelgroup.refreshData()
             that.$notify({
               title: '新报警来了',
               // 这里也可以把返回信息加入到message中显示
@@ -121,6 +122,7 @@
                 })
               }
             })
+            that.playAudio()
           } else if (data.type === 'overtimeGet') {
             that.$notify({
               title: '有新超时未接收工单',

diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index 4a558d1..9dcc38f 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -34,15 +34,9 @@
   },
   mounted() {
     this.fetchData()
-    // 模拟数据
-    // this.chartData.rows = [
-    //   { 'date': '9月20日', 'alarmTimes': 153, 'alarmWells': 43 },
-    //   { 'date': '9月21日', 'alarmTimes': 150, 'alarmWells': 30 },
-    //   { 'date': '9月22日', 'alarmTimes': 143, 'alarmWells': 23 },
-    //   { 'date': '9月23日', 'alarmTimes': 173, 'alarmWells': 23 },
-    //   { 'date': '9月24日', 'alarmTimes': 272, 'alarmWells': 52 },
-    //   { 'date': '9月25日', 'alarmTimes': 253, 'alarmWells': 53 }
-    // ]
+  },
+  activated() {
+    this.fetchData()
   },
   methods: {
     fetchData() {
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
deleted file mode 100644
index 890325f..0000000
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-
-</template>
-
-<script>
-export default {
-  name: 'AlarmNowList',
-  data() {
-    this.title = {
-      text: '7日报警趋势'
-    }
-    this.chartSettings = {
-      labelMap: {
-        'alarmWells': '报警井数',
-        'alarmTimes': '报警次数'
-      },
-      metrics: ['alarmTimes', 'alarmWells'],
-      dimension: ['date']
-    }
-    return {
-      chartData: {
-        columns: ['date', 'alarmTimes', 'alarmWells', '下单率'],
-        rows: [
-          { 'date': '9月20日', 'alarmTimes': 1393, 'alarmWells': 1093, '下单率': 0.32 },
-          { 'date': '9月21日', 'alarmTimes': 3530, 'alarmWells': 3230, '下单率': 0.26 },
-          { 'date': '9月22日', 'alarmTimes': 2923, 'alarmWells': 2623, '下单率': 0.76 },
-          { 'date': '9月23日', 'alarmTimes': 1723, 'alarmWells': 1423, '下单率': 0.49 },
-          { 'date': '9月24日', 'alarmTimes': 3792, 'alarmWells': 3492, '下单率': 0.323 },
-          { 'date': '9月25日', 'alarmTimes': 4593, 'alarmWells': 4293, '下单率': 0.78 }
-        ]
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index 7ff9ba3..0b2776a 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -52,6 +52,9 @@
     //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
     // ]
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       deviceStaticsByType().then(response => {
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..295c995 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -31,7 +31,9 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
+    this.fetchData()
+  },
+  activated() {
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dashboard/components/JobByStatus.vue b/src/views/dashboard/components/JobByStatus.vue
index 9e0d75f..1109bb0 100644
--- a/src/views/dashboard/components/JobByStatus.vue
+++ b/src/views/dashboard/components/JobByStatus.vue
@@ -32,17 +32,10 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deptName': '电力公司', 'beforeGet': 139, 'beforeConfirm': 109, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '开拓热力', 'beforeGet': 353, 'beforeConfirm': 323, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '市政集团', 'beforeGet': 292, 'beforeConfirm': 262, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '博大网信', 'beforeGet': 172, 'beforeConfirm': 142, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '信息办', 'beforeGet': 379, 'beforeConfirm': 349, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '燃气四分', 'beforeGet': 459, 'beforeConfirm': 429, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '其他', 'beforeGet': 459, 'beforeConfirm': 429, 'inHandle': 123, 'over': 456 }
-    // ]
+  },
+  activated() {
+    this.fetchData()
   },
   methods: {
     fetchData() {
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index bbda98e..df0acd2 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -55,7 +55,18 @@
     this.getAlarmCount()
     this.getJobCount()
   },
+  activated() {
+    this.getWellCount()
+    this.getDeviceCount()
+    this.getAlarmCount()
+    this.getJobCount()
+  },
   methods: {
+    // 刷新报警和工单数
+    refreshData() {
+      this.getAlarmCount()
+      this.getJobCount()
+    },
     goPage(path) {
       this.$router.push(path)
     },
diff --git a/src/views/dashboard/components/WellCountByBfzt.vue b/src/views/dashboard/components/WellCountByBfzt.vue
index ae8b829..1fc15f6 100644
--- a/src/views/dashboard/components/WellCountByBfzt.vue
+++ b/src/views/dashboard/components/WellCountByBfzt.vue
@@ -30,7 +30,9 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
+    this.fetchData()
+  },
+  activated() {
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 0eef65f..6694f4d 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -42,6 +42,9 @@
   mounted() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       wellStaticByType().then(response => {
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 8a3748c..f456d70 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="dashboard-container">
-    <panel-group/>
+    <panel-group ref="panelgroup"/>
     <el-row>
       <!--井盖布防撤防统计-->
       <el-col :span="10">
@@ -107,8 +107,9 @@
         this.socket.onmessage = function(msg) {
           // 转换为json对象
           const data = JSON.parse(msg.data)
+          console.log(data)
           if (data.type === 'alarm') {
-            this.playAudio()
+            that.$refs.panelgroup.refreshData()
             that.$notify({
               title: '新报警来了',
               // 这里也可以把返回信息加入到message中显示
@@ -121,6 +122,7 @@
                 })
               }
             })
+            that.playAudio()
           } else if (data.type === 'overtimeGet') {
             that.$notify({
               title: '有新超时未接收工单',
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 00cc7d0..09a6e62 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -231,6 +231,7 @@
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.fetchDevice()

diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index 4a558d1..9dcc38f 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -34,15 +34,9 @@
   },
   mounted() {
     this.fetchData()
-    // 模拟数据
-    // this.chartData.rows = [
-    //   { 'date': '9月20日', 'alarmTimes': 153, 'alarmWells': 43 },
-    //   { 'date': '9月21日', 'alarmTimes': 150, 'alarmWells': 30 },
-    //   { 'date': '9月22日', 'alarmTimes': 143, 'alarmWells': 23 },
-    //   { 'date': '9月23日', 'alarmTimes': 173, 'alarmWells': 23 },
-    //   { 'date': '9月24日', 'alarmTimes': 272, 'alarmWells': 52 },
-    //   { 'date': '9月25日', 'alarmTimes': 253, 'alarmWells': 53 }
-    // ]
+  },
+  activated() {
+    this.fetchData()
   },
   methods: {
     fetchData() {
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
deleted file mode 100644
index 890325f..0000000
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-
-</template>
-
-<script>
-export default {
-  name: 'AlarmNowList',
-  data() {
-    this.title = {
-      text: '7日报警趋势'
-    }
-    this.chartSettings = {
-      labelMap: {
-        'alarmWells': '报警井数',
-        'alarmTimes': '报警次数'
-      },
-      metrics: ['alarmTimes', 'alarmWells'],
-      dimension: ['date']
-    }
-    return {
-      chartData: {
-        columns: ['date', 'alarmTimes', 'alarmWells', '下单率'],
-        rows: [
-          { 'date': '9月20日', 'alarmTimes': 1393, 'alarmWells': 1093, '下单率': 0.32 },
-          { 'date': '9月21日', 'alarmTimes': 3530, 'alarmWells': 3230, '下单率': 0.26 },
-          { 'date': '9月22日', 'alarmTimes': 2923, 'alarmWells': 2623, '下单率': 0.76 },
-          { 'date': '9月23日', 'alarmTimes': 1723, 'alarmWells': 1423, '下单率': 0.49 },
-          { 'date': '9月24日', 'alarmTimes': 3792, 'alarmWells': 3492, '下单率': 0.323 },
-          { 'date': '9月25日', 'alarmTimes': 4593, 'alarmWells': 4293, '下单率': 0.78 }
-        ]
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index 7ff9ba3..0b2776a 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -52,6 +52,9 @@
     //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
     // ]
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       deviceStaticsByType().then(response => {
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..295c995 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -31,7 +31,9 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
+    this.fetchData()
+  },
+  activated() {
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dashboard/components/JobByStatus.vue b/src/views/dashboard/components/JobByStatus.vue
index 9e0d75f..1109bb0 100644
--- a/src/views/dashboard/components/JobByStatus.vue
+++ b/src/views/dashboard/components/JobByStatus.vue
@@ -32,17 +32,10 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deptName': '电力公司', 'beforeGet': 139, 'beforeConfirm': 109, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '开拓热力', 'beforeGet': 353, 'beforeConfirm': 323, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '市政集团', 'beforeGet': 292, 'beforeConfirm': 262, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '博大网信', 'beforeGet': 172, 'beforeConfirm': 142, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '信息办', 'beforeGet': 379, 'beforeConfirm': 349, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '燃气四分', 'beforeGet': 459, 'beforeConfirm': 429, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '其他', 'beforeGet': 459, 'beforeConfirm': 429, 'inHandle': 123, 'over': 456 }
-    // ]
+  },
+  activated() {
+    this.fetchData()
   },
   methods: {
     fetchData() {
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index bbda98e..df0acd2 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -55,7 +55,18 @@
     this.getAlarmCount()
     this.getJobCount()
   },
+  activated() {
+    this.getWellCount()
+    this.getDeviceCount()
+    this.getAlarmCount()
+    this.getJobCount()
+  },
   methods: {
+    // 刷新报警和工单数
+    refreshData() {
+      this.getAlarmCount()
+      this.getJobCount()
+    },
     goPage(path) {
       this.$router.push(path)
     },
diff --git a/src/views/dashboard/components/WellCountByBfzt.vue b/src/views/dashboard/components/WellCountByBfzt.vue
index ae8b829..1fc15f6 100644
--- a/src/views/dashboard/components/WellCountByBfzt.vue
+++ b/src/views/dashboard/components/WellCountByBfzt.vue
@@ -30,7 +30,9 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
+    this.fetchData()
+  },
+  activated() {
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 0eef65f..6694f4d 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -42,6 +42,9 @@
   mounted() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       wellStaticByType().then(response => {
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 8a3748c..f456d70 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="dashboard-container">
-    <panel-group/>
+    <panel-group ref="panelgroup"/>
     <el-row>
       <!--井盖布防撤防统计-->
       <el-col :span="10">
@@ -107,8 +107,9 @@
         this.socket.onmessage = function(msg) {
           // 转换为json对象
           const data = JSON.parse(msg.data)
+          console.log(data)
           if (data.type === 'alarm') {
-            this.playAudio()
+            that.$refs.panelgroup.refreshData()
             that.$notify({
               title: '新报警来了',
               // 这里也可以把返回信息加入到message中显示
@@ -121,6 +122,7 @@
                 })
               }
             })
+            that.playAudio()
           } else if (data.type === 'overtimeGet') {
             that.$notify({
               title: '有新超时未接收工单',
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 00cc7d0..09a6e62 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -231,6 +231,7 @@
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.fetchDevice()
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index 1f16f3e..be81b66 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -197,6 +197,7 @@
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.fetchDevice()

diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index 4a558d1..9dcc38f 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -34,15 +34,9 @@
   },
   mounted() {
     this.fetchData()
-    // 模拟数据
-    // this.chartData.rows = [
-    //   { 'date': '9月20日', 'alarmTimes': 153, 'alarmWells': 43 },
-    //   { 'date': '9月21日', 'alarmTimes': 150, 'alarmWells': 30 },
-    //   { 'date': '9月22日', 'alarmTimes': 143, 'alarmWells': 23 },
-    //   { 'date': '9月23日', 'alarmTimes': 173, 'alarmWells': 23 },
-    //   { 'date': '9月24日', 'alarmTimes': 272, 'alarmWells': 52 },
-    //   { 'date': '9月25日', 'alarmTimes': 253, 'alarmWells': 53 }
-    // ]
+  },
+  activated() {
+    this.fetchData()
   },
   methods: {
     fetchData() {
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
deleted file mode 100644
index 890325f..0000000
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-
-</template>
-
-<script>
-export default {
-  name: 'AlarmNowList',
-  data() {
-    this.title = {
-      text: '7日报警趋势'
-    }
-    this.chartSettings = {
-      labelMap: {
-        'alarmWells': '报警井数',
-        'alarmTimes': '报警次数'
-      },
-      metrics: ['alarmTimes', 'alarmWells'],
-      dimension: ['date']
-    }
-    return {
-      chartData: {
-        columns: ['date', 'alarmTimes', 'alarmWells', '下单率'],
-        rows: [
-          { 'date': '9月20日', 'alarmTimes': 1393, 'alarmWells': 1093, '下单率': 0.32 },
-          { 'date': '9月21日', 'alarmTimes': 3530, 'alarmWells': 3230, '下单率': 0.26 },
-          { 'date': '9月22日', 'alarmTimes': 2923, 'alarmWells': 2623, '下单率': 0.76 },
-          { 'date': '9月23日', 'alarmTimes': 1723, 'alarmWells': 1423, '下单率': 0.49 },
-          { 'date': '9月24日', 'alarmTimes': 3792, 'alarmWells': 3492, '下单率': 0.323 },
-          { 'date': '9月25日', 'alarmTimes': 4593, 'alarmWells': 4293, '下单率': 0.78 }
-        ]
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index 7ff9ba3..0b2776a 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -52,6 +52,9 @@
     //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
     // ]
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       deviceStaticsByType().then(response => {
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..295c995 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -31,7 +31,9 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
+    this.fetchData()
+  },
+  activated() {
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dashboard/components/JobByStatus.vue b/src/views/dashboard/components/JobByStatus.vue
index 9e0d75f..1109bb0 100644
--- a/src/views/dashboard/components/JobByStatus.vue
+++ b/src/views/dashboard/components/JobByStatus.vue
@@ -32,17 +32,10 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deptName': '电力公司', 'beforeGet': 139, 'beforeConfirm': 109, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '开拓热力', 'beforeGet': 353, 'beforeConfirm': 323, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '市政集团', 'beforeGet': 292, 'beforeConfirm': 262, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '博大网信', 'beforeGet': 172, 'beforeConfirm': 142, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '信息办', 'beforeGet': 379, 'beforeConfirm': 349, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '燃气四分', 'beforeGet': 459, 'beforeConfirm': 429, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '其他', 'beforeGet': 459, 'beforeConfirm': 429, 'inHandle': 123, 'over': 456 }
-    // ]
+  },
+  activated() {
+    this.fetchData()
   },
   methods: {
     fetchData() {
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index bbda98e..df0acd2 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -55,7 +55,18 @@
     this.getAlarmCount()
     this.getJobCount()
   },
+  activated() {
+    this.getWellCount()
+    this.getDeviceCount()
+    this.getAlarmCount()
+    this.getJobCount()
+  },
   methods: {
+    // 刷新报警和工单数
+    refreshData() {
+      this.getAlarmCount()
+      this.getJobCount()
+    },
     goPage(path) {
       this.$router.push(path)
     },
diff --git a/src/views/dashboard/components/WellCountByBfzt.vue b/src/views/dashboard/components/WellCountByBfzt.vue
index ae8b829..1fc15f6 100644
--- a/src/views/dashboard/components/WellCountByBfzt.vue
+++ b/src/views/dashboard/components/WellCountByBfzt.vue
@@ -30,7 +30,9 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
+    this.fetchData()
+  },
+  activated() {
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 0eef65f..6694f4d 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -42,6 +42,9 @@
   mounted() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       wellStaticByType().then(response => {
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 8a3748c..f456d70 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="dashboard-container">
-    <panel-group/>
+    <panel-group ref="panelgroup"/>
     <el-row>
       <!--井盖布防撤防统计-->
       <el-col :span="10">
@@ -107,8 +107,9 @@
         this.socket.onmessage = function(msg) {
           // 转换为json对象
           const data = JSON.parse(msg.data)
+          console.log(data)
           if (data.type === 'alarm') {
-            this.playAudio()
+            that.$refs.panelgroup.refreshData()
             that.$notify({
               title: '新报警来了',
               // 这里也可以把返回信息加入到message中显示
@@ -121,6 +122,7 @@
                 })
               }
             })
+            that.playAudio()
           } else if (data.type === 'overtimeGet') {
             that.$notify({
               title: '有新超时未接收工单',
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 00cc7d0..09a6e62 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -231,6 +231,7 @@
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.fetchDevice()
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index 1f16f3e..be81b66 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -197,6 +197,7 @@
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.fetchDevice()
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index 9b9b7c3..bbbdf63 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -172,6 +172,7 @@
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.fetchDevice()

diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index 4a558d1..9dcc38f 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -34,15 +34,9 @@
   },
   mounted() {
     this.fetchData()
-    // 模拟数据
-    // this.chartData.rows = [
-    //   { 'date': '9月20日', 'alarmTimes': 153, 'alarmWells': 43 },
-    //   { 'date': '9月21日', 'alarmTimes': 150, 'alarmWells': 30 },
-    //   { 'date': '9月22日', 'alarmTimes': 143, 'alarmWells': 23 },
-    //   { 'date': '9月23日', 'alarmTimes': 173, 'alarmWells': 23 },
-    //   { 'date': '9月24日', 'alarmTimes': 272, 'alarmWells': 52 },
-    //   { 'date': '9月25日', 'alarmTimes': 253, 'alarmWells': 53 }
-    // ]
+  },
+  activated() {
+    this.fetchData()
   },
   methods: {
     fetchData() {
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
deleted file mode 100644
index 890325f..0000000
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-
-</template>
-
-<script>
-export default {
-  name: 'AlarmNowList',
-  data() {
-    this.title = {
-      text: '7日报警趋势'
-    }
-    this.chartSettings = {
-      labelMap: {
-        'alarmWells': '报警井数',
-        'alarmTimes': '报警次数'
-      },
-      metrics: ['alarmTimes', 'alarmWells'],
-      dimension: ['date']
-    }
-    return {
-      chartData: {
-        columns: ['date', 'alarmTimes', 'alarmWells', '下单率'],
-        rows: [
-          { 'date': '9月20日', 'alarmTimes': 1393, 'alarmWells': 1093, '下单率': 0.32 },
-          { 'date': '9月21日', 'alarmTimes': 3530, 'alarmWells': 3230, '下单率': 0.26 },
-          { 'date': '9月22日', 'alarmTimes': 2923, 'alarmWells': 2623, '下单率': 0.76 },
-          { 'date': '9月23日', 'alarmTimes': 1723, 'alarmWells': 1423, '下单率': 0.49 },
-          { 'date': '9月24日', 'alarmTimes': 3792, 'alarmWells': 3492, '下单率': 0.323 },
-          { 'date': '9月25日', 'alarmTimes': 4593, 'alarmWells': 4293, '下单率': 0.78 }
-        ]
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index 7ff9ba3..0b2776a 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -52,6 +52,9 @@
     //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
     // ]
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       deviceStaticsByType().then(response => {
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..295c995 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -31,7 +31,9 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
+    this.fetchData()
+  },
+  activated() {
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dashboard/components/JobByStatus.vue b/src/views/dashboard/components/JobByStatus.vue
index 9e0d75f..1109bb0 100644
--- a/src/views/dashboard/components/JobByStatus.vue
+++ b/src/views/dashboard/components/JobByStatus.vue
@@ -32,17 +32,10 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deptName': '电力公司', 'beforeGet': 139, 'beforeConfirm': 109, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '开拓热力', 'beforeGet': 353, 'beforeConfirm': 323, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '市政集团', 'beforeGet': 292, 'beforeConfirm': 262, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '博大网信', 'beforeGet': 172, 'beforeConfirm': 142, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '信息办', 'beforeGet': 379, 'beforeConfirm': 349, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '燃气四分', 'beforeGet': 459, 'beforeConfirm': 429, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '其他', 'beforeGet': 459, 'beforeConfirm': 429, 'inHandle': 123, 'over': 456 }
-    // ]
+  },
+  activated() {
+    this.fetchData()
   },
   methods: {
     fetchData() {
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index bbda98e..df0acd2 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -55,7 +55,18 @@
     this.getAlarmCount()
     this.getJobCount()
   },
+  activated() {
+    this.getWellCount()
+    this.getDeviceCount()
+    this.getAlarmCount()
+    this.getJobCount()
+  },
   methods: {
+    // 刷新报警和工单数
+    refreshData() {
+      this.getAlarmCount()
+      this.getJobCount()
+    },
     goPage(path) {
       this.$router.push(path)
     },
diff --git a/src/views/dashboard/components/WellCountByBfzt.vue b/src/views/dashboard/components/WellCountByBfzt.vue
index ae8b829..1fc15f6 100644
--- a/src/views/dashboard/components/WellCountByBfzt.vue
+++ b/src/views/dashboard/components/WellCountByBfzt.vue
@@ -30,7 +30,9 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
+    this.fetchData()
+  },
+  activated() {
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 0eef65f..6694f4d 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -42,6 +42,9 @@
   mounted() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       wellStaticByType().then(response => {
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 8a3748c..f456d70 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="dashboard-container">
-    <panel-group/>
+    <panel-group ref="panelgroup"/>
     <el-row>
       <!--井盖布防撤防统计-->
       <el-col :span="10">
@@ -107,8 +107,9 @@
         this.socket.onmessage = function(msg) {
           // 转换为json对象
           const data = JSON.parse(msg.data)
+          console.log(data)
           if (data.type === 'alarm') {
-            this.playAudio()
+            that.$refs.panelgroup.refreshData()
             that.$notify({
               title: '新报警来了',
               // 这里也可以把返回信息加入到message中显示
@@ -121,6 +122,7 @@
                 })
               }
             })
+            that.playAudio()
           } else if (data.type === 'overtimeGet') {
             that.$notify({
               title: '有新超时未接收工单',
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 00cc7d0..09a6e62 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -231,6 +231,7 @@
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.fetchDevice()
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index 1f16f3e..be81b66 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -197,6 +197,7 @@
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.fetchDevice()
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index 9b9b7c3..bbbdf63 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -172,6 +172,7 @@
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.fetchDevice()
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 3729f5a..373e5fa 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -197,6 +197,7 @@
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.fetchDevice()

diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index 4a558d1..9dcc38f 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -34,15 +34,9 @@
   },
   mounted() {
     this.fetchData()
-    // 模拟数据
-    // this.chartData.rows = [
-    //   { 'date': '9月20日', 'alarmTimes': 153, 'alarmWells': 43 },
-    //   { 'date': '9月21日', 'alarmTimes': 150, 'alarmWells': 30 },
-    //   { 'date': '9月22日', 'alarmTimes': 143, 'alarmWells': 23 },
-    //   { 'date': '9月23日', 'alarmTimes': 173, 'alarmWells': 23 },
-    //   { 'date': '9月24日', 'alarmTimes': 272, 'alarmWells': 52 },
-    //   { 'date': '9月25日', 'alarmTimes': 253, 'alarmWells': 53 }
-    // ]
+  },
+  activated() {
+    this.fetchData()
   },
   methods: {
     fetchData() {
diff --git a/src/views/dashboard/components/AlarmNowList.vue b/src/views/dashboard/components/AlarmNowList.vue
deleted file mode 100644
index 890325f..0000000
--- a/src/views/dashboard/components/AlarmNowList.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-
-</template>
-
-<script>
-export default {
-  name: 'AlarmNowList',
-  data() {
-    this.title = {
-      text: '7日报警趋势'
-    }
-    this.chartSettings = {
-      labelMap: {
-        'alarmWells': '报警井数',
-        'alarmTimes': '报警次数'
-      },
-      metrics: ['alarmTimes', 'alarmWells'],
-      dimension: ['date']
-    }
-    return {
-      chartData: {
-        columns: ['date', 'alarmTimes', 'alarmWells', '下单率'],
-        rows: [
-          { 'date': '9月20日', 'alarmTimes': 1393, 'alarmWells': 1093, '下单率': 0.32 },
-          { 'date': '9月21日', 'alarmTimes': 3530, 'alarmWells': 3230, '下单率': 0.26 },
-          { 'date': '9月22日', 'alarmTimes': 2923, 'alarmWells': 2623, '下单率': 0.76 },
-          { 'date': '9月23日', 'alarmTimes': 1723, 'alarmWells': 1423, '下单率': 0.49 },
-          { 'date': '9月24日', 'alarmTimes': 3792, 'alarmWells': 3492, '下单率': 0.323 },
-          { 'date': '9月25日', 'alarmTimes': 4593, 'alarmWells': 4293, '下单率': 0.78 }
-        ]
-      }
-    }
-  }
-}
-</script>
diff --git a/src/views/dashboard/components/DeviceCount.vue b/src/views/dashboard/components/DeviceCount.vue
index 7ff9ba3..0b2776a 100644
--- a/src/views/dashboard/components/DeviceCount.vue
+++ b/src/views/dashboard/components/DeviceCount.vue
@@ -52,6 +52,9 @@
     //   { 'deviceType': '流量监测仪', 'deviceCount': 2, '下单用户': 4293, '下单率': 0.78 }
     // ]
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       deviceStaticsByType().then(response => {
diff --git a/src/views/dashboard/components/DeviceCountByOnline.vue b/src/views/dashboard/components/DeviceCountByOnline.vue
index b30e092..295c995 100644
--- a/src/views/dashboard/components/DeviceCountByOnline.vue
+++ b/src/views/dashboard/components/DeviceCountByOnline.vue
@@ -31,7 +31,9 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
+    this.fetchData()
+  },
+  activated() {
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dashboard/components/JobByStatus.vue b/src/views/dashboard/components/JobByStatus.vue
index 9e0d75f..1109bb0 100644
--- a/src/views/dashboard/components/JobByStatus.vue
+++ b/src/views/dashboard/components/JobByStatus.vue
@@ -32,17 +32,10 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
     this.fetchData()
-    // this.chartData.rows = [
-    //   { 'deptName': '电力公司', 'beforeGet': 139, 'beforeConfirm': 109, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '开拓热力', 'beforeGet': 353, 'beforeConfirm': 323, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '市政集团', 'beforeGet': 292, 'beforeConfirm': 262, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '博大网信', 'beforeGet': 172, 'beforeConfirm': 142, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '信息办', 'beforeGet': 379, 'beforeConfirm': 349, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '燃气四分', 'beforeGet': 459, 'beforeConfirm': 429, 'inHandle': 123, 'over': 456 },
-    //   { 'deptName': '其他', 'beforeGet': 459, 'beforeConfirm': 429, 'inHandle': 123, 'over': 456 }
-    // ]
+  },
+  activated() {
+    this.fetchData()
   },
   methods: {
     fetchData() {
diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue
index bbda98e..df0acd2 100644
--- a/src/views/dashboard/components/PanelGroup.vue
+++ b/src/views/dashboard/components/PanelGroup.vue
@@ -55,7 +55,18 @@
     this.getAlarmCount()
     this.getJobCount()
   },
+  activated() {
+    this.getWellCount()
+    this.getDeviceCount()
+    this.getAlarmCount()
+    this.getJobCount()
+  },
   methods: {
+    // 刷新报警和工单数
+    refreshData() {
+      this.getAlarmCount()
+      this.getJobCount()
+    },
     goPage(path) {
       this.$router.push(path)
     },
diff --git a/src/views/dashboard/components/WellCountByBfzt.vue b/src/views/dashboard/components/WellCountByBfzt.vue
index ae8b829..1fc15f6 100644
--- a/src/views/dashboard/components/WellCountByBfzt.vue
+++ b/src/views/dashboard/components/WellCountByBfzt.vue
@@ -30,7 +30,9 @@
     }
   },
   mounted() {
-    // TODO:待调试真接口
+    this.fetchData()
+  },
+  activated() {
     this.fetchData()
   },
   methods: {
diff --git a/src/views/dashboard/components/WellCountByType.vue b/src/views/dashboard/components/WellCountByType.vue
index 0eef65f..6694f4d 100644
--- a/src/views/dashboard/components/WellCountByType.vue
+++ b/src/views/dashboard/components/WellCountByType.vue
@@ -42,6 +42,9 @@
   mounted() {
     this.fetchData()
   },
+  activated() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       wellStaticByType().then(response => {
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 8a3748c..f456d70 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="dashboard-container">
-    <panel-group/>
+    <panel-group ref="panelgroup"/>
     <el-row>
       <!--井盖布防撤防统计-->
       <el-col :span="10">
@@ -107,8 +107,9 @@
         this.socket.onmessage = function(msg) {
           // 转换为json对象
           const data = JSON.parse(msg.data)
+          console.log(data)
           if (data.type === 'alarm') {
-            this.playAudio()
+            that.$refs.panelgroup.refreshData()
             that.$notify({
               title: '新报警来了',
               // 这里也可以把返回信息加入到message中显示
@@ -121,6 +122,7 @@
                 })
               }
             })
+            that.playAudio()
           } else if (data.type === 'overtimeGet') {
             that.$notify({
               title: '有新超时未接收工单',
diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 00cc7d0..09a6e62 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -231,6 +231,7 @@
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.fetchDevice()
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index 1f16f3e..be81b66 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -197,6 +197,7 @@
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.fetchDevice()
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index 9b9b7c3..bbbdf63 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -172,6 +172,7 @@
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.fetchDevice()
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 3729f5a..373e5fa 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -197,6 +197,7 @@
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.fetchDevice()
diff --git a/src/views/deviceConfig/components/editTempConfig.vue b/src/views/deviceConfig/components/editTempConfig.vue
index b054bea..a1da5c4 100644
--- a/src/views/deviceConfig/components/editTempConfig.vue
+++ b/src/views/deviceConfig/components/editTempConfig.vue
@@ -201,6 +201,7 @@
     initDialog: function(dialogStatus, dialogFormVisible, row = null) {
       this.dialogStatus = dialogStatus
       this.dialogFormVisible = dialogFormVisible
+      this.canEdit = true
       if (dialogStatus === 'create') { // 如果是新增，清除验证
         this.resetForm()
         this.fetchDevice()