diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index 0127b3984..2c52839ea 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -332,24 +332,10 @@ var table = { } }, // 搜索-默认第一个form - search: function(formId, tableId, data) { + search: function(formId, tableId) { table.set(tableId); var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId; var params = $.common.isEmpty(tableId) ? $("#" + table.options.id).bootstrapTable('getOptions') : $("#" + tableId).bootstrapTable('getOptions'); - params.queryParams = function(params) { - var search = $.common.formToJSON(currentId); - if($.common.isNotEmpty(data)){ - $.each(data, function(key) { - search[key] = data[key]; - }); - } - search.pageSize = params.limit; - search.pageNum = params.offset / params.limit + 1; - search.searchValue = params.search; - search.orderByColumn = params.sort; - search.isAsc = params.order; - return search; - } if($.common.isNotEmpty(tableId)){ $("#" + tableId).bootstrapTable('refresh', params); } else{ diff --git a/ruoyi-admin/src/main/resources/templates/monitor/operlog/operlog.html b/ruoyi-admin/src/main/resources/templates/monitor/operlog/operlog.html index c1f7e0132..a8b932a24 100644 --- a/ruoyi-admin/src/main/resources/templates/monitor/operlog/operlog.html +++ b/ruoyi-admin/src/main/resources/templates/monitor/operlog/operlog.html @@ -75,6 +75,7 @@ detailUrl: prefix + "/detail/{id}", removeUrl: prefix + "/remove", exportUrl: prefix + "/export", + queryParams: queryParams, sortName: "operTime", sortOrder: "desc", modalName: "操作日志", @@ -148,10 +149,14 @@ $.table.init(options); }); + function queryParams(params) { + var search = $.table.queryParams(params); + search.businessTypes = $.common.join($('#businessTypes').selectpicker('val')); + return search; + } + function searchPre() { - var data = {}; - data.businessTypes = $.common.join($('#businessTypes').selectpicker('val')); - $.table.search('operlog-form', 'bootstrap-table', data); + $.table.search('operlog-form', 'bootstrap-table'); } function resetPre() {