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
a0962e64e154198664a9ed29ab1373265f46cae6
1 parent
fe16b823
【1390】【 告警中心】活动告警/历史告警,搜索按钮默认显示,其他搜索条件超出隐藏 #5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
16 deletions
hg-monitor-web-base/src/main/resources/static/src/style/css/main.css
hg-monitor-web-base/src/main/resources/static/src/views/alarm/activewarning.html
hg-monitor-web-base/src/main/resources/static/src/views/alarm/historywarning.html
hg-monitor-web-qh/src/main/resources/static/src/controller/activewarning.js
hg-monitor-web-qh/src/main/resources/static/src/controller/historywarning.js
hg-monitor-web-base/src/main/resources/static/src/style/css/main.css
View file @
a0962e6
...
...
@@ -7855,6 +7855,10 @@ form[lay-filter="activewarning-form"],form[lay-filter="historywarning-form"]{
display
:
flex
;
justify-content
:
flex-start
;
}
#seachActiveWarning
,
#seachHistoryWarning
{
margin-top
:
6px
;
margin-right
:
6px
;
}
#openStow
,
#openStowHis
{
color
:
#1E9FFF
;
cursor
:
pointer
;
...
...
hg-monitor-web-base/src/main/resources/static/src/views/alarm/activewarning.html
View file @
a0962e6
...
...
@@ -90,15 +90,12 @@
<button class="layui-btn layui-btn-sm layui-btn-normal" type="button" id="todayOrAllBtn" >今日告警</button>
</div>
</div>-->
</div>
</div>
<!--lsq 活动告警增加搜索按钮 2022-06-21-->
<div
class=
"layui-inline"
>
<div
class=
"layui-input-inline layui-input-inline-sm"
>
<button
type=
"button"
id=
"seachActiveWarning"
class=
"layui-btn layui-btn-normal layui-btn-normal"
>
搜索
</button>
</div>
</div>
</div>
</div>
<span
id=
"openStow"
>
展开
</span>
</form>
</div>
...
...
hg-monitor-web-base/src/main/resources/static/src/views/alarm/historywarning.html
View file @
a0962e6
...
...
@@ -80,15 +80,11 @@
</select>
</div>
</div>
</div>
</div>
<!--lsq 历史告警增加搜索按钮 2022-06-21-->
<div
class=
"layui-inline"
>
<div
class=
"layui-input-inline layui-input-inline-sm"
>
<button
type=
"button"
id=
"seachHistoryWarning"
class=
"layui-btn layui-btn-normal layui-btn-normal"
>
搜索
</button>
</div>
</div>
</div>
</div>
<span
id=
"openStowHis"
>
展开
</span>
</form>
</div>
...
...
hg-monitor-web-qh/src/main/resources/static/src/controller/activewarning.js
View file @
a0962e6
...
...
@@ -1277,10 +1277,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
}
//start lsq 活动告警搜索条件太多,增加展开/收起的功能 2022-06-21
let
formWidth
=
$
(
'form[lay-filter="activewarning-form"] .layui-form-item'
).
width
();
let
winWidth
=
$
(
window
).
width
();
if
(
formWidth
+
300
>
winWidth
){
let
winWidth
=
$
(
'form[lay-filter="historywarning-form"]'
).
parent
().
parent
(
'.layui-card-header'
).
width
();
if
(
formWidth
+
100
>
winWidth
){
$
(
'#openStow'
).
css
(
'display'
,
'inline-block'
)
$
(
'form[lay-filter="activewarning-form"] .form-item-open-stow'
).
css
(
'width'
,(
formWidth
-
50
)
+
'px'
);
$
(
'form[lay-filter="activewarning-form"] .form-item-open-stow'
).
css
(
'height'
,
'50px'
);
}
else
{
$
(
'#openStow'
).
css
(
'display'
,
'none'
)
}
$
(
"#openStow"
).
unbind
(
'click'
).
on
(
'click'
,
function
(){
if
(
$
(
this
).
text
()
==
'展开'
){
...
...
hg-monitor-web-qh/src/main/resources/static/src/controller/historywarning.js
View file @
a0962e6
...
...
@@ -790,10 +790,14 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
//start lsq 历史告警搜索条件太多,增加展开/收起的功能 2022-06-21
let
formWidth
=
$
(
'form[lay-filter="historywarning-form"] .layui-form-item'
).
width
();
let
winWidth
=
$
(
window
).
width
();
if
(
formWidth
+
250
>
winWidth
){
let
winWidth
=
$
(
'form[lay-filter="historywarning-form"]'
).
parent
().
parent
(
'.layui-card-header'
).
width
();
if
(
formWidth
+
100
>
winWidth
){
$
(
'#openStowHis'
).
css
(
'display'
,
'inline-block'
)
$
(
'form[lay-filter="historywarning-form"] .form-item-open-stow'
).
css
(
'width'
,(
formWidth
-
50
)
+
'px'
);
$
(
'form[lay-filter="historywarning-form"] .form-item-open-stow'
).
css
(
'height'
,
'50px'
);
}
else
{
$
(
'#openStowHis'
).
css
(
'display'
,
'none'
)
}
$
(
"#openStowHis"
).
unbind
(
'click'
).
on
(
'click'
,
function
(){
if
(
$
(
this
).
text
()
==
'展开'
){
...
...
Please
register
or
login
to post a comment