Merge branch 'develop' into 'release'

Develop

See merge request !100

src/components/common/diagnoseAdvice.vue

@@ -53,7 +53,7 @@
       <span>诊断建议：</span>
       <div class="record-music">
         <upload-music
-          :musicList="currentAdvice.illnessAudioUrls"
+          :musicList="musicList"
           ref="musicComponent"
         ></upload-music>
       </div>
@@ -104,6 +104,17 @@ export default {
     ...mapState({
       currentAdvice: "currentAdvice",
     }),
+    musicList() {
+      const i = this.currentAdvice && this.currentAdvice.illnessAudioUrls  ? this.currentAdvice.illnessAudioUrls : [];
+      const ni = [];
+      i.map((item)=>{
+        if(item){
+          const n = {url: item}
+          ni.push(n);
+        }
+      });
+    return ni;
+    }
   },
   methods: {
     SaveAdvice() {

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,39 +12,26 @@ 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次数', socket);
-      commit('SET_SOCKET', socket);
-      commit('SET_IOLISTION');
-    },
-  },
-  mutations: {
-    SET_SOCKET: (state, payload) => {
-      window.socketClient = payload;
-      state.socketClient = payload;
-
-    },
-    SET_IOLISTION: (state, payload) => {
-      if(!state.socketClient){
-        return false;
-      }
-      state.socketClient.on("connect", (socket) => {
-        console.log ('socket 链接成功', socket, state.socketClient);
+      console.log('-=-=-initSocket次数', socketClient);
+      commit('SET_SOCKET', socketClient);
+      socketClient.on("connect", (socket) => {
+        console.log ('socket 链接成功', socket, socketClient);
       });
-      state.socketClient.on("connect_error", (err) => {
+      socketClient.on("connect_error", (err) => {
         console.log ('socket connect_error',err);
         // state.socketClient.connect();
       });
-      state.socketClient.on("disconnect", (socket) => {
+      socketClient.on("disconnect", (socket) => {
         console.log ('socket disconnect----',socket);
         // state.socketClient.connect();
       });
-      state.socketClient.on("diagnose_push_event", (socket) => {
+      socketClient.on("diagnose_push_event", (socket) => {
         console.log('diagnose_push_event---', socket);
         const {list,allSize,countRespList} = socket;
         console.log('--_VM', _VM.$route)
@@ -52,7 +39,7 @@ export default {
         store.commit('updateAllSize', allSize);
         store.commit('updateCurrentCalList', countRespList);
       });
-      state.socketClient.on("diagnose_call_push_event", (socket) => {
+      socketClient.on("diagnose_call_push_event", (socket) => {
         console.log('diagnose_call_push_event---', socket);
         const l = store.state.noticeList;
         if(l.length >=5){
@@ -69,30 +56,101 @@ export default {
           store.commit('socket/SET_NOTIFY', n);
         }
       });
-      state.socketClient.on('ping', function () {
-        console.log('[E] 心跳请求已发出 →', state.socketClient);
+      socketClient.on('ping', function () {
+        console.log('[E] 心跳请求已发出 →', socketClient);
         if(socketTimer){
           clearInterval(socketTimer);
         }
       });
       //收到
-      state.socketClient.on('pong', function (socket) {
-        console.log('[E] 心跳响应已收到 ←', socket, state.socketClient);
+      socketClient.on('pong', function (socket) {
+        console.log('[E] 心跳响应已收到 ←', socket, socketClient);
       });
-      state.socketClient.io.on("reconnect_attempt", (socket) => {
+      socketClient.io.on("reconnect_attempt", (socket) => {
         console.log('--reconnect_attempt', socket);
         // ...
       });
 
-      state.socketClient.on("reconnect", (socket) => {
+      socketClient.on("reconnect", (socket) => {
         console.log('--reconnect', socket);
         // ...
       });
-      state.socketClient.on('reconnecting', (attemptNumber) => {
+      socketClient.on('reconnecting', (attemptNumber) => {
         // ...
         console.log('--reconnecting', attemptNumber);
       });
     },
+  },
+  mutations: {
+    SET_SOCKET: (state, payload) => {
+      window.socketClient = payload;
+      state.socketClient = payload;
+
+    },
+    // SET_IOLISTION: (state, payload) => {
+    //   if(!state.socketClient){
+    //     return false;
+    //   }
+    //   state.socketClient.on("connect", (socket) => {
+    //     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);
+    //     // state.socketClient.connect();
+    //   });
+    //   state.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);
+    //   });
+    //   state.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);
+    //     }
+    //   });
+    //   state.socketClient.on('ping', function () {
+    //     console.log('[E] 心跳请求已发出 →', state.socketClient);
+    //     if(socketTimer){
+    //       clearInterval(socketTimer);
+    //     }
+    //   });
+    //   //收到
+    //   state.socketClient.on('pong', function (socket) {
+    //     console.log('[E] 心跳响应已收到 ←', socket, state.socketClient);
+    //   });
+    //   state.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);
+    //   });
+    // },
     SET_NOTIFY: (state, payload) => {
       console.log('--payload', payload)
       let doms = document.getElementsByClassName('el-notification')