Merge branch 'develop' into feat/yf

src/components/IM/diagnosis-live.vue

@@ -185,12 +185,12 @@ export default {
       if(data.role == 2 && this.userTrtcEntryStatus != 2){
         return false;
       }
-      console.log('--this.roomId', data, this.roomId);
+      console.log('--this.roomId',this.currentChat, data, this.roomId);
       let url = `/im/team/call/direct/`;
       let params = {
         imAccId: data.accId,
-        // imTeamId: this.currentChat.tid,
-        // liveRoomId: this.roomId
+        imTeamId: this.currentChat.imTeamId,
+        liveRoomId: this.roomId
       };
       this.POST(url, params).then((res) => {
         if (res.code === "000000") {

src/components/common/inquirylist.vue

@@ -374,6 +374,7 @@ export default {
         return false;
       }
       const i = this.item;
+      // this.$store.commit("updateCurrentChat", i);
       this.$store.dispatch("gotoInquiry", i);
     },
     openAdvice() {

src/store/module/socket.js

@@ -11,9 +11,11 @@ export default {
   },
   actions: {
     initSocket ({ commit, rootState }, payload) {
+      console.log('-=-=-initSocket次数',)
       const socket = io.connect(payload.url, {
         query: {
-          loginUserNum: `diagnose_list_socket_${payload.userId}`
+          loginUserNum: `diagnose_list_socket_${payload.userId}`,
+          reconnection: false
         }
       });
       commit('SET_SOCKET', socket);
@@ -70,12 +72,24 @@ export default {
         }
       });
       state.socketClient.on('ping', function () {
-        console.log('[E] 心跳请求已发出 →', true);
+        console.log('[E] 心跳请求已发出 →', true, socketTimer);
+        if(socketTimer){
+          clearInterval(socketTimer);
+        }
       });
       //收到
       state.socketClient.on('pong', function () {
         console.log('[E] 心跳响应已收到 ←', true);
       });
+      state.socketClient.io.on("reconnect_attempt", (socket) => {
+        console.log('--reconnect_attempt', socket);
+        // ...
+      });
+
+      state.socketClient.on("reconnect", (socket) => {
+        console.log('--reconnect', socket);
+        // ...
+      });
     },
     SET_NOTIFY: (state, payload) => {
       console.log('--payload', payload)
@@ -123,11 +137,16 @@ export default {
       })
     },
     RECONNECT_SOCKET: (state, payload) => {
-      socketTimer =  setInterval(function (){
+      if(socketTimer){
+        console.log('RECONNECT_SOCKET--已经存在');
+      }else{
         const i = storejs.get('initSocketInfo');
-        console.log('----initSocketInfo', i);
-        store.dispatch( 'socket/initSocket', i)
-      }, 2000);
+        console.log('RECONNECT_SOCKET-- 重新链接', i);
+        socketTimer =  setInterval(function (){
+          console.log('----initSocketInfo', i);
+          store.dispatch( 'socket/initSocket', i)
+        }, 2000);
+      }
     }
   },
 };

src/views/IM/diagnosis-admin/workbench.vue

@@ -2,6 +2,7 @@
   <div class="workbench-container">
     <div class="select-content">
       <div class="title">我的工作台</div>
+      <div @click="socketRE">socket 测试</div>
       <!-- 时间 -->
       <div class="search-box">
         <div class="search-item">
@@ -109,10 +110,11 @@ export default {
   },
   data() {
     const s = storejs.get("soketQuest");
+    const t = s?s.returnStatus:1;
     const d = s ? s.dateTime : new Date().format("yyyy-MM-dd");
     let id = s && s.operateUserId ? s.operateUserId : this.isSuperAdmin.userID;
     return {
-      tabPosition: 1,
+      tabPosition: t,
       showChat: true,
       totalRows: 0,
       loading: false,
@@ -169,7 +171,6 @@ export default {
       this.searchParam = s;
       this.inquirySearch("clear");
     },
-
     handleSizeChange(val) {
       const s = this.searchParam;
       s.pageSize = val;
@@ -213,6 +214,9 @@ export default {
       // this.$store.commit('updateCurrentDiagList', l);
       // this.$store.commit('socket/SET_NOTIFY', ...this.testlistdata);
     },
+    socketRE() {
+      this.$store.dispatch( 'socket/RECONNECT_SOCKET')
+    }
   },
 };
 </script>