Toggle navigation
Toggle navigation
This project
Loading...
Sign in
monitor_v3
/
hg-monitor-web
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
鲁尚清
3 years ago
Commit
169cbc49ec6aa7a3769566fae6a85cc210cd215d
1 parent
ed5b3594
【1431】 A4,告警概览功能下面的列表数据与上面的图标对不上 #1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
3 deletions
hg-monitor-web-base/src/main/resources/static/src/controller/overviewIndex.js
hg-monitor-web-base/src/main/resources/static/src/views/alarm/overview.html
hg-monitor-web-base/src/main/resources/static/src/controller/overviewIndex.js
View file @
169cbc4
...
...
@@ -20,7 +20,8 @@ layui.define(['admin', 'form', 'table', 'element', 'sessions', 'common', 'echart
var
list
=
[];
var
dataList
=
[];
var
date
=
'2021'
;
//lsq 调用获取今年和去年年份 2022-07-04
getYearDate
();
getChartData
();
// loadAlarmOverChart1(alarmTrendChart,null,'24小时趋势表');
loadResourceTable
(
'resType'
,
'overviewResTypeTable'
);
...
...
@@ -435,5 +436,22 @@ layui.define(['admin', 'form', 'table', 'element', 'sessions', 'common', 'echart
alink
.
click
();
document
.
body
.
removeChild
(
alink
);
}
//lsq 获取今年和去年的年份赋值给按钮 2022-07-04
function
getYearDate
(){
let
myDate
=
new
Date
();
let
thisYear
=
getDateTime
(
myDate
);
myDate
.
setFullYear
(
myDate
.
getFullYear
()
-
1
);
let
lastYear
=
getDateTime
(
myDate
);
$
(
'#thisYear'
).
attr
(
'data-years'
,
thisYear
);
$
(
'#lastYear'
).
attr
(
'data-years'
,
lastYear
);
date
=
thisYear
;
}
//获取时间点 转年月日的方法
function
getDateTime
(
newDate
){
let
year
=
newDate
.
getFullYear
();
//获取年
return
year
;
}
});
});
\ No newline at end of file
...
...
hg-monitor-web-base/src/main/resources/static/src/views/alarm/overview.html
View file @
169cbc4
...
...
@@ -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"
id=
"lastYear"
data-years=
"2020"
>
去年
</button>
<button
type=
"button"
class=
"layui-btn layui-btn-primary layui-btn-sm active"
id=
"thisYear"
data-years=
"2021"
>
今年
</button>
</div>
<button
class=
"layui-btn layui-btn-sm layui-btn-normal tab-button"
id=
"btn_overview_export_excel"
>
<i
class=
"layui-icon"
>

</i>
导出到Excel
...
...
Please
register
or
login
to post a comment