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

时间查询&排序支持一波

Browse Source
This commit is contained in:
RuoYi
2018-07-19 21:17:17 +08:00
parent 45d1a161bf
commit 509f17018a
33 changed files with 195 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/resources/templates/monitor/job/job.html
View File

@ -77,18 +77,20 @@
},
{
field: 'jobName',
title: '任务名称'
title: '任务名称',
sortable: true
},
{
field: 'jobGroup',
title: '任务组名'
title: '任务组名',
sortable: true
},
{
field: 'methodName',
title: '方法名称'
},
{
field: 'params',
field: 'methodParams',
title: '方法参数'
},
{
@ -108,8 +110,9 @@
}
},
{
field: 'createDateTimeStr',
title: '创建时间'
field: 'createTime',
title: '创建时间',
sortable: true
},
{
title: '操作',

23
src/main/resources/templates/monitor/job/jobLog.html
View File

@ -25,9 +25,9 @@
</li>
<li class="time">
<label>执行时间： </label>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="reqParams[beginTime]"/>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="reqParams[endTime]"/>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a>
@ -73,18 +73,20 @@
},
{
field: 'jobName',
title: '任务名称'
title: '任务名称',
sortable: true
},
{
field: 'jobGroup',
title: '任务组名'
title: '任务组名',
sortable: true
},
{
field: 'methodName',
title: '方法名称'
},
{
field: 'params',
field: 'methodParams',
title: '方法参数'
},
{
@ -104,8 +106,9 @@
}
},
{
field: 'createDateTimeStr',
title: '创建时间'
field: 'createTime',
title: '创建时间',
sortable: true
},
{
title: '操作',
@ -119,12 +122,6 @@
};
$.table.init(options);
});
layui.use('laydate', function() {
var laydate = layui.laydate;
laydate.render({ elem: '#startTime', theme: 'molv' });
laydate.render({ elem: '#endTime', theme: 'molv' });
});
</script>
</body>
</html>

16
src/main/resources/templates/monitor/logininfor/logininfor.html
View File

@ -25,9 +25,9 @@
</li>
<li class="time">
<label>登录时间： </label>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="reqParams[beginTime]"/>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="reqParams[endTime]"/>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a>
@ -72,7 +72,8 @@
},
{
field: 'loginName',
title: '登录名称'
title: '登录名称',
sortable: true
},
{
field: 'ipaddr',
@ -108,17 +109,12 @@
},
{
field: 'loginTime',
title: '登录时间'
title: '登录时间',
sortable: true
}]
};
$.table.init(options);
});
layui.use('laydate', function() {
var laydate = layui.laydate;
laydate.render({ elem: '#startTime', theme: 'molv' });
laydate.render({ elem: '#endTime', theme: 'molv' });
});
</script>
</body>
</html>

9
src/main/resources/templates/monitor/online/online.html
View File

@ -57,7 +57,8 @@
},
{
field: 'loginName',
title: '登录名称'
title: '登录名称',
sortable: true
},
{
field: 'deptName',
@ -93,11 +94,13 @@
},
{
field: 'startTimestamp',
title: '登录时间'
title: '登录时间',
sortable: true
},
{
field: 'lastAccessTime',
title: '最后访问时间'
title: '最后访问时间',
sortable: true
},
{
title: '操作',

16
src/main/resources/templates/monitor/operlog/operlog.html
View File

@ -25,9 +25,9 @@
</li>
<li class="time">
<label>操作时间： </label>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="reqParams[beginTime]"/>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="reqParams[endTime]"/>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a>
@ -105,7 +105,8 @@
},
{
field: 'operName',
title: '操作人员'
title: '操作人员',
sortable: true
},
{
field: 'deptName',
@ -133,7 +134,8 @@
},
{
field: 'operTime',
title: '操作时间'
title: '操作时间',
sortable: true
},
{
title: '操作',
@ -153,12 +155,6 @@
var url = prefix + '/detail/' + id;
$.modal.open("操作日志详细", url);
}
layui.use('laydate', function() {
var laydate = layui.laydate;
laydate.render({ elem: '#startTime', theme: 'molv' });
laydate.render({ elem: '#endTime', theme: 'molv' });
});
</script>
</body>
</html>

8
src/main/resources/templates/system/config/config.html
View File

