|
@@ -19,7 +19,7 @@ layui.define(['admin', 'form', 'table', 'element', 'sessions', 'common', 'echart |
|
@@ -19,7 +19,7 @@ layui.define(['admin', 'form', 'table', 'element', 'sessions', 'common', 'echart |
|
19
|
var currSelect = 0;
|
19
|
var currSelect = 0;
|
|
20
|
var list = [];
|
20
|
var list = [];
|
|
21
|
var dataList = [];
|
21
|
var dataList = [];
|
|
22
|
- var date = '2021';
|
22
|
+ var date = new Date().getFullYear();
|
|
23
|
|
23
|
|
|
24
|
getChartData();
|
24
|
getChartData();
|
|
25
|
// loadAlarmOverChart1(alarmTrendChart,null,'24小时趋势表');
|
25
|
// loadAlarmOverChart1(alarmTrendChart,null,'24小时趋势表');
|
|
@@ -41,7 +41,12 @@ layui.define(['admin', 'form', 'table', 'element', 'sessions', 'common', 'echart |
|
@@ -41,7 +41,12 @@ layui.define(['admin', 'form', 'table', 'element', 'sessions', 'common', 'echart |
|
41
|
$("#overview_time button").on("click",function () {
|
41
|
$("#overview_time button").on("click",function () {
|
|
42
|
$("#overview_time button").removeClass("active");
|
42
|
$("#overview_time button").removeClass("active");
|
|
43
|
$(this).addClass("active");
|
43
|
$(this).addClass("active");
|
|
44
|
- date = $(this).data("years");
|
44
|
+ // date = $(this).data("years");
|
|
|
|
45
|
+ if($(this).data("years")=='lastYear'){
|
|
|
|
46
|
+ date = new Date().getFullYear()-1;
|
|
|
|
47
|
+ }else if($(this).data("years")=='year'){
|
|
|
|
48
|
+ date=new Date().getFullYear();
|
|
|
|
49
|
+ }
|
|
45
|
if (currSelect === 0) {
|
50
|
if (currSelect === 0) {
|
|
46
|
loadResourceTable('resType','overviewResTypeTable');
|
51
|
loadResourceTable('resType','overviewResTypeTable');
|
|
47
|
} else if (currSelect === 1) {
|
52
|
} else if (currSelect === 1) {
|
