Merge branch 'feat/zl' into 'develop'

Feat/zl

See merge request !96

src/components/editor/upload-music.vue

@@ -8,7 +8,7 @@
           :headers="headers"
           :on-remove="handleRemove"
           :on-success="sucess"
-          :file-list="musicArr"
+          :file-list="musicArr || []"
           :on-error="errfn"
           :before-remove="beforeRemove"
           :accept="accept"
@@ -62,18 +62,11 @@ export default {
     console.log(console.log('this.musicList',this.musicArr))
     this.actionurl = getBaseUrl("/diagnose/illness/audio/upload");
   },
-  // watch:{
-  //   musicList(newv, oldv) {
-  //     this.musicArr = newv;
-  //     console.log('this.musicArr',this.musicAr)
-  //   }
-  // },
-  // computed: {
-
-  //     musicArr(){
-  //       return this.musicList
-  //     }
-  // },
+  watch:{
+    musicList(newv, oldv) {
+      this.musicArr = newv || [];
+    }
+  },
   methods: {
      musicUrl(item) {
        if (item.url) {

src/store/module/socket.js

@@ -12,15 +12,73 @@ export default {
   actions: {
     initSocket ({ commit, rootState }, payload) {
 
-      const socket = io.connect(payload.url, {
+      const socketClient = io.connect(payload.url, {
         query: {
           loginUserNum: `diagnose_list_socket_${payload.userId}`,
         },
-        reconnection: false,
+        // reconnection: false,
+      });
+      console.log('-=-=-initSocket次数', socketClient);
+      commit('SET_SOCKET', socketClient);
+      socketClient.on("connect", (socket) => {
+        console.log ('socket 链接成功', socket, state.socketClient);
+      });
+      socketClient.on("connect_error", (err) => {
+        console.log ('socket connect_error',err);
+        // state.socketClient.connect();
+      });
+      socketClient.on("disconnect", (socket) => {
+        console.log ('socket disconnect----',socket);
+        // state.socketClient.connect();
+      });
+      socketClient.on("diagnose_push_event", (socket) => {
+        console.log('diagnose_push_event---', socket);
+        const {list,allSize,countRespList} = socket;
+        console.log('--_VM', _VM.$route)
+        store.commit('updateCurrentDiagList', list);
+        store.commit('updateAllSize', allSize);
+        store.commit('updateCurrentCalList', countRespList);
+      });
+      socketClient.on("diagnose_call_push_event", (socket) => {
+        console.log('diagnose_call_push_event---', socket);
+        const l = store.state.noticeList;
+        if(l.length >=5){
+          l.shift();
+        }
+        l.push(socket);
+        const n = {notifyIndex: l.length, ...socket}
+        store.commit('updateNoticeList', l);
+        console.log('--_VM', _VM)
+        const {path} =_VM.$route;
+        console.log("n--------",n)
+        const operateUserId=store.state.soketQuest.operateUserId?store.state.soketQuest.operateUserId:''
+        if(path && String(path).indexOf('workbench') > -1&&n.operateUserId==operateUserId){
+          store.commit('socket/SET_NOTIFY', n);
+        }
+      });
+      socketClient.on('ping', function () {
+        console.log('[E] 心跳请求已发出 →', state.socketClient);
+        if(socketTimer){
+          clearInterval(socketTimer);
+        }
+      });
+      //收到
+      socketClient.on('pong', function (socket) {
+        console.log('[E] 心跳响应已收到 ←', socket, state.socketClient);
+      });
+      socketClient.io.on("reconnect_attempt", (socket) => {
+        console.log('--reconnect_attempt', socket);
+        // ...
+      });
+
+      state.socketClient.on("reconnect", (socket) => {
+        console.log('--reconnect', socket);
+        // ...
+      });
+      state.socketClient.on('reconnecting', (attemptNumber) => {
+        // ...
+        console.log('--reconnecting', attemptNumber);
       });
-      console.log('-=-=-initSocket次数', socket);
-      commit('SET_SOCKET', socket);
-      commit('SET_IOLISTION');
     },
   },
   mutations: {