Merge branch 'feat/zl' into 'release-new'

root state

See merge request !136

src/store/modules/socket.js

@@ -6,14 +6,14 @@ const socket = {
   },
   actions: {
     initSocket(context, payload) {
+      const { rootState } = context;
       const socketClient = io.connect(payload.url, {
         query: {
           loginUserNum: `diagnose_list_socket_${payload.userId}`,
         },
         // reconnection: false,
       });
-      console.log('-=-=-initSocket次数', socketClient);
-      context.commit('SET_SOCKET', socketClient);
+      context.commit('SET_SOCKET', socketClient, rootState);
       socketClient.on('connect', (socket) => {
         console.log('socket 链接成功', socket, socketClient);
       });
@@ -26,9 +26,7 @@ const socket = {
         // state.socketClient.connect();
       });
       socketClient.on('diagnose_push_event', (socket) => {
-        console.log('sdjfhsdjkfhsajkdfhasjkdfhasjk------------', socket);
         const { list, allSize, countRespList } = socket;
-        console.log('sdjfhsdjkfhsajkdfhasjkdfhasjk------------');
         context.commit('main/updateCurrentCalList', countRespList, {
           root: true,
         });
@@ -36,9 +34,6 @@ const socket = {
         context.commit('main/updateAllSize', allSize, { root: true });
       });
       socketClient.on('diagnose_call_push_event', (socket) => {
-        console.log('diagnose_call_push_event---', socket);
-
-        console.log('context.state.noticeList', window._VM.$store);
         const l = window._VM.$store.state.main.noticeList;
         if (l.length >= 5) {
           l.shift();
@@ -46,21 +41,18 @@ const socket = {
         l.push(socket);
         const n = { notifyIndex: l.length, ...socket };
         context.commit('main/updateNoticeList', l, { root: true });
-        console.log('n--------', n);
         const { path } = window._VM.$route;
         const operateUserId = window._VM.$store.state.main.soketQuest
           .operateUserId
           ? window._VM.$store.state.main.soketQuest.operateUserId
           : '';
-        console.log('operateUserId---', operateUserId);
-        console.log('n.operateUserId---', n.operateUserId);
         if (
           path &&
           String(path).indexOf('workbench') > -1 &&
           n.operateUserId == operateUserId
         ) {
-          console.log(11111111111111111111);
-          context.commit('SET_NOTIFY', n);
+          const ni = { notifyInfo: n, rootState: rootState };
+          context.commit('SET_NOTIFY', ni);
         }
       });
       socketClient.on('ping', function () {
@@ -91,18 +83,19 @@ const socket = {
       state.socketClient = payload;
     },
     SET_NOTIFY: (state, payload) => {
-      console.log('--payload', payload);
       const doms = document.getElementsByClassName('el-notification');
       if (doms.length >= 5) return;
       const h = window._VM.$createElement;
-
-      const t = payload.department
-        ? `问诊单${payload.diagnoseLogId}(${payload.department})`
-        : `问诊单${payload.diagnoseLogId}`;
+      const { notifyInfo, rootState } = payload;
+      const t = notifyInfo.department
+        ? `问诊单${notifyInfo.diagnoseLogId}(${notifyInfo.department})`
+        : `问诊单${notifyInfo.diagnoseLogId}`;
       // userCallKfStatus 医助呼叫
       // doctorCallKfStatus 医生呼叫
       const name =
-        payload.userCallKfStatus == 1 ? payload.userName : payload.doctorName;
+        notifyInfo.userCallKfStatus == 1
+          ? notifyInfo.userName
+          : notifyInfo.doctorName;
       const cn = window._VM.$notify({
         title: t,
         message: h('p', [
@@ -114,8 +107,8 @@ const socket = {
               style: `float:right;margin-top:${30}px;`,
               on: {
                 click: function () {
-                  console.log('----state', state);
-                  if (state.showChat) {
+                  console.log('----state', rootState);
+                  if (rootState.showChat) {
                     window._VM.$message({
                       message:
                         '不可同时进入多个诊室，请先退出已进入的诊室，再试。',
@@ -124,7 +117,7 @@ const socket = {
                     });
                     cn.close();
                   } else {
-                    window._VM.$store.dispatch('main/gotoInquiry', payload);
+                    window._VM.$store.dispatch('main/gotoInquiry', notifyInfo);
                   }
                   cn.close();
                 },
@@ -134,7 +127,7 @@ const socket = {
           ),
         ]),
         onClose: function () {
-          console.log('--onClose', payload);
+          console.log('--onClose', notifyInfo);
         },
         duration: 5000,
         position: 'top-right',

vue.config.js

@@ -71,7 +71,7 @@ module.exports = {
     port: 8080,
     proxy: {
       '/proxy': {
-        target: 'https://dev-sc.yunqueyi.com/',
+        target: 'https://test1-sc.yunqueyi.com/',
         ws: false,
         changeOrigin: true,
         secure: true,