Merge branch 'develop' of...

Merge branch 'develop' of 192.168.110.53:com.pica.cloud.education.frontend/pica-admin-consultation into develop

src/store/module/socket.js

 // ES6 import
 import store from '../';
+import storejs from 'storejs';
 import io from 'socket.io-client';
 
+let socketTimer = null;
 export default {
   namespaced: true,
   state: {
-    socketClient: null
+    socketClient: null,
   },
   actions: {
     initSocket ({ commit, rootState }, payload) {
       const socket = io.connect(payload.url, {
         query: {
           loginUserNum: `diagnose_list_socket_${payload.userId}`
-          // loginUserNum: `diagnose_list_socket_888`
         }
       });
       commit('SET_SOCKET', socket);
@@ -31,12 +32,17 @@ export default {
       }
       state.socketClient.on("connection", (socket) => {
         console.log ('socket 链接成功',socket);
+        console.log ('socketTimer---',socketTimer);
+        if(socketTimer){
+          clearInterval(socketTimer);
+        }
       });
       state.socketClient.on("connect_error", (err) => {
         console.log ('socket connect_error',err);
       });
       state.socketClient.on("disconnect", (socket) => {
-        console.log ('socket disconnect',socket);
+        console.log ('socket disconnect----',socket);
+        store.commit('socket/RECONNECT_SOCKET');
       });
       state.socketClient.on("diagnose_push_event", (socket) => {
         console.log('diagnose_push_event---', socket);
@@ -115,6 +121,13 @@ export default {
         duration: 5000,
         position: 'top-right',
       })
+    },
+    RECONNECT_SOCKET: (state, payload) => {
+      socketTimer =  setInterval(function (){
+        const i = storejs.get('initSocketInfo');
+        console.log('----initSocketInfo', i);
+        store.dispatch( 'socket/initSocket', i)
+      }, 2000);
     }
   },
 };

src/views/layout/slidebar.vue

@@ -32,6 +32,7 @@
 </template>
 <script>
 import { getInnerLoginUrl } from "../../utils";
+import storejs from 'storejs';
 const BUILD_ENV = process.env.BUILD_ENV;
 let vm = null;
 export default {
@@ -81,6 +82,7 @@ export default {
             userID: userId
           };
           const u = this.getSocketUrl(BUILD_ENV);
+          storejs.set('initSocketInfo', {url: u,userId: userId});
           this.$store.dispatch( 'socket/initSocket',{url: u,userId: userId})
           vueMenuDtos.map( item => {
             if(item.index.indexOf('administrators') > -1){