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

hotfix for chat

See merge request !135

src/store/modules/socket.js

@@ -37,7 +37,7 @@ const socket = {
       });
       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) {
@@ -48,11 +48,12 @@ const 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
+        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);  
+        console.log('operateUserId---', operateUserId);
+        console.log('n.operateUserId---', n.operateUserId);
         if (
           path &&
           String(path).indexOf('workbench') > -1 &&
@@ -121,9 +122,10 @@ const socket = {
                       type: 'warning',
                       duration: 1000,
                     });
-                    return false;
+                    cn.close();
+                  } else {
+                    window._VM.$store.dispatch('main/gotoInquiry', payload);
                   }
-                  window._VM.$store.dispatch('main/gotoInquiry', payload);
                   cn.close();
                 },
               },