monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit dbab4c0d0e042d1cc37b348005eb2ec3613eb4ed 2 parents e5ee86ae 9c6ef6bb

Merge branch 'master-500-dev-lzc' into 'master-500-dev' 

75首页access_token回退

75首页access_token回退

See merge request !1066
Inline Side-by-side
Showing 1 changed file with 21 additions and 23 deletions
... ... @@ -26,7 +26,6 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
var access_token = sessions.getToken().access_token;
var isNewPwd = sessionStorage.getItem("isNewPwd");
var oldLgn = localStorage.getItem("lgn");
//joke add 20210506
//判定是否第一次登录
... ... @@ -129,13 +128,13 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
// 过滤无资源的业务
filter = '2';
}
var url = `${common.domainName}/api-web/home/business/getBusHealthResultByAlarm?filter=${filter}&layout=${sessionStorage.getItem("userLayout")}&userName=${oldLgn}`
var url = `${common.domainName}/api-web/home/business/getBusHealthResultByAlarm?filter=${filter}&layout=${sessionStorage.getItem("userLayout")}`
$.ajax({
admin.req({
url: url
, type: "get"
, async: false
, success: function (data) {
, done: function (data) {
layer.close(loadIdx);
if (data.code === 0) {
var bizMap = null;
... ... @@ -311,12 +310,11 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
// loadBizInfo();
// }, alarmTimerStep);
}
, error: function (xhr, type, errorThrown) {
layer.close(loadIdx);
$("#indexActiveAlarmList").html('<li style="width:390px;"><p>无告警</p></li>');
}
})
}).error(function () {
layer.close(loadIdx);
$("#indexActiveAlarmList").html('<li style="width:390px;"><p>无告警</p></li>');
});
}
var resourceHealthTips;
... ... @@ -472,10 +470,10 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
//加载资源类型信息
function loadResTypeInfo() {
$.ajax({
url: common.domainName + '/api-web/home/restype/getResTypeHealthResult?userName='+oldLgn
admin.req({
url: common.domainName + '/api-web/home/restype/getResTypeHealthResult'
, type: "get"
, success: function (data) {
, done: function (data) {
layer.close(loadIdx);
if (data.code === 0) {
var resTypelist = data.data
... ... @@ -558,11 +556,11 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
// loadResTypeInfo();
// }, alarmTimerStep);
}
, error: function (xhr, type, errorThrown) {
layer.close(loadIdx);
$("#indexActiveAlarmList").html('<li style="width:390px;"><p>无告警</p></li>');
}
})
}).error(function () {
layer.close(loadIdx);
$("#indexActiveAlarmList").html('<li style="width:390px;"><p>无告警</p></li>');
});
}
//绑定卡片上的事件
... ... @@ -625,9 +623,9 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
});
//获取顺序
$.ajax({
url: common.domainName + "/api-web/home/getMovePlace?userName="+oldLgn,
success: function (res) {
admin.req({
url: common.domainName + "/api-web/home/getMovePlace",
done: function (res) {
if (res.data && res.data.top && res.data.top === 'res') { //资源在顶部
var resTypeBox = $("#indexResTypehealth");
var bizBox = $("#indexbizhealth");
... ... @@ -1143,11 +1141,11 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
// 过滤无资源的业务
filter = '2';
}
var url = `${common.domainName}/api-web/home/business/getBusHealthResultByAlarm?filter=${filter}&layout=${sessionStorage.getItem("userLayout")}&userName=${oldLgn}`
$.ajax({
var url = `${common.domainName}/api-web/home/business/getBusHealthResultByAlarm?filter=${filter}&layout=${sessionStorage.getItem("userLayout")}`
admin.req({
url: url
, type: "get"
, success: function (data) {
, done: function (data) {
if (data.code === 0) {
var bizMap = data.map;
if (bizMap && bizMap.health !== '3') {//不等于优
... ...