Merge branch 'develop' into 'release'

Develop

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

src/components/common/diagnoseAdvice.vue

@@ -53,7 +53,7 @@
       <span>诊断建议：</span>
       <div class="record-music">
         <upload-music
-          :musicList="illnessAudioUrls"
+          :musicList="currentAdvice.illnessAudioUrls"
           ref="musicComponent"
         ></upload-music>
       </div>
@@ -76,7 +76,7 @@ export default {
   data() {
     return {
       diagnoseAdvice: "",
-      illnessAudioUrls: [],
+
     };
   },
   props: {

src/components/editor/upload-music.vue

@@ -32,6 +32,7 @@
 <script>
 import fetch from "@/utils/fetch";
 import { getBaseUrl } from "@/utils/index";
+import refundDetailVue from '../../views/IM/diagnosis-admin/refund-detail.vue';
 export default {
   props: {
     isDisable: {
@@ -57,16 +58,22 @@ export default {
     };
   },
   created() {
+    this.musicArr = this.musicList
+    console.log(console.log('this.musicList',this.musicArr))
     this.actionurl = getBaseUrl("/diagnose/illness/audio/upload");
   },
-  watch:{
-    musicList(newv, oldv) {
-      this.musicArr = newv;
-    }
-  },
-  computed: {
-   
-  },
+  // watch:{
+  //   musicList(newv, oldv) {
+  //     this.musicArr = newv;
+  //     console.log('this.musicArr',this.musicAr)
+  //   }
+  // },
+  // computed: {
+
+  //     musicArr(){
+  //       return this.musicList
+  //     }
+  // },
   methods: {
      musicUrl(item) {
        if (item.url) {
@@ -84,7 +91,7 @@ export default {
         this.loading = false
         clearTimeout(time)
       },1000)
-      
+
     },
     sucess(response, file, fileList) {
       this.musicArr = fileList;
@@ -167,4 +174,4 @@ export default {
     display: inline-block;
 }
 }
-</style>
\ No newline at end of file
+</style>

src/store/module/socket.js

@@ -11,13 +11,14 @@ 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,
       });
+      console.log('-=-=-initSocket次数', socket);
       commit('SET_SOCKET', socket);
       commit('SET_IOLISTION');
     },
@@ -33,18 +34,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 +70,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 +88,10 @@ export default {
         console.log('--reconnect', socket);
         // ...
       });
+      state.socketClient.on('reconnecting', (attemptNumber) => {
+        // ...
+        console.log('--reconnecting', attemptNumber);
+      });
     },
     SET_NOTIFY: (state, payload) => {
       console.log('--payload', payload)
@@ -135,18 +137,6 @@ export default {
         duration: 5000,
         position: 'top-right',
       })
-    },
-    RECONNECT_SOCKET: (state, payload) => {
-      if(socketTimer){
-        console.log('RECONNECT_SOCKET--已经存在');
-      }else{
-        const i = storejs.get('initSocketInfo');
-        console.log('RECONNECT_SOCKET-- 重新链接', i);
-        socketTimer =  setInterval(function (){
-          console.log('----initSocketInfo', i);
-          store.dispatch( 'socket/initSocket', i)
-        }, 2000);
-      }
     }
   },
 };

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

@@ -192,6 +192,8 @@ export default {
       let url = `/im/team/call/direct/`;
       let params = {
         imAccId: data.accId,
+        imTeamId: data.imTeamId,
+        liveRoomId: this.roomId
       };
       this.POST(url, params).then((res) => {
         if (res.code === "000000") {

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>

src/views/layout/slidebar.vue

@@ -138,10 +138,10 @@ export default {
            url ='https://test1-sockets.yunqueyi.com';
           break;
         case 'uat':
-          url ='https://uat-sso-sockets.yunqueyi.com';
+          url ='https://uat-sockets.yunqueyi.com';
           break;
-        case 'pro':
-          url ='https://sso-sockets.yunqueyi.com';
+        case 'pro':s
+          url ='https://sockets.yunqueyi.com';
           break;
         default:
           url ='https://dev-sockets.yunqueyi.com';