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

Merge branch 'feat/zl' into 'develop'

save

See merge request !97
...@@ -71,11 +71,11 @@ export default { ...@@ -71,11 +71,11 @@ export default {
// ... // ...
}); });
state.socketClient.on("reconnect", (socket) => { socketClient.on("reconnect", (socket) => {
console.log('--reconnect', socket); console.log('--reconnect', socket);
// ... // ...
}); });
state.socketClient.on('reconnecting', (attemptNumber) => { socketClient.on('reconnecting', (attemptNumber) => {
// ... // ...
console.log('--reconnecting', attemptNumber); console.log('--reconnecting', attemptNumber);
}); });
...@@ -87,70 +87,70 @@ export default { ...@@ -87,70 +87,70 @@ export default {
state.socketClient = payload; state.socketClient = payload;
}, },
SET_IOLISTION: (state, payload) => { // SET_IOLISTION: (state, payload) => {
if(!state.socketClient){ // if(!state.socketClient){
return false; // return false;
} // }
state.socketClient.on("connect", (socket) => { // state.socketClient.on("connect", (socket) => {
console.log ('socket 链接成功', socket, state.socketClient); // console.log ('socket 链接成功', socket, state.socketClient);
}); // });
state.socketClient.on("connect_error", (err) => { // state.socketClient.on("connect_error", (err) => {
console.log ('socket connect_error',err); // console.log ('socket connect_error',err);
// state.socketClient.connect(); // // state.socketClient.connect();
}); // });
state.socketClient.on("disconnect", (socket) => { // state.socketClient.on("disconnect", (socket) => {
console.log ('socket disconnect----',socket); // console.log ('socket disconnect----',socket);
// state.socketClient.connect(); // // state.socketClient.connect();
}); // });
state.socketClient.on("diagnose_push_event", (socket) => { // state.socketClient.on("diagnose_push_event", (socket) => {
console.log('diagnose_push_event---', socket); // console.log('diagnose_push_event---', socket);
const {list,allSize,countRespList} = socket; // const {list,allSize,countRespList} = socket;
console.log('--_VM', _VM.$route) // console.log('--_VM', _VM.$route)
store.commit('updateCurrentDiagList', list); // store.commit('updateCurrentDiagList', list);
store.commit('updateAllSize', allSize); // store.commit('updateAllSize', allSize);
store.commit('updateCurrentCalList', countRespList); // store.commit('updateCurrentCalList', countRespList);
}); // });
state.socketClient.on("diagnose_call_push_event", (socket) => { // state.socketClient.on("diagnose_call_push_event", (socket) => {
console.log('diagnose_call_push_event---', socket); // console.log('diagnose_call_push_event---', socket);
const l = store.state.noticeList; // const l = store.state.noticeList;
if(l.length >=5){ // if(l.length >=5){
l.shift(); // l.shift();
} // }
l.push(socket); // l.push(socket);
const n = {notifyIndex: l.length, ...socket} // const n = {notifyIndex: l.length, ...socket}
store.commit('updateNoticeList', l); // store.commit('updateNoticeList', l);
console.log('--_VM', _VM) // console.log('--_VM', _VM)
const {path} =_VM.$route; // const {path} =_VM.$route;
console.log("n--------",n) // console.log("n--------",n)
const operateUserId=store.state.soketQuest.operateUserId?store.state.soketQuest.operateUserId:'' // const operateUserId=store.state.soketQuest.operateUserId?store.state.soketQuest.operateUserId:''
if(path && String(path).indexOf('workbench') > -1&&n.operateUserId==operateUserId){ // if(path && String(path).indexOf('workbench') > -1&&n.operateUserId==operateUserId){
store.commit('socket/SET_NOTIFY', n); // store.commit('socket/SET_NOTIFY', n);
} // }
}); // });
state.socketClient.on('ping', function () { // state.socketClient.on('ping', function () {
console.log('[E] 心跳请求已发出 →', state.socketClient); // console.log('[E] 心跳请求已发出 →', state.socketClient);
if(socketTimer){ // if(socketTimer){
clearInterval(socketTimer); // clearInterval(socketTimer);
} // }
}); // });
//收到 // //收到
state.socketClient.on('pong', function (socket) { // state.socketClient.on('pong', function (socket) {
console.log('[E] 心跳响应已收到 ←', socket, state.socketClient); // console.log('[E] 心跳响应已收到 ←', socket, state.socketClient);
}); // });
state.socketClient.io.on("reconnect_attempt", (socket) => { // state.socketClient.io.on("reconnect_attempt", (socket) => {
console.log('--reconnect_attempt', socket); // console.log('--reconnect_attempt', socket);
// ... // // ...
}); // });
//
state.socketClient.on("reconnect", (socket) => { // state.socketClient.on("reconnect", (socket) => {
console.log('--reconnect', socket); // console.log('--reconnect', socket);
// ... // // ...
}); // });
state.socketClient.on('reconnecting', (attemptNumber) => { // state.socketClient.on('reconnecting', (attemptNumber) => {
// ... // // ...
console.log('--reconnecting', attemptNumber); // console.log('--reconnecting', attemptNumber);
}); // });
}, // },
SET_NOTIFY: (state, payload) => { SET_NOTIFY: (state, payload) => {
console.log('--payload', payload) console.log('--payload', payload)
let doms = document.getElementsByClassName('el-notification') let doms = document.getElementsByClassName('el-notification')
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册