Merge branch 'feat/zl' into 'develop'

Feat/zl

See merge request com.pica.cloud.education.frontend/pica-admin-consultation!92

src/store/module/socket.js

@@ -11,13 +11,15 @@ export default {
   },
   actions: {
     initSocket ({ commit, rootState }, payload) {
-      console.log('-=-=-initSocket次数',)
+
       const socket = io.connect(payload.url, {
         query: {
           loginUserNum: `diagnose_list_socket_${payload.userId}`,
         },
-        reconnection: false
+        reconnection: false,
+        autoConnect: false
       });
+      console.log('-=-=-initSocket次数', socket);
       commit('SET_SOCKET', socket);
       commit('SET_IOLISTION');
     },
@@ -33,18 +35,15 @@ export default {
         return false;
       }
       state.socketClient.on("connect", (socket) => {
-        console.log ('socket 链接成功',socket);
-        console.log ('socketTimer---',socketTimer);
-        if(socketTimer){
-          clearInterval(socketTimer);
-        }
+        console.log ('socket 链接成功', socket, state.socketClient);
       });
       state.socketClient.on("connect_error", (err) => {
         console.log ('socket connect_error',err);
+        state.socketClient.connect();
       });
       state.socketClient.on("disconnect", (socket) => {
         console.log ('socket disconnect----',socket);
-        store.commit('socket/RECONNECT_SOCKET');
+        state.socketClient.connect();
       });
       state.socketClient.on("diagnose_push_event", (socket) => {
         console.log('diagnose_push_event---', socket);
@@ -72,14 +71,14 @@ export default {
         }
       });
       state.socketClient.on('ping', function () {
-        console.log('[E] 心跳请求已发出 →', true, socketTimer);
+        console.log('[E] 心跳请求已发出 →', state.socketClient);
         if(socketTimer){
           clearInterval(socketTimer);
         }
       });
       //收到
-      state.socketClient.on('pong', function () {
-        console.log('[E] 心跳响应已收到 ←', true);
+      state.socketClient.on('pong', function (socket) {
+        console.log('[E] 心跳响应已收到 ←', socket, state.socketClient);
       });
       state.socketClient.io.on("reconnect_attempt", (socket) => {
         console.log('--reconnect_attempt', socket);
@@ -90,6 +89,10 @@ export default {
         console.log('--reconnect', socket);
         // ...
       });
+      state.socketClient.on('reconnecting', (attemptNumber) => {
+        // ...
+        console.log('--reconnecting', attemptNumber);
+      });
     },
     SET_NOTIFY: (state, payload) => {
       console.log('--payload', payload)
@@ -144,7 +147,8 @@ export default {
         console.log('RECONNECT_SOCKET-- 重新链接', i);
         socketTimer =  setInterval(function (){
           console.log('----initSocketInfo', i);
-          store.dispatch( 'socket/initSocket', i)
+          // store.dispatch( 'socket/initSocket', i)
+
         }, 2000);
       }
     }

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

@@ -2,7 +2,6 @@
   <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">
@@ -214,9 +213,6 @@ export default {
       // this.$store.commit('updateCurrentDiagList', l);
       // this.$store.commit('socket/SET_NOTIFY', ...this.testlistdata);
     },
-    socketRE() {
-      this.$store.dispatch( 'socket/RECONNECT_SOCKET')
-    }
   },
 };
 </script>