@ -22,6 +22,12 @@
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
</li>
<li class="time">
<label>创建时间： </label>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel($('form').attr('id'))"><i class="fa fa-download"></i>&nbsp;下载</a>
@ -94,7 +100,7 @@
}
},
{
field: 'createDateTimeStr',
field: 'createTime',
title: '创建时间'
},
{

2
src/main/resources/templates/system/dept/dept.html
View File

@ -79,7 +79,7 @@
}
},
{
field: 'createTimeStr',
field: 'createTime',
title: '创建时间',
align: "center"
},

5
src/main/resources/templates/system/dict/data/data.html
View File

@ -104,8 +104,9 @@
title: '备注'
},
{
field: 'createDateTimeStr',
title: '创建时间'
field: 'createTime',
title: '创建时间',
sortable: true
},
{
title: '操作',

11
src/main/resources/templates/system/dict/type/type.html
View File

@ -23,6 +23,12 @@
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
</li>
<li class="time">
<label>创建时间： </label>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel($('form').attr('id'))"><i class="fa fa-download"></i>&nbsp;下载</a>
@ -102,8 +108,9 @@
title: '备注'
},
{
field: 'createDateTimeStr',
title: '创建时间'
field: 'createTime',
title: '创建时间',
sortable: true
},
{
title: '操作',

5
src/main/resources/templates/system/notice/notice.html
View File

@ -98,8 +98,9 @@
title : '创建者'
},
{
field: 'createDateTimeStr',
title: '创建时间'
field: 'createTime',
title: '创建时间',
sortable: true
},
{
title: '操作',

5
src/main/resources/templates/system/post/post.html
View File

@ -98,8 +98,9 @@
}
},
{
field: 'createDateTimeStr',
title: '创建时间'
field: 'createTime',
title: '创建时间',
sortable: true
},
{
title: '操作',

9
src/main/resources/templates/system/role/role.html
View File

@ -23,6 +23,12 @@
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
</li>
<li class="time">
<label>创建时间： </label>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel($('form').attr('id'))"><i class="fa fa-download"></i>&nbsp;下载</a>
@ -99,7 +105,8 @@
},
{
field: 'createTime',
title: '创建时间'
title: '创建时间',
sortable: true
},
{
title: '操作',

2
src/main/resources/templates/system/user/profile/profile.html
View File

@ -46,7 +46,7 @@
<p><i class="fa fa-group"></i> [[${user.dept.deptName}]] / [[${#strings.defaultString(postGroup,'无岗位')}]]</p>
<p><i class="fa fa-transgender"></i> [[${user.sex}]]</p>
<p><i class="fa fa-envelope-o"></i> [[${user.email}]]</p>
<p><i class="fa fa-calendar"></i> [[${user.createTimeStr}]]</p>
<p><i class="fa fa-calendar"></i> [[${#dates.format(user.createTime, 'yyyy-MM-dd HH:mm:ss')}]]</p>
</div>
<div class="clearfix"></div>
</a>

11
src/main/resources/templates/system/user/user.html
View File

@ -48,6 +48,12 @@
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
</li>
<li class="time">
<label>创建时间： </label>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel($('form').attr('id'))"><i class="fa fa-download"></i>&nbsp;下载</a>
@ -139,8 +145,9 @@
}
},
{
field: 'createDateTimeStr',
title: '创建时间'
field: 'createTime',
title: '创建时间',
sortable: true
},
{
title: '操作',

27
src/main/resources/templates/tool/gen/gen.html
View File

@ -16,6 +16,12 @@
<li>
表描述：<input type="text" name="tableComment"/>
</li>
<li class="time">
<label>创建时间： </label>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a>
</li>
@ -50,22 +56,31 @@
},
{
field: 'tableName',
title: '表名称'
title: '表名称',
width: '20%',
sortable: true
},
{
field: 'tableComment',
title: '表描述'
title: '表描述',
width: '20%',
sortable: true
},
{
field: 'createDateTimeStr',
title: '创建时间'
field: 'createTime',
title: '创建时间',
width: '20%',
sortable: true
},
{
field: 'updateDateTimeStr',
title: '更新时间'
field: 'updateTime',
title: '更新时间',
width: '20%',
sortable: true
},
{
title: '操作',
width: '20%',
align: 'center',
formatter: function(value, row, index) {
var msg = '<a class="btn btn-primary btn-xs" href="#" onclick="genCode(\'' + row.tableName + '\')"><i class="fa fa-bug"></i>生成代码</a> ';