diff --git a/src/api/device copy/device.js b/src/api/device copy/device.js
deleted file mode 100644
index 72677ee..0000000
--- a/src/api/device copy/device.js	
+++ /dev/null
@@ -1,15 +0,0 @@
-import request from '@/utils/request'
-// eslint-disable-next-line no-unused-vars
-import qs from 'qs'
-
-// 获取设备列表
-export function getInfoPage(data) {
-  return request({ url: '/yInfo/getInfoPage', method: 'GET', params: data })
-}
-
-
-// 单条获取设备
-export function getInfoById(data) {
-  return request({ url: '/yInfo/getInfoById', method: 'GET', params: data })
-}
-
diff --git a/src/api/yInfo/yInfo.js b/src/api/yInfo/yInfo.js
index 72677ee..d07fa72 100644
--- a/src/api/yInfo/yInfo.js
+++ b/src/api/yInfo/yInfo.js
@@ -13,3 +13,7 @@ export function getInfoById(data) {
   return request({ url: '/yInfo/getInfoById', method: 'GET', params: data })
 }
 
+export function getUnread(query) {
+  return request({ url: '/yInfo/getUnread', method: 'GET', params: data })
+}
+
diff --git a/src/views/baojingchaxun/baojingchaxunList.vue b/src/views/baojingchaxun/baojingchaxunList.vue
index d1eedaa..c943867 100644
--- a/src/views/baojingchaxun/baojingchaxunList.vue
+++ b/src/views/baojingchaxun/baojingchaxunList.vue
@@ -224,19 +224,8 @@ export default {
       this.listQuery.name = null
       this.listQuery.startTime = null
       this.listQuery.endTime = null
-      // this.listQuery = {
-      //   params: {
-      //     manufacturerName: '',
-      //     supplierType: '',
-      //     useOrgSid: '',
-      //     createOrgSid: '',
-      //     manufacturerTelePhone: '',
-      //     contactName: ''
-      //   },
-      //   current: 1,
-      //   size: 5
-      // }
-      // this.init()
+      this.listQuery.current = 1
+      this.getList()
     },
     // 打开添加对话框
     toAdd() {
diff --git a/src/views/index.vue b/src/views/index.vue
index 6453e55..a6e1481 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -173,7 +173,7 @@ import * as echarts from "echarts";
 import PieChartrenyuan from '@/views/echarts/components/PieChartrenyuan'
 import HomeMap from '@/views/dashboard/components/HomeMap'
 import { getCallPolicePage } from '@/api/callPolice/callPolice'
-import { getInfoPage } from '@/api/yInfo/yInfo'
+import { getInfoPage, getUnread } from '@/api/yInfo/yInfo'
 import { getStatusCount } from '@/api/device/device'
 import { init } from 'events';
 // 1.1入侵报警饼图
@@ -314,7 +314,59 @@ export default {
     }
   },
   methods: {
+    toDoMessagge() {
+      // 先查询未读信息
+      // getUnread().then((response) => {
+      // console.log('-------------查询未读信息结果：' + response.data)
+      // if (response.code === 20000 && response.data) {
+      // this.$store.dispatch('app/setSysMessageCount', response.data)
+      this.$store.dispatch('app/setSysMessageCount', "lllll")
+      // } else {
+      //     this.$store.dispatch('app/setSysMessageCount', 0)
+      //   }
+      // })
+    },
+    onConnected(frame) {
+      // 订阅广播系统通知
+      this.$stompClient.subscribe(
+        '/topic/subscribe',
+        this.responseCallback,
+        this.onFailed
+      )
+      //
+      // 订阅点对点 通过用户id指定用户
+      this.$stompClient.subscribe(
+        '/user/' + this.userId + '/queue/subscribewarn',
+        this.responseCallback,
+        this.onFailed
+      )
+    },
+    onFailed(frame) {
+      console.log('gongzuotai连接ws失败： ' + JSON.stringify(frame))
+    },
+    connectSrv() {
+      var headers = {}
+      // console.log('ws', ws)
+      this.connetWM(ws, headers, this.onConnected, this.onFailed)
+    },
+    onConnected(frame) {
+      订阅广播系统通知
+      this.$stompClient.subscribe(
+        '/topic/subscribe',
+        this.responseCallback,
+        this.onFailed
+      )
+      // 订阅点对点 通过用户id指定用户
+      this.$stompClient.subscribe(
+        '/user/' + this.userId + '/queue/subscribewarn',
+        this.responseCallback,
+        this.onFailed
+      )
+    },
     init() {
+      // this.toDoMessagge()
+      // this.timer = setInterval(this.toDoMessagge, 60000)
+      // this.connectSrv()
       getStatusCount({ deviceType: 1 }).then(res => {
         this.statusDataSp = res.data
         this.shipinjiankong_Chart.Data.seriesData = []
diff --git a/src/views/shebeirizhi/shebeirizhiList.vue b/src/views/shebeirizhi/shebeirizhiList.vue
index 67b21c6..170159b 100644
--- a/src/views/shebeirizhi/shebeirizhiList.vue
+++ b/src/views/shebeirizhi/shebeirizhiList.vue
@@ -211,6 +211,8 @@ export default {
       this.listQuery.startTime = null
       this.listQuery.name = null
       this.listQuery.position = null
+      this.listQuery.current = 1
+      this.getList()
       // this.listQuery = {
       //   params: {
       //     manufacturerName: '',
diff --git a/src/views/shebeitaizhang/shebeitaizhangList.vue b/src/views/shebeitaizhang/shebeitaizhangList.vue
index 1e5602c..af9744c 100644
--- a/src/views/shebeitaizhang/shebeitaizhangList.vue
+++ b/src/views/shebeitaizhang/shebeitaizhangList.vue
@@ -431,6 +431,8 @@ export default {
       this.listQuery.ckId = null
       this.listQuery.type = null
       this.listQuery.name = null
+      this.listQuery.current = 1
+      this.getList()
     },
     // 打开添加对话框
     toAdd() {
diff --git a/src/views/shebeizhuangtai/shebeizhuangtaiList.vue b/src/views/shebeizhuangtai/shebeizhuangtaiList.vue
index 18d41dd..eae9d23 100644
--- a/src/views/shebeizhuangtai/shebeizhuangtaiList.vue
+++ b/src/views/shebeizhuangtai/shebeizhuangtaiList.vue
@@ -105,7 +105,8 @@ export default {
         { title: '摄像头', id: '1' },
         { title: '电子围栏', id: '2' },
         { title: '门禁', id: '3' },
-        { title: '机器人', id: '4' }
+        { title: '报警主机', id: '4' },
+        { title: '网络录像机', id: '5' },
       ],
       rules: {}
     }
@@ -202,6 +203,8 @@ export default {
     },
     handleReset() {
       this.listQuery.type = null
+      this.listQuery.current = 1
+      this.getList()
       // this.listQuery = {
       //   params: {
       //     manufacturerName: '',
diff --git a/src/views/xiaoxi/xiaoxiList.vue b/src/views/xiaoxi/xiaoxiList.vue
index 532ddd3..a244e19 100644
--- a/src/views/xiaoxi/xiaoxiList.vue
+++ b/src/views/xiaoxi/xiaoxiList.vue
@@ -280,6 +280,8 @@ export default {
     },
     handleReset() {
       this.listQuery.content = null
+      this.listQuery.current = 1
+      this.getList()
     },
     // 打开添加对话框
     toAdd() {
diff --git a/src/views/zhiwujiance/zhiwujianceList.vue b/src/views/zhiwujiance/zhiwujianceList.vue
index f8fa3e8..7d1863d 100644
--- a/src/views/zhiwujiance/zhiwujianceList.vue
+++ b/src/views/zhiwujiance/zhiwujianceList.vue
@@ -362,6 +362,7 @@ export default {
     },
     handleReset() {
       this.listQuery.ckId = null
+      this.getList()
     },
     // 打开添加对话框
     toAdd() {