提交 d1701c83 编写于 作者: 张磊's avatar 张磊

root state

上级 e02fe50f
...@@ -6,14 +6,14 @@ const socket = { ...@@ -6,14 +6,14 @@ const socket = {
}, },
actions: { actions: {
initSocket(context, payload) { initSocket(context, payload) {
const { rootState } = context;
const socketClient = io.connect(payload.url, { const socketClient = io.connect(payload.url, {
query: { query: {
loginUserNum: `diagnose_list_socket_${payload.userId}`, loginUserNum: `diagnose_list_socket_${payload.userId}`,
}, },
// reconnection: false, // reconnection: false,
}); });
console.log('-=-=-initSocket次数', socketClient); context.commit('SET_SOCKET', socketClient, rootState);
context.commit('SET_SOCKET', socketClient);
socketClient.on('connect', (socket) => { socketClient.on('connect', (socket) => {
console.log('socket 链接成功', socket, socketClient); console.log('socket 链接成功', socket, socketClient);
}); });
...@@ -26,9 +26,7 @@ const socket = { ...@@ -26,9 +26,7 @@ const socket = {
// state.socketClient.connect(); // state.socketClient.connect();
}); });
socketClient.on('diagnose_push_event', (socket) => { socketClient.on('diagnose_push_event', (socket) => {
console.log('sdjfhsdjkfhsajkdfhasjkdfhasjk------------', socket);
const { list, allSize, countRespList } = socket; const { list, allSize, countRespList } = socket;
console.log('sdjfhsdjkfhsajkdfhasjkdfhasjk------------');
context.commit('main/updateCurrentCalList', countRespList, { context.commit('main/updateCurrentCalList', countRespList, {
root: true, root: true,
}); });
...@@ -36,9 +34,6 @@ const socket = { ...@@ -36,9 +34,6 @@ const socket = {
context.commit('main/updateAllSize', allSize, { root: true }); context.commit('main/updateAllSize', allSize, { root: true });
}); });
socketClient.on('diagnose_call_push_event', (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; const l = window._VM.$store.state.main.noticeList;
if (l.length >= 5) { if (l.length >= 5) {
l.shift(); l.shift();
...@@ -46,21 +41,18 @@ const socket = { ...@@ -46,21 +41,18 @@ const socket = {
l.push(socket); l.push(socket);
const n = { notifyIndex: l.length, ...socket }; const n = { notifyIndex: l.length, ...socket };
context.commit('main/updateNoticeList', l, { root: true }); context.commit('main/updateNoticeList', l, { root: true });
console.log('n--------', n);
const { path } = window._VM.$route; const { path } = window._VM.$route;
const operateUserId = window._VM.$store.state.main.soketQuest const operateUserId = window._VM.$store.state.main.soketQuest
.operateUserId .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 ( if (
path && path &&
String(path).indexOf('workbench') > -1 && String(path).indexOf('workbench') > -1 &&
n.operateUserId == operateUserId n.operateUserId == operateUserId
) { ) {
console.log(11111111111111111111); const ni = { notifyInfo: n, rootState: rootState };
context.commit('SET_NOTIFY', n); context.commit('SET_NOTIFY', ni);
} }
}); });
socketClient.on('ping', function () { socketClient.on('ping', function () {
...@@ -91,18 +83,19 @@ const socket = { ...@@ -91,18 +83,19 @@ const socket = {
state.socketClient = payload; state.socketClient = payload;
}, },
SET_NOTIFY: (state, payload) => { SET_NOTIFY: (state, payload) => {
console.log('--payload', payload);
const doms = document.getElementsByClassName('el-notification'); const doms = document.getElementsByClassName('el-notification');
if (doms.length >= 5) return; if (doms.length >= 5) return;
const h = window._VM.$createElement; const h = window._VM.$createElement;
const { notifyInfo, rootState } = payload;
const t = payload.department const t = notifyInfo.department
? `问诊单${payload.diagnoseLogId}(${payload.department})` ? `问诊单${notifyInfo.diagnoseLogId}(${notifyInfo.department})`
: `问诊单${payload.diagnoseLogId}`; : `问诊单${notifyInfo.diagnoseLogId}`;
// userCallKfStatus 医助呼叫 // userCallKfStatus 医助呼叫
// doctorCallKfStatus 医生呼叫 // doctorCallKfStatus 医生呼叫
const name = const name =
payload.userCallKfStatus == 1 ? payload.userName : payload.doctorName; notifyInfo.userCallKfStatus == 1
? notifyInfo.userName
: notifyInfo.doctorName;
const cn = window._VM.$notify({ const cn = window._VM.$notify({
title: t, title: t,
message: h('p', [ message: h('p', [
...@@ -114,8 +107,8 @@ const socket = { ...@@ -114,8 +107,8 @@ const socket = {
style: `float:right;margin-top:${30}px;`, style: `float:right;margin-top:${30}px;`,
on: { on: {
click: function () { click: function () {
console.log('----state', state); console.log('----state', rootState);
if (state.showChat) { if (rootState.showChat) {
window._VM.$message({ window._VM.$message({
message: message:
'不可同时进入多个诊室,请先退出已进入的诊室,再试。', '不可同时进入多个诊室,请先退出已进入的诊室,再试。',
...@@ -124,7 +117,7 @@ const socket = { ...@@ -124,7 +117,7 @@ const socket = {
}); });
cn.close(); cn.close();
} else { } else {
window._VM.$store.dispatch('main/gotoInquiry', payload); window._VM.$store.dispatch('main/gotoInquiry', notifyInfo);
} }
cn.close(); cn.close();
}, },
...@@ -134,7 +127,7 @@ const socket = { ...@@ -134,7 +127,7 @@ const socket = {
), ),
]), ]),
onClose: function () { onClose: function () {
console.log('--onClose', payload); console.log('--onClose', notifyInfo);
}, },
duration: 5000, duration: 5000,
position: 'top-right', position: 'top-right',
......
...@@ -71,7 +71,7 @@ module.exports = { ...@@ -71,7 +71,7 @@ module.exports = {
port: 8080, port: 8080,
proxy: { proxy: {
'/proxy': { '/proxy': {
target: 'https://dev-sc.yunqueyi.com/', target: 'https://test1-sc.yunqueyi.com/',
ws: false, ws: false,
changeOrigin: true, changeOrigin: true,
secure: true, secure: true,
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册