Merge branch 'feat/zl' into 'develop'

save

See merge request !79

src/store/module/socket.js

@@ -11,6 +11,7 @@ export default {
   },
   actions: {
     initSocket ({ commit, rootState }, payload) {
+      console.log('-=-=-initSocket次数',)
       const socket = io.connect(payload.url, {
         query: {
           loginUserNum: `diagnose_list_socket_${payload.userId}`

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>