Authored by 王涛

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

告警概览 24小时趋势图加载中,增加加载logo



See merge request !511
... ... @@ -141,6 +141,13 @@ layui.define(['admin', 'form', 'table', 'element', 'sessions', 'common', 'echart
}
}
})
//lsq 数据加载完成前增加加载中显示 2022-03-31
alarmTrendChart.showLoading({
text: '数据正在加载...',
textStyle: { fontSize : 30 , color: '#444' },
color:'#1e9fff',
effectOption: {backgroundColor: 'rgba(0, 0, 0, 0)'}
});
//24小时告警趋势图
$.ajax({
url: domainName + `/api-web/bAlarm/overViewChartByType?access_token=${accessToken}&type=trend`,
... ... @@ -344,7 +351,9 @@ layui.define(['admin', 'form', 'table', 'element', 'sessions', 'common', 'echart
}],
series: type === 'bar' ? barSeries : lineSeries
}
echartObject.setOption(option)
echartObject.setOption(option);
//lsq 数据加载完成后关闭加载中显示 2022-03-31
echartObject.hideLoading();
}
//12个月份的数据表格
... ...