Authored by 鲁尚清

Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into …

…master-v32-lushangqing
... ... @@ -675,15 +675,23 @@ layui.extend({
// 登录页面,展示大屏不进行token过期验证
if (location.hash.indexOf('#/user/login') == -1 && location.hash.indexOf('#/bigscreen/daping') == -1) {
// 调用测试接口,出现过期则会跳转到登录页面
admin.req({
url: domainName + "/api-web/common/test"
, type: "get"
, async: false
, done: function (data) {
tryFunc();
}
});
try {
admin.req({
url: domainName + "/api-web/common/test"
, type: "get"
, async: false
, done: function (data) {
tryIndex = 1;
tryFunc();
}
});
}catch (e) {
// 服务异常:服务重启,网络问题等不可访问等因素
tryIndex = 1;
tryFunc();
}
} else {
tryIndex = 1;
tryFunc();
}
})
... ...