Authored by 张凯

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

指标组管理调整

1,指标组管理,增加指标组描述字段,放到标识列后,将备注列加宽,可以出现横向滚动条。
2,指标组管理,绑定资源类型时,将对应的code值也赋值
3,指标组管理,新增和修改页面增加指标组描述字段

See merge request !770
... ... @@ -104,67 +104,76 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
return '';
}
}
}, {
},
{
title: '唯一标志', align: 'center',
templet: function (d) {
var radioDom = $('<form class="layui-form">' +
'<div class="layui-form-item layui-form-item-flex"><div class="layui-input-block input-flex-1"><input type="radio" data-index="' + d.LAY_TABLE_INDEX + '" name="isUnique" lay-filter="rdo-kpiflag-table-isUnique"></div></div>' +
'</form>');
if (d.isUnique === '1') {
radioDom.find('input[type="radio"]').attr('checked', true);
var radioDom = $('<input type="checkbox" name="isUnique" data-index="' + (d.LAY_INDEX-1) + '" lay-skin="switch" lay-text="是|否" lay-filter="switchIsUnique">') ;
var isUnique = kpiFlagTableData[(d.LAY_INDEX-1)].isUnique;
if (isUnique === '1') { //当是1时,表示时唯一标志
radioDom.attr('checked', true);
}else{
radioDom.attr('checked', false);
}
return radioDom.prop('outerHTML');
}
}, {
title: '是否排序指标', align: 'center',
},
{
title: '排序', align: 'center',
templet: function (d) {
var selectDom = $('<select data-index="' + d.LAY_TABLE_INDEX + '" lay-filter="select-kpiflag-table-isSort">' +
'<option>是</option>' +
'<option>否</option>' +
'</select>')
if (d.sort != '' && d.sort != null) {
selectDom.find('option:contains("是")').attr('selected', 'selected');
var selectDom = $('<select class="defaultSortSel" class="layui-select" data-index="' + (d.LAY_INDEX-1) + '" lay-filter="select-kpiflag-table-isSort">' +
'<option>无</option>' +
'<option>正序</option>' +
'<option>倒序</option>' +
'</select>');
var defaultSort = kpiFlagTableData[(d.LAY_INDEX-1)].defaultSort;
if (defaultSort == 'asc') {
selectDom.find('option:contains("正序")').attr('selected', 'selected');
} else if (defaultSort == 'desc') {
selectDom.find('option:contains("倒序")').attr('selected', 'selected');
} else {
selectDom.find('option:contains("否")').attr('selected', 'selected');
selectDom.find('option:contains("无")').attr('selected', 'selected');
}
return selectDom.prop('outerHTML');
}
}, {
field: 'sort', title: '列表顺序', align: 'center',
templet: function (d) {
var inputDom = $('<input id="txt-kpiflag-table-sort-' + d.LAY_TABLE_INDEX + '" data-index="' + d.LAY_TABLE_INDEX + '" type="number" autocomplete="off" class="layui-input txt-kpiflag-table-sort">');
if (d.sort != '' && d.sort != null) {
inputDom.attr("value", d.sort);
} else {
inputDom.attr('disabled', true);
var inputDom = $('<input id="txt-kpiflag-table-sort-' + (d.LAY_INDEX-1) + '" data-index="' + (d.LAY_INDEX-1) + '" type="number" autocomplete="off" class="layui-input txt-kpiflag-table-sort">');
var sort = kpiFlagTableData[(d.LAY_INDEX-1)].sort;
if (sort != null) {
inputDom.attr("value", sort);
}
return inputDom.prop('outerHTML');
}
}, {
title: '操作',
align: 'center',
templet: '<div><span data-index="{{d.LAY_TABLE_INDEX}}" class="link link-kpiflag-delete">' +
},
{field: 'createUser', 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>'
}]],
done: function (res, curr, count) {
form.render();
// 是否排序下拉框改变事件
$(".kpiflag-edit-table .layui-table-body,.kpiflag-edit-table .layui-table-box,.kpiflag-edit-table .layui-table-cell").css('overflow', 'visible');
// 排序下拉框改变事件
form.on('select(select-kpiflag-table-isSort)', function (data) {
var index = $(data.elem).data('index');
if (data.value === '是') {
$('#txt-kpiflag-table-sort-' + index).attr('disabled', false);
} else {
kpiFlagTableData[index].sort = '';
$('#txt-kpiflag-table-sort-' + index).val('');
$('#txt-kpiflag-table-sort-' + index).attr('disabled', true);
var defaultSort = 'none';
if (data.value === '正序') {
defaultSort = 'asc';
} else if (data.value === '倒序') {
defaultSort = 'desc';
}
kpiFlagTableData[index].defaultSort = defaultSort;
});
// radio选择事件
form.on('radio(rdo-kpiflag-table-isUnique)', function (data) {
for (var i = 0; i < kpiFlagTableData.length; i++) {
kpiFlagTableData[i].isUnique = '0';
}
//唯一标志开关事件
form.on('switch(switchIsUnique)', function(data){
if (this.checked){
kpiFlagTableData[$(data.elem).data('index')].isUnique = '1';
}else{
kpiFlagTableData[$(data.elem).data('index')].isUnique = '0';
}
});
// 排序输入框输入事件
$('.txt-kpiflag-table-sort').change(function () {
... ... @@ -189,13 +198,13 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
theme: '#1E9FFF'
}
, cols: [[{
field: 'resTypeName', title: '名称', align: 'center', sort: true, width: '280'
field: 'resTypeName', title: '名称', align: 'center', sort: true
}, {
field: 'resTypeCode', title: '编码', align: 'center', sort: true, width: '390'
field: 'resTypeCode', title: '编码', align: 'center', sort: true
}, {
field: 'resTypeDesc', title: '类别', align: 'center', sort: true, width: '280'
field: 'resTypeDesc', title: '类别', align: 'center', sort: true
}, {
field: 'createTime', title: '创建时间', align: 'center', sort: true, width: '275'
field: 'createTime', title: '创建时间', align: 'center', sort: true
}, {
title: '操作', align: 'center', fixed: 'right', width: '170',
toolbar:
... ... @@ -313,6 +322,8 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
}
});
if (flag) {
// value.createUser = form.val('form-flag-edit').createUser;
// value.createTime = common.getToday('');
resTypeTableData.push(value);
}
});
... ... @@ -410,6 +421,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
flag: '',
name: '',
remark: '',
dimension: '',
kpiFlagList: kpiFlagTableData,
bindList: []
};
... ... @@ -418,7 +430,8 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
id: '',
flagId: '',
bindId: v.resTypeId,
bindType: '1'
bindType: '1',
bindCode: v.resTypeCode
});
});
$.each(appTableData, function (i, v) {
... ... @@ -458,6 +471,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
, where: {
access_token: accessToken,
keyWord: $("#kpiflag_keyword").val(),
dimension: $('select[name="dimension"]').val()
}
});
} else {
... ... @@ -496,13 +510,16 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
id: '',
flagId: flagId,
kpiId: e.kpiId,
defaultSort: e.defaultSort,
kpi: {
kpiId: e.kpiId,
kpiName: e.kpiName,
kpiIdent: e.kpiIdent
},
isUnique: '0',
sort: ''
sort: i,
createUser: form.val('form-flag-edit').createUser,
createTime: common.getToday('')
});
}
});
... ...
... ... @@ -66,12 +66,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', "commonDe
{type: 'checkbox'}
, {field: 'index', title: '序号', align: 'center', type: 'numbers'}
, {
field: 'name', title: '名称', align: 'center', sort: true,
field: 'name', title: '名称', align: 'center', sort: true,width: 200,
templet: '<div>' +
'<span kpiflag-data-edit="{{d.id}}" data-flag="{{d.flag}}" class="layui-table-link">{{d.name}}</span>' +
'</div>'
}
, {field: 'flag', title: '标识', align: 'center', sort: true}
, {field: 'flag', title: '标识', align: 'center', sort: true,width: 200}
, {field: 'describes', title: '指标组描述', align: 'left',width: 300}
, { field: 'dimension', title: '维度', align: 'center', width: 80, templet: `
<div>
{{#
... ... @@ -84,11 +85,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', "commonDe
</div>
`
}
, {field: 'kpis', title: '绑定指标', align: 'left'}
, {field: 'restypes', title: '绑定资源类型', align: 'left'}
, {field: 'kpis', title: '绑定指标', align: 'left',width: 500}
, {field: 'restypes', title: '绑定资源类型', align: 'left',width: 300}
, {field: 'createUser', title: '创建人',width: 100, align: 'center'}
, {field: 'createTime', title: '创建时间', align: 'center'}
, {field: 'remark', title: '备注', align: 'left'}
, {field: 'createTime', title: '创建时间', align: 'center',width: 180}
, {field: 'remark', title: '备注', align: 'left',width: 500}
, {
title: '操作',
align: 'center',
... ...
<article>
<form action="" class="layui-form layui-form-pane" lay-filter="form-flag-edit">
<form class="layui-form layui-form-pane" action="" lay-filter="form-flag-edit">
<fieldset class="layui-elem-field layui-field-title">
<legend>基本信息</legend>
</fieldset>
<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 class="layui-input" lay-verify="required" name="flag" placeholder="请输入编码" type="text">
<input type="text" name="flag" lay-verify="required" placeholder="请输入编码" class="layui-input">
</div>
</div>
<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 class="layui-input" lay-verify="required" name="name" placeholder="请输入名称" required
type="text">
<select name="dimension" lay-verify="required" class="layui-select">
<option value="">=选择维度=</option>
<option value="1D">一维</option>
<option value="2D">二维</option>
</select>
</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 type="text" name="name" required 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="describes" required lay-verify="required" 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 type="text" name="createUser" required lay-verify="required" placeholder="请输入创建人" class="layui-input">
</div>
</div>
<div class="inline-half layui-inline">
<label class="layui-form-label">创建时间</label>
<div class="layui-input-inline">
<input type="text" name="createTime" required lay-verify="required" disabled placeholder="请输入创建人" class="layui-input">
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label textarea-label">说明</label>
<div class="layui-input-block">
<textarea class="layui-textarea" name="remark" placeholder="请输入说明"></textarea>
<textarea name="remark" placeholder="请输入说明" class="layui-textarea"></textarea>
</div>
</div>
<button class="hide" id="btn-kpiflag-submit" lay-filter="kpi-flag-submit" lay-submit>提交</button>
<button id="btn-kpiflag-submit" class="hide" lay-submit lay-filter="kpi-flag-submit">提交</button>
</form>
<form class="layui-form layui-form-pane" onsubmit="return false">
<fieldset class="layui-elem-field layui-field-title">
<legend>绑定指标&nbsp;&nbsp;
<button class="layui-btn layui-btn-xs layui-btn-normal fieldset-btn" id="btn-kpiflag-kpi-bind"><i
class="layui-icon">&#xe624;</i></button>
<button class="layui-btn layui-btn-xs layui-btn-normal fieldset-btn" id="btn-kpiflag-kpi-bind"><i class="layui-icon">&#xe624;</i></button>
</legend>
</fieldset>
<div class="layui-form-item layui-form-item-flex">
<table class="input-flex-1" id="kpiflag-edit-table"></table>
<div class="layui-form-item layui-form-item-flex kpiflag-edit-table">
<table id="kpiflag-edit-table" class="input-flex-1"></table>
</div>
<div class="layui-form-item layui-form-item-flex hide">
<div class="layui-input-block input-flex-1">
<input name="chartType" title="列表" type="radio" value="">
<input name="chartType" title="折线图" type="radio" value="">
<input name="chartType" title="柱状图" type="radio" value="">
<input name="chartType" title="饼图" type="radio" value="">
<input type="radio" name="chartType" value="" title="列表">
<input type="radio" name="chartType" value="" title="折线图">
<input type="radio" name="chartType" value="" title="柱状图">
<input type="radio" name="chartType" value="" title="饼图">
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-kpi-flag-restype-bind"><i
class="layui-icon">&#xe654;</i>绑定到资源类型
</button>
<button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-kpi-flag-restype-bind"><i class="layui-icon">&#xe654;</i>绑定到资源类型</button>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-kpi-flag-app-bind"><i
class="layui-icon">&#xe654;</i>绑定到应用
</button>
<button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-kpi-flag-app-bind"><i class="layui-icon">&#xe654;</i>绑定到应用</button>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-kpi-flag-server-bind"><i
class="layui-icon">&#xe654;</i>绑定到服务
</button>
<button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-kpi-flag-server-bind"><i class="layui-icon">&#xe654;</i>绑定到服务</button>
</div>
</div>
</form>
... ... @@ -90,6 +114,6 @@
</article>
<script>
layui.use('kpiflagEdit', function (fn) {
fn({{ d }});
fn({{d}});
});
</script>
\ No newline at end of file
... ...
... ... @@ -5,16 +5,23 @@
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-status">
<form class="layui-form layui-card-header layuiadmin-card-header-auto"
lay-filter="kpiflag-form">
<form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="kpiflag-form">
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
<input autocomplete="off" class="layui-input" id="kpiflag_keyword"
lay-tips="关键字检索包含: </br>指标组名称" name="kpiflag_keyword"
placeholder="输入关键字,回车搜索"
type="text">
<input style="display: none" type="text">
<input type="text" id="kpiflag_keyword" name="kpiflag_keyword" placeholder="输入关键字,回车搜索" autocomplete="off"
lay-tips="关键字检索包含: </br>指标组名称</br>flag</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">
<select name="dimension" class="layui-select" lay-filter="change">
<option value="">=选择维度=</option>
<option value="1D">一维</option>
<option value="2D">二维</option>
</select>
</div>
</div>
<button class="layui-btn layui-btn-normal" id="kpiflagQueryBtn" type="button">
... ... @@ -27,12 +34,8 @@
</div>
<div class="layui-card-body">
<div class="warn-btns">
<button class="layui-btn layui-btn-sm layui-btn-normal" id="addkpiflag" type="button"><i
class="layui-icon">&#xe654;</i>新增
</button>
<button class="layui-btn layui-btn-sm layui-btn-normal" id="delkpiflag" type="button"><i
class="layui-icon">&#xe640;</i>删除
</button>
<button id="addkpiflag" type="button" class="layui-btn layui-btn-sm layui-btn-normal"><i class="layui-icon">&#xe654;</i>新增</button>
<button id="delkpiflag" type="button" class="layui-btn layui-btn-sm layui-btn-normal"><i class="layui-icon">&#xe640;</i>删除</button>
</div>
<table id="kpiflag_table"></table>
</div>
... ...