monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 张凯
Commit c9aa4f0ff01e13e57acb52c769ef110d535831f1 2 parents 83f4e057 d97cc2aa

Merge branch 'master-500-prod-joke-new' into 'master-500-prod' 

指标组管理及页面指标组管理优化

指标组管理及页面指标组管理优化

See merge request !783
Inline Side-by-side
Showing 7 changed files with 84 additions and 14 deletions
... ... @@ -518,7 +518,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
kpiIdent: e.kpiIdent
},
isUnique: '0',
sort: i,
sort: kpiFlagTableData.length+1,
createUser: form.val('form-flag-edit').createUser,
createTime: common.getToday('')
});
... ...
... ... @@ -22,6 +22,24 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', "commonDe
reloadTable();
}
});
//回车事件
$('#kpiflag_describe').keydown(function (e) {
if (e.keyCode === 13) {
reloadTable();
}
});
//回车事件
$('#kpiflag_kpis').keydown(function (e) {
if (e.keyCode === 13) {
reloadTable();
}
});
//回车事件
$('#kpiflag_restypes').keydown(function (e) {
if (e.keyCode === 13) {
reloadTable();
}
});
$("#kpiflagQueryBtn").unbind().on("click", function () {
reloadTable();
})
... ... @@ -53,6 +71,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', "commonDe
, where: {
access_token: accessToken,
keyWord: $("#kpiflag_keyword").val(),
describe: $("#kpiflag_describe").val(),
kpis: $("#kpiflag_kpis").val(),
restypes: $("#kpiflag_restypes").val(),
dimension: $('select[name="dimension"]').val()
}
, height: 'full-200'
... ... @@ -173,6 +194,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', "commonDe
, where: {
access_token: accessToken,
keyWord: $("#kpiflag_keyword").val(),
describe: $("#kpiflag_describe").val(),
kpis: $("#kpiflag_kpis").val(),
restypes: $("#kpiflag_restypes").val(),
dimension: $('select[name="dimension"]').val()
}
});
... ...
... ... @@ -249,7 +249,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
console.log(JSON.stringify(e));
var flag = true;
$.each(restypepageFlagTableData, function (j, k) {
if (e.flagId == k.flagId) {
if (e.id == k.flagId) {
flag = false;
}
});
... ... @@ -263,7 +263,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
flagDimension: e.dimension,
flagId: e.id,
type: 'base',
sort: i,
sort: restypepageFlagTableData.length+1,
createUser: form.val('form-restypepage-edit').createUser,
createTime: common.getToday('')
});
... ...
... ... @@ -118,12 +118,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
cols: [[
{ type: 'checkbox' }
, {field: 'index', title: '序号', align: 'center', type: 'numbers',width: 50}
, { field: 'keyword', title: '辅助关键字', align: 'center',width: 200}
, {
field: 'name', title: '页面名称', align: 'center', sort: true,width: 200,
templet: '<div>' +
'<span restypepage-data-edit="{{d.id}}" data-flag="{{d.flag}}" class="layui-table-link">{{d.name}}</span>' +
'</div>'
}
, { field: 'resTypeName', title: '资源类型', align: 'center',width: 150}
, { field: 'osName', title: '操作系统', align: 'center',width: 100}
, { field: 'provderName', title: '厂商', align: 'center',width: 100}
, { field: 'protocolName', title: '采集协议', align: 'center',width: 100}
, { field: 'model', title: '型号', align: 'center',width: 100}
, { field: 'keyword', title: '辅助关键字', align: 'center',width: 200}
, { field: 'flags', title: '配置指标组', align: 'left',width: 300}
, { field: 'kpis', title: '配置指标', align: 'left',width: 300}
, { field: 'remark', title: '备注', align: 'left',width: 300}
... ... @@ -136,6 +142,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
'</div>'
}]],
done: function (res) {
//点击协议名称 进行编辑
$('[restypepage-data-edit]').on('click', function () {
if ($.inArray('back:restypepage:add', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
return;
}
openEditHtml($(this).attr("restypepage-data-edit"));
});
// 点击编辑事件
$('.link-restypepage-edit').click(function () {
if ($.inArray('back:restypepage:add', checkList) == -1) {
... ...
... ... @@ -10,7 +10,31 @@
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
<input type="text" id="kpiflag_keyword" name="kpiflag_keyword" placeholder="输入关键字，回车搜索" autocomplete="off"
lay-tips="关键字检索包含： </br>指标组名称</br>flag</br>备注</br>绑定资源类型</br>绑定指标"
lay-tips="关键字检索包含： </br>指标组名称</br>flag</br>备注</br>绑定资源类型</br>绑定指标</br>指标组描述</br>创建人"
class="layui-input">
<input type="text" style="display: none">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
<input type="text" id="kpiflag_describe" name="kpiflag_describe" placeholder="输入指标组描述，回车搜索" autocomplete="off"
lay-tips="关键字检索包含： </br>指标组描述"
class="layui-input">
<input type="text" style="display: none">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
<input type="text" id="kpiflag_kpis" name="kpiflag_kpis" placeholder="输入指标名称，回车搜索" autocomplete="off"
lay-tips="关键字检索包含： </br>指标名称"
class="layui-input">
<input type="text" style="display: none">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
<input type="text" id="kpiflag_restypes" name="kpiflag_restypes" placeholder="输入资源类型，回车搜索" autocomplete="off"
lay-tips="关键字检索包含： </br>资源类型名称"
class="layui-input">
<input type="text" style="display: none">
</div>
... ...
... ... @@ -5,6 +5,12 @@
</fieldset>
<div class="layui-form-item">
<div class="inline-half layui-inline">
<label class="layui-form-label">页面名称<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input type="text" name="name" lay-verify="required" placeholder="请输入页面名称" class="layui-input">
</div>
</div>
<div class="inline-half layui-inline">
<label class="layui-form-label">资源类型<span style="color: red">*</span></label>
<div class="layui-input-inline">
<select name="resType" lay-verify="required" lay-search="" id="restypepagekpi_select_resType" class="layui-select">
... ... @@ -12,6 +18,8 @@
</select>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="inline-half layui-inline">
<label class="layui-form-label">操作系统</label>
<div class="layui-input-inline">
... ... @@ -20,8 +28,6 @@
</select>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="inline-half layui-inline">
<label class="layui-form-label">厂商</label>
<div class="layui-input-inline">
... ... @@ -30,6 +36,8 @@
</select>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="inline-half layui-inline">
<label class="layui-form-label">采集协议</label>
<div class="layui-input-inline">
... ... @@ -38,28 +46,28 @@
</select>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="inline-half layui-inline">
<label class="layui-form-label">型号</label>
<div class="layui-input-inline">
<input type="text" name="model" placeholder="请输入型号" class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item">
<div class="inline-half layui-inline">
<label class="layui-form-label">排序<span style="color: red">*</span></label>
<div class="layui-input-inline">
<input class="layui-input" lay-verify="required" name="sort" value="1" placeholder="请输入排序" type="number">
</div>
</div>
</div>
<div class="layui-form-item">
<div class="inline-half layui-inline">
<label class="layui-form-label">辅助关键字<span style="color: red">*</span></label>
<label class="layui-form-label">辅助关键字</label>
<div class="layui-input-inline">
<input type="text" name="keyword" lay-verify="required" placeholder="请输入辅助关键字" class="layui-input">
<input type="text" name="keyword" placeholder="请输入辅助关键字" class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item">
<div class="inline-half layui-inline">
<label class="layui-form-label">创建人<span style="color: red">*</span></label>
<div class="layui-input-inline">
... ...
... ... @@ -10,7 +10,7 @@
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
<input autocomplete="off" class="layui-input" name="keywords" placeholder="输入关键字，回车搜索" lay-tips="关键字检索包含：</br>型号</br>关键字</br>备注</br>指标组名称</br>指标名称"
<input autocomplete="off" class="layui-input" name="keywords" placeholder="输入关键字，回车搜索" lay-tips="关键字检索包含：</br>页面名称</br>型号</br>关键字</br>备注</br>指标组名称</br>指标名称"
type="text">
</div>
</div>
... ...