ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:y_project/RuoYi

This commit is contained in:
tangpeng 2019-06-15 14:15:32 +08:00
parent 190f626ba6 91dd624048
commit b48b1597fe
7 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/resources/static/css/style.css
View File

@ -3254,7 +3254,7 @@ body.body-small .footer.fixed {
.content-tabs .roll-nav, .page-tabs-list { .content-tabs .roll-nav, .page-tabs-list {
position: absolute; position: absolute;
width: 40px; width: 30px;
height: 38px; height: 38px;
text-align: center; text-align: center;
color: #999; color: #999;
@ -3285,9 +3285,9 @@ body.body-small .footer.fixed {
} }
nav.page-tabs { nav.page-tabs {
margin-left: 40px; margin-left: 30px;
width: 100000px; width: 100000px;
height: 40px; height: 38px;
overflow: hidden; overflow: hidden;
} }

2
ruoyi-admin/src/main/resources/static/ruoyi/index.js
View File

@ -216,6 +216,8 @@ $(function() {
dataIndex = $(this).data('index'), dataIndex = $(this).data('index'),
menuName = $.trim($(this).text()), menuName = $.trim($(this).text()),
flag = true; flag = true;
$(".nav ul li").removeClass("active");
$(this).parent("li").addClass("active");
if (dataUrl == undefined || $.trim(dataUrl).length == 0) return false; if (dataUrl == undefined || $.trim(dataUrl).length == 0) return false;
// 选项卡菜单已存在 // 选项卡菜单已存在

5
ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
View File

@ -271,8 +271,7 @@
}, },
// 导入数据 // 导入数据
importExcel: function(formId) { importExcel: function(formId) {
var currentId = $.common.isEmpty(formId) ? 'importForm' : formId; var currentId = $.common.isEmpty(formId) ? 'importTpl' : formId;
$.form.reset(currentId);
layer.open({ layer.open({
type: 1, type: 1,
area: ['400px', '230px'], area: ['400px', '230px'],
@ -281,7 +280,7 @@
maxmin: true, maxmin: true,
shade: 0.3, shade: 0.3,
title: '导入' + $.table._option.modalName + '数据', title: '导入' + $.table._option.modalName + '数据',
content: $('#' + currentId), content: $('#' + currentId).html(),
btn: ['<i class="fa fa-check"></i> 导入', '<i class="fa fa-remove"></i> 取消'], btn: ['<i class="fa fa-check"></i> 导入', '<i class="fa fa-remove"></i> 取消'],
// 弹层外区域关闭 // 弹层外区域关闭
shadeClose: true, shadeClose: true,

4
ruoyi-admin/src/main/resources/templates/demo/operate/table.html
View File

@ -108,7 +108,8 @@
</script> </script>
</body> </body>
<!-- 导入区域 --> <!-- 导入区域 -->
<form id="importForm" enctype="multipart/form-data" class="mt20 mb10" style="display: none;"> <script id="importTpl" type="text/template">
<form enctype="multipart/form-data" class="mt20 mb10">
<div class="col-xs-offset-1"> <div class="col-xs-offset-1">
<input type="file" id="file" name="file"/> <input type="file" id="file" name="file"/>
<div class="mt10 pt5"> <div class="mt10 pt5">
@ -120,4 +121,5 @@
</font> </font>
</div> </div>
</form> </form>
</script>
</html> </html>

5
ruoyi-admin/src/main/resources/templates/system/user/user.html
View File

@ -244,7 +244,9 @@
} }
</script> </script>
</body> </body>
<form id="importForm" enctype="multipart/form-data" class="mt20 mb10" style="display: none;"> <!-- 导入区域 -->
<script id="importTpl" type="text/template">
<form enctype="multipart/form-data" class="mt20 mb10">
<div class="col-xs-offset-1"> <div class="col-xs-offset-1">
<input type="file" id="file" name="file"/> <input type="file" id="file" name="file"/>
<div class="mt10 pt5"> <div class="mt10 pt5">
@ -256,4 +258,5 @@
</font> </font>
</div> </div>
</form> </form>
</script>
</html> </html>

2
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -176,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if> <if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
<if test="loginDate != null">login_date = #{loginDate},</if> <if test="loginDate != null">login_date = #{loginDate},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if> <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
update_time = sysdate() update_time = sysdate()
</set> </set>
where user_id = #{userId} where user_id = #{userId}

2
sql/ry_20190601.sql
View File

@ -58,7 +58,7 @@ create table sys_user (
create_time datetime comment '创建时间', create_time datetime comment '创建时间',
update_by varchar(64) default '' comment '更新者', update_by varchar(64) default '' comment '更新者',
update_time datetime comment '更新时间', update_time datetime comment '更新时间',
remark varchar(500) default '' comment '备注', remark varchar(500) default null comment '备注',
primary key (user_id) primary key (user_id)
) engine=innodb auto_increment=100 comment = '用户信息表'; ) engine=innodb auto_increment=100 comment = '用户信息表';