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 8e2cab53..b0e1e314 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 @@ -10,7 +10,7 @@ table: { _option: {}, _params: {}, - // 初始化表格 + // 初始化表格参数 init: function(options) { $.table._option = options; $.table._params = $.common.isEmpty(options.queryParams) ? $.table.queryParams : options.queryParams; @@ -65,7 +65,7 @@ return { rows: [], total: 0 }; } }, - // 搜索 + // 搜索-默认第一个form search: function(formId) { var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId; var params = $("#bootstrap-table").bootstrapTable('getOptions'); @@ -83,7 +83,7 @@ } $("#bootstrap-table").bootstrapTable('refresh', params); }, - // 下载 + // 下载-默认第一个form exportExcel: function(formId) { var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId; $.modal.loading("正在导出数据,请稍后..."); @@ -96,20 +96,20 @@ $.modal.closeLoading(); }); }, - // 刷新 + // 刷新表格 refresh: function() { $("#bootstrap-table").bootstrapTable('refresh', { url: $.table._option.url, silent: true }); }, - // 查询选中列值 + // 查询表格指定列值 selectColumns: function(column) { return $.map($('#bootstrap-table').bootstrapTable('getSelections'), function (row) { return row[column]; }); }, - // 查询选中首列值 + // 查询表格首列值 selectFirstColumns: function() { return $.map($('#bootstrap-table').bootstrapTable('getSelections'), function (row) { return row[$.table._option.columns[1].field]; diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/login.js b/ruoyi-admin/src/main/resources/static/ruoyi/login.js index 8690772a..195367b2 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/login.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/login.js @@ -35,6 +35,7 @@ function login() { } else { $.modal.closeLoading(); $('.imgcode').click(); + $(".code").val(""); $.modal.msg(r.msg); } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java index 66a44d6a..06532af8 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java @@ -15,7 +15,6 @@ public enum OperatorType /** * 后台用户 */ - MANAGE, /**