Browse Source

优化SOCKET

JX.LI 2 năm trước cách đây
mục cha
commit
bb53060ccc
1 tập tin đã thay đổi với 16 bổ sung26 xóa
  1. 16 26
      src/views/forest.vue

+ 16 - 26
src/views/forest.vue

@@ -482,17 +482,6 @@ export default {
     /** ----------------------------------weosocket开始------------------------------------- */
     // this.initWebSocket()
     /** ----------------------------------weosocket结束------------------------------------- */
-    setInterval(() => {
-      if (this.calendarDay == this.getCurrentDataStr()) {
-        this.getTodayEvents(this.getCurrentDataStr(), true)
-        this.getDeptEventCount(this.getCurrentDataStr(), true)
-        // this.getEventList(this.getCurrentDataStr(), this.pageSize, this.pageNum, '', true)
-        this.getEventByEventType(this.getCurrentDataStr(), true)
-        this.getEventByReportorOrder(this.getCurrentDataStr(), true)
-        this.getExposureStage(this.getCurrentDataStr(), true)
-        // this.getSupermap(this.getCurrentDataStr(), true)
-      }
-    }, 30000)
     this.bottomMenuList() //获取底部公共组件消息和任务
   },
   data() {
@@ -1128,12 +1117,14 @@ export default {
     },
     /** ----------------------------------weosocket开始------------------------------------- */
     initWebSocket(userId, eventTypeDl, eventType) {        //初始化weosocket
-      const wsuri = 'ws://127.0.0.1:10003/eventPush/' + userId + '/' + eventTypeDl + '/' + eventType
-      this.websock = new WebSocket(wsuri)
-      console.log('建立websocket连接')
-      this.websock.onopen = this.websocketonopen
-      this.websock.onmessage = this.websocketonmessage
-      this.websock.onerror = this.websocketonerror
+      selectConfigKey('KSH_SOCKET').then(res => {
+        const wsuri = res.data + userId + '/' + eventTypeDl + '/' + eventType
+        this.websock = new WebSocket(wsuri)
+        console.log('建立websocket连接')
+        this.websock.onopen = this.websocketonopen
+        this.websock.onmessage = this.websocketonmessage
+        this.websock.onerror = this.websocketonerror
+      })
     },
     websocketonopen() { //连接建立之后执行send方法发送数据
       console.log('websocket连接成功')
@@ -1150,15 +1141,14 @@ export default {
       if (this.calendarDay == this.getCurrentDataStr() && data != e.data) {
         // 处理收到的消息
         this.handleWebSoceketEvent(e.data)
-
-        // this.getEventListNew();
-        // this.getTodayEvents(this.getCurrentDataStr());
-        // this.getDeptEventCount(this.getCurrentDataStr());
-        // this.getEventByEventType(this.getCurrentDataStr());
-        // this.getEventByReportorOrder(this.getCurrentDataStr());
-
-        // this.$refs.bottomMenu.updateAlert();
-        // this.$refs.up.play();
+        
+        this.getTodayEvents(this.getCurrentDataStr(), true)
+        this.getDeptEventCount(this.getCurrentDataStr(), true)
+        this.getEventByEventType(this.getCurrentDataStr(), true)
+        this.getEventByReportorOrder(this.getCurrentDataStr(), true)
+        this.getExposureStage(this.getCurrentDataStr(), true)
+        this.$refs.bottomMenu.updateAlert();
+        this.$refs.up.play();
         // thes.$refs.up.pause();//停止播放音乐
       }
     },