monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit ef50a800d833999f415329e53a055acc0915944c 2 parents b11a77a1 c30c3a8e

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

解决选择指标后切换页码后回显错误问题

解决选择指标后切换页码后回显错误问题

See merge request !752
Inline Side-by-side
Showing 2 changed files with 28 additions and 20 deletions
... ... @@ -108,8 +108,9 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
{
title: '唯一标志', align: 'center',
templet: function (d) {
var radioDom = $('<input type="checkbox" name="isUnique" data-index="' + d.LAY_TABLE_INDEX + '" lay-skin="switch" lay-text="是|否" lay-filter="switchIsUnique">') ;
if (d.isUnique === '1') { //当是1时，表示时唯一标志
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);
... ... @@ -120,14 +121,15 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
{
title: '排序', align: 'center',
templet: function (d) {
var selectDom = $('<select class="defaultSortSel" class="layui-select" data-index="' + d.LAY_TABLE_INDEX + '" lay-filter="select-kpiflag-table-isSort">' +
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>');
if (d.defaultSort == 'asc') {
var defaultSort = kpiFlagTableData[(d.LAY_INDEX-1)].defaultSort;
if (defaultSort == 'asc') {
selectDom.find('option:contains("正序")').attr('selected', 'selected');
} else if (d.defaultSort == 'desc') {
} else if (defaultSort == 'desc') {
selectDom.find('option:contains("倒序")').attr('selected', 'selected');
} else {
selectDom.find('option:contains("无")').attr('selected', 'selected');
... ... @@ -137,14 +139,15 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
}, {
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);
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: '操作',width: 100, align: 'center', templet: '<div><span data-index="{{d.LAY_TABLE_INDEX}}" class="link link-kpiflag-delete">' +
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) {
... ... @@ -508,7 +511,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
kpiIdent: e.kpiIdent
},
isUnique: '0',
sort: '1'
sort: i
});
}
});
... ...
... ... @@ -118,6 +118,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
, even: true
, data: restypepageKpiTableData
, cols: [[
{field: 'index', title: '序号', align: 'center', type: 'numbers'},
{field: 'kpiName', title: '指标名称', align: 'center'},
{
field: 'kpiIdent', title: '指标分类', align: 'center',
... ... @@ -139,17 +140,21 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
{
title: '类型', align: 'center',
templet: function (d) {
var selectDom = $('<select class="type" lay-search="" class="layui-select" data-index="' + d.LAY_TABLE_INDEX + '" lay-filter="select-restypepagekpi-table-type">' +
var selectDom = $('<select class="typeSel" lay-search="" class="layui-select" data-index="' + (d.LAY_INDEX-1) + '" lay-filter="select-restypepagekpi-table-type">' +
restypekpitype +
'</select>');
selectDom.find('option:contains("' + d.type + '")').attr('selected', 'selected');
var index = (d.LAY_INDEX-1);
var type = restypepageKpiTableData[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_TABLE_INDEX + '" data-index="' + d.LAY_TABLE_INDEX + '" autocomplete="off" class="layui-input txt-restypepagekpi-table-id">');
if (d.id != '' && d.id != null) {
inputDom.attr("value", d.id);
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');
}
... ... @@ -157,9 +162,9 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
, {
field: 'sort', title: '排序', align: 'center',
templet: function (d) {
var inputDom = $('<input id="txt-restypepagekpi-table-sort-' + d.LAY_TABLE_INDEX + '" data-index="' + d.LAY_TABLE_INDEX + '" type="number" autocomplete="off" class="layui-input txt-restypepagekpi-table-sort">');
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", d.sort);
inputDom.attr("value", restypepageKpiTableData[(d.LAY_INDEX-1)].sort);
}
return inputDom.prop('outerHTML');
}
... ... @@ -167,7 +172,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
title: '操作',
width: 100,
align: 'center',
templet: '<div><span data-index="{{d.LAY_TABLE_INDEX}}" class="link link-restypepagekpi-delete">' +
templet: '<div><span data-index="{{(d.LAY_INDEX-1)}}" class="link link-restypepagekpi-delete">' +
'<a class="layui-btn layui-btn-xs layui-btn-normal" title="删除"><i class="layui-icon"></i></a></span>'
}]],
done: function (res, curr, count) {
... ... @@ -279,7 +284,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
kpiName: e.kpiName,
kpiIdent: e.kpiIdent,
type: 'base',
sort: '1'
sort: i
});
}
});
... ...