Authored by 王涛

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

告警概览 资源类型统计无数据



See merge request !447
... ... @@ -19,7 +19,7 @@ layui.define(['admin', 'form', 'table', 'element', 'sessions', 'common', 'echart
var currSelect = 0;
var list = [];
var dataList = [];
var date = '2021';
var date = new Date().getFullYear();
getChartData();
// loadAlarmOverChart1(alarmTrendChart,null,'24小时趋势表');
... ... @@ -41,7 +41,12 @@ layui.define(['admin', 'form', 'table', 'element', 'sessions', 'common', 'echart
$("#overview_time button").on("click",function () {
$("#overview_time button").removeClass("active");
$(this).addClass("active");
date = $(this).data("years");
// date = $(this).data("years");
if($(this).data("years")=='lastYear'){
date = new Date().getFullYear()-1;
}else if($(this).data("years")=='year'){
date=new Date().getFullYear();
}
if (currSelect === 0) {
loadResourceTable('resType','overviewResTypeTable');
} else if (currSelect === 1) {
... ...
... ... @@ -69,8 +69,8 @@
<li>业务系统</li>
<li>业务域</li>
<div class="layui-btn-group time-group" id="overview_time" style="margin-left: 60%">
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm" data-years="2020">去年</button>
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm active" data-years="2021">今年</button>
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm" data-years="lastYear">去年</button>
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm active" data-years="year">今年</button>
</div>
<button class="layui-btn layui-btn-sm layui-btn-normal tab-button" id="btn_overview_export_excel">
<i class="layui-icon">&#xe60a;</i>导出到Excel
... ...