diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/kpiflagEdit.js b/hg-monitor-web-base/src/main/resources/static/src/controller/kpiflagEdit.js
index dbdf369..94eb9c5 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/kpiflagEdit.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/kpiflagEdit.js
@@ -148,7 +148,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
}
},
{field: 'createUser', title: '创建人', align: 'center'},
- {field: 'createTime', title: '创建人', align: 'center'},
+ {field: 'createTime', title: '创建时间', align: 'center'},
{
title: '操作',width: 100, align: 'center', templet: '<div><span data-index="{{(d.LAY_INDEX-1)}}" class="link link-kpiflag-delete">' +
'<a class="layui-btn layui-btn-xs layui-btn-normal" title="删除"><i class="layui-icon"></i></a></span>'
@@ -203,8 +203,9 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
field: 'resTypeCode', title: '编码', align: 'center', sort: true
}, {
field: 'resTypeDesc', title: '类别', align: 'center', sort: true
+ },{field: 'createUser', title: '创建人', align: 'center'
}, {
- field: 'createTime', title: '创建时间', align: 'center', sort: true
+ field: 'createTime', title: '创建时间', align: 'center'
}, {
title: '操作', align: 'center', fixed: 'right', width: '170',
toolbar:
diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/kpiflagIndex.js b/hg-monitor-web-base/src/main/resources/static/src/controller/kpiflagIndex.js
index fe84fdf..e90e17d 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/kpiflagIndex.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/kpiflagIndex.js
@@ -177,6 +177,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', "commonDe
}
});
}
+
+ //获取选中的数据
+ function getCheckData() {
+ return table.checkStatus('kpiflag_table').data;
+ }
+
+ return {getData: getCheckData};
});
});
\ No newline at end of file
diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/restypepageEdit.js b/hg-monitor-web-base/src/main/resources/static/src/controller/restypepageEdit.js
index c4b1fc8..dea86e4 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/restypepageEdit.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/restypepageEdit.js
@@ -1,5 +1,5 @@
/** 指标组新增 */
-layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'element', 'admin', 'kpiIndex', 'resourcetype'], function (exports) {
+layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'element', 'admin', 'kpiIndex', 'resourcetype','kpiflagIndex'], function (exports) {
var $ = layui.$;
var form = layui.form;
var table = layui.table;
@@ -15,11 +15,11 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
var accessToken = sessions.getToken().access_token;
var domainName = common.domainName;
// 表格数据
- var restypepageKpiTableData = [];
+ var restypepageFlagTableData = [];
// 指标自定义类型数据组装option
var restypekpitype;
//指标表格
- var restypepageKpiTable;
+ var restypepageFlagTable;
// 加载遮罩
var loading;
// 如果是编辑，回显数据
@@ -75,6 +75,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
async: false,
}).done(function (res) {
var list = res.data;
+ options += '<option value="">=请选择=</option>';
$.each(list, function (i, v) {
options += '<option value="' + v.ddicCode + '">' + v.ddicName + '</option>';
});
@@ -96,7 +97,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
success: function (res) {
restypePageData = res.object;
form.val('form-restypepage-edit', res.object);
- restypepageKpiTableData = res.object.restypePageKpis;
+ restypepageFlagTableData = res.object.restypePageFlags;
reloadRestypepageKpiFlagTable();
}
});
@@ -111,32 +112,16 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
*
* */
function loadRestypepageKpiFlagTable(){
- restypepageKpiTable = table.render({
+ restypepageFlagTable = table.render({
elem: '#restypepage-edit-table'
, cellMinWidth: 80
, limit: 10
, even: true
- , data: restypepageKpiTableData
+ , data: restypepageFlagTableData
, cols: [[
{field: 'index', title: '序号', align: 'center', type: 'numbers'},
- {field: 'kpiName', title: '指标名称', align: 'center'},
- {
- field: 'kpiIdent', title: '指标分类', align: 'center',
- templet: function (d) {
- switch (d.kpiIdent) {
- case '0':
- return '基本指标';
- case '1':
- return '性能指标';
- case '2':
- return '状态指标';
- case '3':
- return '告警指标';
- default:
- return '';
- }
- }
- },
+ {field: 'flagName', title: '指标组名称', align: 'center'},
+ {field: 'flagDesc', title: '指标组描述', align: 'center'},
{
title: '类型', align: 'center',
templet: function (d) {
@@ -144,27 +129,19 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
restypekpitype +
'</select>');
var index = (d.LAY_INDEX-1);
- var type = restypepageKpiTableData[index].type;
+ var type = restypepageFlagTableData[index].type;
selectDom.find('option[value="'+type+'"]').attr('selected', 'selected');
return selectDom.prop('outerHTML');
}
- }, {
- field: 'id', title: 'id', align: 'center' , hide: true, templet: function (d) {
- var inputDom = $('<input id="txt-restypepagekpi-table-id-' + (d.LAY_INDEX-1) + '" data-index="' + (d.LAY_INDEX-1) + '" autocomplete="off" class="layui-input txt-restypepagekpi-table-id">');
- var index = (d.LAY_INDEX-1);
- var id = restypepageKpiTableData[index].id;
- if (id != '' && id != null) {
- inputDom.attr("value", id);
- }
- return inputDom.prop('outerHTML');
- }
- }
- , {
+ },
+ {field: 'createUser', title: '创建人', align: 'center'},
+ {field: 'createTime', title: '创建时间', align: 'center'},
+ {
field: 'sort', title: '排序', align: 'center',
templet: function (d) {
var inputDom = $('<input id="txt-restypepagekpi-table-sort-' + (d.LAY_INDEX-1) + '" data-index="' + (d.LAY_INDEX-1) + '" type="number" autocomplete="off" class="layui-input txt-restypepagekpi-table-sort">');
if (d.sort != null) {
- inputDom.attr("value", restypepageKpiTableData[(d.LAY_INDEX-1)].sort);
+ inputDom.attr("value", restypepageFlagTableData[(d.LAY_INDEX-1)].sort);
}
return inputDom.prop('outerHTML');
}
@@ -181,15 +158,15 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
// 排序下拉框改变事件
form.on('select(select-restypepagekpi-table-type)', function (data) {
var index = $(data.elem).data('index');
- restypepageKpiTableData[index].type = data.value;
+ restypepageFlagTableData[index].type = data.value;
});
// 排序输入框输入事件
$('.txt-restypepagekpi-table-sort').change(function () {
- restypepageKpiTableData[$(this).data('index')].sort = $(this).val();
+ restypepageFlagTableData[$(this).data('index')].sort = $(this).val();
});
// 删除事件
$('.link-restypepagekpi-delete').click(function () {
- restypepageKpiTableData.splice($(this).data('index'), 1);
+ restypepageFlagTableData.splice($(this).data('index'), 1);
reloadRestypepageKpiFlagTable();
});
}
@@ -198,9 +175,9 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
// 刷新指标表格
function reloadRestypepageKpiFlagTable() {
- restypepageKpiTable.reload({
+ restypepageFlagTable.reload({
page: {curr: 1},
- data: restypepageKpiTableData
+ data: restypepageFlagTableData
});
}
@@ -215,7 +192,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
model: '',
protocol: '',
remark: '',
- restypePageKpis: restypepageKpiTableData
+ restypePageFlags: restypepageFlagTableData
};
Object.assign(restypePage, form.val('form-restypepage-edit'));
admin.req({
@@ -253,38 +230,42 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
// 选择指标
$('#btn-restypepage-kpi-bind').click(function () {
- $('[lay-id="/baseconfig/kpi/index"]').find('.layui-tab-close').trigger('click');
+ $('[lay-id="/baseconfig/kpiflag/index"]').find('.layui-tab-close').trigger('click');
layer.open({
title: '选择指标',
- id: 'restypepageKpiIndexChooseHtml',
+ id: 'restypepageFlagIndexChooseHtml',
type: 1,
area: ['90%', '800px'],
btn: ['确定', '取消'],
scrollbar: true,
success: function () {
- view(this.id).render('/baseconfig/kpi/index', {});
+ view(this.id).render('/baseconfig/kpiflag/index', {});
},
yes: function (index, layero) {
- var kpiIndex = layui.kpiIndex({});
- var data = kpiIndex.getData();
+ var kpiflagIndex = layui.kpiflagIndex({});
+ var data = kpiflagIndex.getData();
if (data.length > 0) {
$.each(data, function (i, e) {
+ console.log(JSON.stringify(e));
var flag = true;
- $.each(restypepageKpiTableData, function (j, k) {
- if (e.kpiId == k.kpiId) {
+ $.each(restypepageFlagTableData, function (j, k) {
+ if (e.flagId == k.flagId) {
flag = false;
}
});
if (flag == true) {
- restypepageKpiTableData.push({
+ restypepageFlagTableData.push({
+ flagName: e.name,
+ flagDesc: e.describes,
id: '',
pageId: id,
resType: restypePageData.resType,
- kpiId: e.kpiId,
- kpiName: e.kpiName,
- kpiIdent: e.kpiIdent,
+ flagDimension: e.dimension,
+ flagId: e.id,
type: 'base',
- sort: i
+ sort: i,
+ createUser: form.val('form-restypepage-edit').createUser,
+ createTime: common.getToday('')
});
}
});
diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/restypepageIndex.js b/hg-monitor-web-base/src/main/resources/static/src/controller/restypepageIndex.js
index 6aa7cdc..5a8b0f8 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/restypepageIndex.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/restypepageIndex.js
@@ -93,7 +93,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
var $from = $("#restypepageQueryForm")
var search = {
access_token: accessToken,
- keyword: $from.find("input[name='keyword']").val(),
+ keyword: $from.find("input[name='keywords']").val(),
resType: $from.find("select[name='restypepageresType']").val(),
os: $from.find("select[name='restypepageos']").val(),
protocol: $from.find("select[name='restypepagecollProtocol']").val(),
@@ -117,17 +117,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
},
cols: [[
{ type: 'checkbox' }
- , {field: 'index', title: '序号', align: 'center', type: 'numbers'}
- , { field: 'resTypeName', title: '资源类型', align: 'center'}
- , { field: 'osName', title: '操作系统', align: 'center'}
- , { field: 'provderName', title: '厂商', align: 'center'}
- , { field: 'protocolName', title: '采集协议', align: 'center'}
- , { field: 'model', title: '型号', align: 'center'}
- , { field: 'keyword', title: '辅助关键字', align: 'center'}
+ , {field: 'index', title: '序号', align: 'center', type: 'numbers',width: 50}
+ , { field: 'keyword', title: '辅助关键字', align: 'center',width: 200}
+ , { 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: 'flags', title: '配置指标组', align: 'left',width: 300}
, { field: 'kpis', title: '配置指标', align: 'left',width: 300}
, { field: 'remark', title: '备注', align: 'left',width: 300}
, {
- title: '操作', align: 'center', width: 100,
+ title: '操作', align: 'center',fixed: 'right', width: 100,
templet:
'<div>' +
'<button data-id="{{d.id}}" class="layui-btn layui-btn-xs layui-btn-normal link-restypepage-edit" lay-tips="编辑"><i class="layui-icon layui-icon-edit"></i></button>'+
diff --git a/hg-monitor-web-base/src/main/resources/static/src/views/baseconfig/restypepage/add.html b/hg-monitor-web-base/src/main/resources/static/src/views/baseconfig/restypepage/add.html
index b137136..df29e05 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/views/baseconfig/restypepage/add.html
+++ b/hg-monitor-web-base/src/main/resources/static/src/views/baseconfig/restypepage/add.html
@@ -55,9 +55,15 @@
</div>
<div class="layui-form-item">
<div class="inline-half layui-inline">
- <label class="layui-form-label">辅助关键字</label>
+ <label class="layui-form-label">辅助关键字<span style="color: red">*</span></label>
<div class="layui-input-inline">
- <input type="text" name="keyword" placeholder="请输入辅助关键字" class="layui-input">
+ <input type="text" name="keyword" 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">
+ <input type="text" name="createUser" required lay-verify="required" placeholder="请输入创建人" class="layui-input">
</div>
</div>
</div>
@@ -71,7 +77,7 @@
</form>
<form class="layui-form layui-form-pane" onsubmit="return false">
<fieldset class="layui-elem-field layui-field-title">
- <legend>选择指标
+ <legend>选择指标组
<button class="layui-btn layui-btn-xs layui-btn-normal fieldset-btn" id="btn-restypepage-kpi-bind"><i class="layui-icon"></i></button>
</legend>
</fieldset>
diff --git a/hg-monitor-web-base/src/main/resources/static/src/views/baseconfig/restypepage/index.html b/hg-monitor-web-base/src/main/resources/static/src/views/baseconfig/restypepage/index.html
index 2916527..30140cb 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/views/baseconfig/restypepage/index.html
+++ b/hg-monitor-web-base/src/main/resources/static/src/views/baseconfig/restypepage/index.html
@@ -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="keyword" placeholder="输入关键字，回车搜索" lay-tips="关键字检索包含：</br>型号</br>关键字</br>备注</br>绑定指标"
+ <input autocomplete="off" class="layui-input" name="keywords" placeholder="输入关键字，回车搜索" lay-tips="关键字检索包含：</br>型号</br>关键字</br>备注</br>指标组名称</br>指标名称"
type="text">
</div>
</div>