monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 4ad447987347ee756354ca038a16c13ce7507aeb 2 parents c1fe60a4 9616523b

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

系统管理->基础信息->指标管理、资源类型管理、业务类型管理、数据字典、可视化配置查询按钮取消掉图标，资源类型管理-属性管理、业务类型管理-资源绑定增加查询按钮 #1



See merge request !708
Inline Side-by-side
Showing 11 changed files with 60 additions and 44 deletions
... ... @@ -463,6 +463,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
reloadTable(resType);
}
});
//lsq 业务类型管理绑定资源页增加搜索按钮 2022-06-30
$('#bustypeReslistQueryBtn').unbind('click').on('click', function () {
reloadTable(resType);
})
//选择框搜索事件
bindSelectEvent();
//渲染表格
... ...
... ... @@ -21,6 +21,10 @@ layui.define(['table', 'form', 'sessions', 'common', 'admin'], function (exports
reloadResCiTable();
}
});
//lsq 资源类型管理的属性管理页增加搜索按钮 2022-06-30
$('#rescilistQueryBtn').unbind('click').on('click', function () {
reloadResCiTable();
})
// radio选择框搜索事件
form.on('radio(rescilist-dataResource)', function (data) {
reloadResCiTable();
... ...
<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">
... ... @@ -14,11 +14,10 @@
lay-tips="关键字检索包含 </br>业务名称" placeholder="输入关键字，回车搜索" type="text">
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="bustypeQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
</button>
</div>
<button class="layui-btn layui-btn-normal" id="bustypeQueryBtn" type="button">
<!--lsq 查询按钮取消掉图标 2022-06-30-->
查询
</button>
</div>
</form>
</div>
... ... @@ -48,7 +47,7 @@
<script id="bustype-reslist-table" type="text/html">
<div class="page-panel">
<div class="main">
<div class="main commonDiv">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-status">
... ... @@ -81,6 +80,9 @@
</select>
</div>
</div>
<button class="layui-btn layui-btn-normal" id="bustypeReslistQueryBtn" type="button">
查询
</button>
</div>
</form>
</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">
... ... @@ -20,11 +20,10 @@
type="text">
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="ddicQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
</button>
</div>
<button class="layui-btn layui-btn-normal" id="ddicQueryBtn" type="button">
<!--lsq 查询按钮取消掉图标 2022-06-30-->
查询
</button>
</div>
</form>
</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">
... ... @@ -39,11 +39,10 @@
name="kpiPower"></div>
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="kpiQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
</button>
</div>
<button class="layui-btn layui-btn-normal" id="kpiQueryBtn" type="button">
<!-- lsq 查询按钮取消掉图标 2022-06-30-->
查询
</button>
</div>
<div class="layui-form-item">
<div class="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">
... ... @@ -15,11 +15,10 @@
placeholder="输入关键字，回车搜索" type="text">
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="machineroomQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
</button>
</div>
<button class="layui-btn layui-btn-normal" id="machineroomQueryBtn" type="button">
<!--lsq 查询按钮取消掉图标 2022-06-30-->
查询
</button>
</div>
</form>
</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">
... ... @@ -25,11 +25,10 @@
</select>
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="resTypeQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
</button>
</div>
<button class="layui-btn layui-btn-normal" id="resTypeQueryBtn" type="button">
<!--lsq 查询按钮取消掉图标 2022-06-30-->
查询
</button>
</div>
</form>
</div>
... ...
... ... @@ -4,7 +4,7 @@
var params = JSON.parse(d);
}}
<div class="page-panel">
<div class="main">
<div class="main commonDiv">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-status">
... ... @@ -28,6 +28,9 @@
</select>
</div>
</div>
<button class="layui-btn layui-btn-normal" id="rescilistQueryBtn" type="button">
查询
</button>
{{#
if(params && params.resTypeCode){
}}
... ...
... ... @@ -2,13 +2,13 @@
<div :style="{'min-height':height+'px','max-height':height+'px','height':'100%'}" class="cm-card">
<div class="search">
<div class="condition">
<div class="keyword" style="padding-left: 10px">
<div class="condition" style="padding-top:6px;">
<div class="keyword" >
<el-input :size="$global.elementConfig.size.input" @keydown.enter.native="getDataList"
placeholder="请输入关键字(回车搜索)" v-model="search.keyword"></el-input>
</div>
<div class="selectType" style="padding-left: 10px;width: 120px;">
<div class="selectType" style="padding-left: 6px;width: 120px;">
<el-select :size="$global.elementConfig.size.input" @change="onChangeStripe" class="m-2"
placeholder="请选择" v-model="couponSelected">
<el-option
... ... @@ -18,7 +18,9 @@
v-for="item in typeOptions"/>
</el-select>
</div>
<div style="margin-right:9px!important;">
<el-button :size="$global.elementConfig.size.button" type="primary" @click="getDataList()">查询</el-button>
</div>
<el-button :size="$global.elementConfig.size.button" @click="addAj()">新增</el-button>
</div>
... ...
... ... @@ -45,7 +45,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
return false;
}
});
//查询按钮点击事件 joke add 20210428
$('#bustypeQueryBtn').on('click', function () {
loadBusTypeTable();
... ... @@ -497,6 +496,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
reloadTable(resType);
}
});
//lsq 业务类型管理绑定资源页增加搜索按钮 2022-06-30
$('#bustypeReslistQueryBtn').unbind('click').on('click', function () {
reloadTable(resType);
})
//选择框搜索事件
bindSelectEvent();
//渲染表格
... ...
<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">
... ... @@ -14,11 +14,10 @@
lay-tips="关键字检索包含 </br>业务名称" placeholder="输入关键字，回车搜索" type="text">
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="bustypeQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
</button>
</div>
<button class="layui-btn layui-btn-normal" id="bustypeQueryBtn" type="button">
<!--lsq 查询按钮取消掉图标 2022-06-30-->
查询
</button>
</div>
</form>
</div>
... ... @@ -48,7 +47,7 @@
<script id="bustype-reslist-table" type="text/html">
<div class="page-panel">
<div class="main">
<div class="main commonDiv">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-status">
... ... @@ -81,6 +80,9 @@
</select>
</div>
</div>
<button class="layui-btn layui-btn-normal" id="bustypeReslistQueryBtn" type="button">
查询
</button>
</div>
</form>
</div>
... ...