From d2e5bd1e43514352052905f39eeaf7f16833bf2b Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sat, 15 Jun 2019 10:18:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8F=8F=E8=BF=B0=E7=A9=BA=E4=B8=B2=E4=B8=8D?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 2 +- sql/ry_20190601.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 610cdb3da..be2d38140 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -176,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" login_ip = #{loginIp}, login_date = #{loginDate}, update_by = #{updateBy}, - remark = #{remark}, + remark = #{remark}, update_time = sysdate() where user_id = #{userId} diff --git a/sql/ry_20190601.sql b/sql/ry_20190601.sql index 196ad729b..c83b2681b 100644 --- a/sql/ry_20190601.sql +++ b/sql/ry_20190601.sql @@ -58,7 +58,7 @@ create table sys_user ( create_time datetime comment '创建时间', update_by varchar(64) default '' comment '更新者', update_time datetime comment '更新时间', - remark varchar(500) default '' comment '备注', + remark varchar(500) default null comment '备注', primary key (user_id) ) engine=innodb auto_increment=100 comment = '用户信息表'; From ce18a9e86dc91ad1077c355c45a4d69476bb6c61 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sat, 15 Jun 2019 10:18:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E7=8A=B6=E6=80=81=E5=A4=B1=E6=95=88=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/static/css/style.css | 6 +++--- ruoyi-admin/src/main/resources/static/ruoyi/index.js | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/resources/static/css/style.css b/ruoyi-admin/src/main/resources/static/css/style.css index bab9d5f00..bbe0b1676 100644 --- a/ruoyi-admin/src/main/resources/static/css/style.css +++ b/ruoyi-admin/src/main/resources/static/css/style.css @@ -3254,7 +3254,7 @@ body.body-small .footer.fixed { .content-tabs .roll-nav, .page-tabs-list { position: absolute; - width: 40px; + width: 30px; height: 38px; text-align: center; color: #999; @@ -3285,9 +3285,9 @@ body.body-small .footer.fixed { } nav.page-tabs { - margin-left: 40px; + margin-left: 30px; width: 100000px; - height: 40px; + height: 38px; overflow: hidden; } diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/index.js b/ruoyi-admin/src/main/resources/static/ruoyi/index.js index 9e3614751..730cf8ddc 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/index.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/index.js @@ -216,6 +216,8 @@ $(function() { dataIndex = $(this).data('index'), menuName = $.trim($(this).text()), flag = true; + $(".nav ul li").removeClass("active"); + $(this).parent("li").addClass("active"); if (dataUrl == undefined || $.trim(dataUrl).length == 0) return false; // 选项卡菜单已存在 From 91dd624048dc636a4df6e136797ee68fd5836459 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sat, 15 Jun 2019 11:24:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=A8=A1=E6=9D=BF=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js | 5 ++--- .../src/main/resources/templates/demo/operate/table.html | 4 +++- .../src/main/resources/templates/system/user/user.html | 5 ++++- 3 files changed, 9 insertions(+), 5 deletions(-) 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 08202586e..7c5b9bb01 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 @@ -271,8 +271,7 @@ }, // 导入数据 importExcel: function(formId) { - var currentId = $.common.isEmpty(formId) ? 'importForm' : formId; - $.form.reset(currentId); + var currentId = $.common.isEmpty(formId) ? 'importTpl' : formId; layer.open({ type: 1, area: ['400px', '230px'], @@ -281,7 +280,7 @@ maxmin: true, shade: 0.3, title: '导入' + $.table._option.modalName + '数据', - content: $('#' + currentId), + content: $('#' + currentId).html(), btn: [' 导入', ' 取消'], // 弹层外区域关闭 shadeClose: true, diff --git a/ruoyi-admin/src/main/resources/templates/demo/operate/table.html b/ruoyi-admin/src/main/resources/templates/demo/operate/table.html index aff8c139e..92690b763 100644 --- a/ruoyi-admin/src/main/resources/templates/demo/operate/table.html +++ b/ruoyi-admin/src/main/resources/templates/demo/operate/table.html @@ -108,7 +108,8 @@ -