修改维修必填字段和没有权限推出的问题
This commit is contained in:
+19
-4
@@ -13,7 +13,7 @@ let global_callback = function () {};
|
||||
let timeoutObj = null;
|
||||
let timeout = 28 * 1000; //30秒一次心跳
|
||||
let serverTimeoutObj = 60; //心跳倒计时
|
||||
let timeOutNum = 60; //断开 重连倒计时
|
||||
let timeOutNum = 60; // 断开 重连倒计时
|
||||
let lockReconnect = false; //是否真正建立连接
|
||||
const wsUri = systemConfig.WS_URL;
|
||||
let showNot = null;
|
||||
@@ -46,7 +46,8 @@ function startHeartbeat() {
|
||||
start();
|
||||
}
|
||||
|
||||
function start() {//开启心跳
|
||||
//开启心跳
|
||||
function start() {
|
||||
timeoutObj && clearTimeout(timeoutObj);
|
||||
serverTimeoutObj && clearTimeout(serverTimeoutObj);
|
||||
timeoutObj = setTimeout(function () {
|
||||
@@ -65,7 +66,22 @@ function start() {//开启心跳
|
||||
}
|
||||
|
||||
function createWebSocket(callback, token) {
|
||||
if (websocket == null || typeof websocket !== WebSocket) {
|
||||
console.log(websocket,'websocket')
|
||||
// if (websocket == null || typeof websocket !== WebSocket) {
|
||||
// initWebSocket(callback, token);
|
||||
// }
|
||||
|
||||
// websocket.readyState 0 (CONNECTING) 1 (OPEN) 2 (CLOSING) 3 (CLOSED)
|
||||
// 0 连接正在建立中,尚未连接
|
||||
// 1 已经建立,可以进行通信
|
||||
// 2 关闭握手过程,即将关闭
|
||||
// 3 闭或者根本没有建立
|
||||
|
||||
if(websocket && websocket.readyState === 1){
|
||||
return
|
||||
}
|
||||
console.log(websocket)
|
||||
if (websocket === null || websocket.readyState === 3) {
|
||||
initWebSocket(callback, token);
|
||||
}
|
||||
}
|
||||
@@ -121,7 +137,6 @@ function closeSock(active) {
|
||||
function webSocketOnMessage(msg) {
|
||||
// 收到信息为Blob类型时
|
||||
let result = null;
|
||||
// debugger
|
||||
// 二进制文件
|
||||
if (msg.data instanceof Blob) {
|
||||
const reader = new FileReader();
|
||||
|
||||
Reference in New Issue
Block a user