monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 8c069c21dea60ea149035994c704ce5b9b73fecb 2 parents 6497464f 6b8ea03c

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

【无】采集器管理、指令管理、TRAP配置、密码修改记录、告警策略、告警模板及告警模板中的配置资源，查询按钮取消掉图标，无查询按钮的增加查询按钮，搜索条件过多增加展开/收起 #1



See merge request !703
Inline Side-by-side
Showing 9 changed files with 81 additions and 34 deletions
... ... @@ -80,7 +80,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
reloadTable(resType);
}
});
//lsq 资源页增加搜索按钮 2022-06-29
$('#seachResListTable').unbind('click').on('click', function () {
reloadTable(resType);
})
//选择框搜索事件
bindSelectEvent();
... ... @@ -110,7 +113,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
collProtocolList: $("#resManageIndexForm").find("select[id='collProtocol']").val(),
pageName: 'reslist'
}
, height: 'full-350'
// , height: 'full-350'
//lsq 配置资源弹框的表格高度调整 2022-06-29
, height: 'full-250'
, cellMinWidth: 80
, page: {
layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
... ... @@ -289,6 +294,46 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
function getAllCheckData() {
return resListSelectIds;
}
//start lsq 活动告警搜索条件太多，增加展开/收起的功能 2022-06-21
let formWidth =$('.form-item-open-stow').width();
let elem=$('.form-item-open-stow');
if(elem){
for(let i=0;i<elem.length;i++){
if($(elem[i]).width()){
formWidth=$(elem[i]).width();
}
}
}
if(!formWidth){
formWidth= sessionStorage.getItem('formWidth');
}else{
sessionStorage.setItem('formWidth',formWidth)
}
let winWidth = $('.form-item-open-stow').parents('.layui-status').width();
let elemW=$('.form-item-open-stow').parents('.layui-status');
if(elemW){
for(let i=0;i<elemW.length;i++){
if($(elemW[i]).width()){
winWidth=$(elemW[i]).width();
}
}
}
if (formWidth + 130 > winWidth) {
$('.openStow').css('display', 'inline-block')
$('.form-item-open-stow').css('height', '50px');
} else {
$('.openStow').css('display', 'none')
}
$(".openStow").unbind('click').on('click', function () {
if ($(this).text() == '展开') {
$(this).text('收起')
$('.form-item-open-stow').css('height', 'auto');
} else {
$(this).text('展开')
$('.form-item-open-stow').css('height', '50px');
}
})
//end lsq 2022-06-21
return {getData: getCheckData, getAllCheckData: getAllCheckData, reloadResTable: reloadTable};
});
... ...
... ... @@ -6057,7 +6057,7 @@ form.form-edit .layui-form-item .layui-input-inline {
}
/*lsq 健康状态样式 2022-06-27*/
.info-box-count-res{
width:260px;
width:230px;
}
.info-box-count > label {
color: #999;
... ... @@ -8540,6 +8540,7 @@ form.layui-card-header.layuiadmin-card-header-auto {
.res .layui-form-item .layui-inline,
.commonDiv .layui-form-item .layui-inline{
margin-top:6px;
margin-right: 6px;
}
/*lsq 关系视图搜索栏样式调整 2022-06-27*/
.relation .layui-form-item .layui-inline{
... ...
<title>告警策略</title>
<article class="page-container">
<div class="page-panel">
<div class="main">
<div class="main commonDiv">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-status search_panel">
... ... @@ -49,12 +49,11 @@
</select>
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="alarmpolicyQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
<button class="layui-btn layui-btn-normal" id="alarmpolicyQueryBtn" type="button">
<!--lsq 查询按钮取消掉图标 2022-06-29-->
查询
</button>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
... ...
<title>告警模板</title>
<article class="page-container">
<div class="page-panel">
<div class="main">
<div class="main commonDiv">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-status search_panel">
... ... @@ -15,13 +15,11 @@
type="text">
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="alarmtemplateQueryBtn" type="button">
<i
class="layui-icon layui-icon-search"></i>查询
<!--lsq 查询按钮取消掉图标 2022-06-29-->
查询
</button>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
... ...
<title>采集器管理</title>
<article class="page-container">
<div class="page-panel">
<div class="main">
<div class="main commonDiv">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-status">
... ... @@ -33,13 +33,12 @@
<div class="layui-inline">
<div class="multi-query" id="slt-collector-deployStatus"></div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="btn-collector-list-search"
type="button"><i
class="layui-icon layui-icon-search"></i>查询
type="button">
<!--lsq 查询按钮取消掉图标 2022-06-29-->
查询
</button>
</div>
</div>
</form>
</div>
</div>
... ...
<title>指令管理</title>
<article class="page-container">
<div class="page-panel">
<div class="main">
<div class="main commonDiv">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-status">
... ... @@ -40,12 +40,11 @@
</select>
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="dirctiveQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
<button class="layui-btn layui-btn-normal" id="dirctiveQueryBtn" type="button">
<!--lsq 查询按钮取消掉图标 2022-06-29-->
查询
</button>
</div>
</div>
</form>
</div>
</div>
... ...
<title>密码修改记录</title>
<article class="page-container">
<div class="page-panel">
<div class="main">
<div class="main commonDiv">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-status search_panel">
... ... @@ -17,12 +17,11 @@
<button class="layui-btn" id="orgSearchBtn" style="display: none;">搜索</button>
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="orgQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
<button class="layui-btn layui-btn-normal" id="orgQueryBtn" type="button">
<!--lsq 查询按钮取消掉图标 2022-06-29-->
查询
</button>
</div>
</div>
</form>
</div>
</div>
... ...
<title>TRAP配置</title>
<article class="page-container">
<div class="page-panel">
<div class="main">
<div class="main commonDiv">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-status">
... ... @@ -22,12 +22,11 @@
<div class="layui-inline">
<div class="layui-input-inline" id="slt_trapoid_resType"></div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="trapoidQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
<button class="layui-btn layui-btn-normal" id="trapoidQueryBtn" type="button">
<!--lsq 查询按钮取消掉图标 2022-06-29-->
查询
</button>
</div>
</div>
</form>
</div>
</div>
... ...
<title>资源列表</title>
<article class="page-container">
<div class="page-panel">
<div class="main">
<div class="main commonDiv">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-status">
<form class="layui-form layui-card-header layuiadmin-card-header-auto"
id="resManageIndexForm" lay-filter="res-list-query-form">
<div class="form-item-open-stow">
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
... ... @@ -81,6 +82,13 @@
</div>
</div>
</div>
</div>
<!--lsq 资源增加搜索按钮 2022-06-29-->
<button class="layui-btn layui-btn-normal layui-btn-normal searchButton" id="seachResListTable"
type="button">
查询
</button>
<span class="openStow">展开</span>
</form>
</div>
</div>
... ...