Skip to content

G
guns-vip
Commit f7728f85 by fsn
Options

页面增加一些搜索条件

parent 0ae7c188
Showing with 113 additions and 15 deletions
src/main/baseResources/beetl.properties
...@@ -11,3 +11,10 @@ RESOURCE.root=/WEB-INF/view ...@@ -11,3 +11,10 @@ RESOURCE.root=/WEB-INF/view
#是否检测文件变化 #是否检测文件变化
RESOURCE.autoCheck=true RESOURCE.autoCheck=true
#beetl HTMl标签
HTML_TAG_FLAG=#
#自定义标签文件Root目录和后缀
RESOURCE.tagRoot=common/tags
RESOURCE.tagSuffix=tag
\ No newline at end of file
src/main/webapp/WEB-INF/view/common/_container.html
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
<script src="${ctxPath}/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script> <script src="${ctxPath}/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
<script src="${ctxPath}/static/js/plugins/layer/layer.min.js"></script> <script src="${ctxPath}/static/js/plugins/layer/layer.min.js"></script>
<script src="${ctxPath}/static/js/plugins/iCheck/icheck.min.js"></script> <script src="${ctxPath}/static/js/plugins/iCheck/icheck.min.js"></script>
<script src="${ctxPath}/static/js/content.js?v=1.0.0"></script>
<script src="${ctxPath}/static/js/plugins/layer/laydate/laydate.js"></script> <script src="${ctxPath}/static/js/plugins/layer/laydate/laydate.js"></script>
<script src="${ctxPath}/static/js/plugins/webuploader/webuploader.min.js"></script> <script src="${ctxPath}/static/js/plugins/webuploader/webuploader.min.js"></script>
<script src="${ctxPath}/static/js/common/ajax-object.js"></script> <script src="${ctxPath}/static/js/common/ajax-object.js"></script>
...@@ -46,5 +45,6 @@ ...@@ -46,5 +45,6 @@
<div class="wrapper wrapper-content animated fadeInRight"> <div class="wrapper wrapper-content animated fadeInRight">
${layoutContent} ${layoutContent}
</div> </div>
<script src="${ctxPath}/static/js/content.js?v=1.0.0"></script>
</body> </body>
</html> </html>
src/main/webapp/WEB-INF/view/common/tags/NameCon.tag 0 → 100644
<div class="input-group">
<div class="input-group-btn">
<button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
type="button">${name}</span>
</button>
</div>
<input type="text" class="form-control" id="${id}" />
</div>
\ No newline at end of file
src/main/webapp/WEB-INF/view/common/tags/TimeCon.tag 0 → 100644
<div class="input-group">
<div class="input-group-btn">
<button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
type="button">${name}</span>
</button>
</div>
<input type="text" class="form-control layer-date"
onclick="laydate({istime: ${isTime}, format: '${pattern}'})" id="${id}" />
</div>
\ No newline at end of file
src/main/webapp/WEB-INF/view/system/log/log.html
...@@ -8,11 +8,32 @@ ...@@ -8,11 +8,32 @@
<div class="ibox-content"> <div class="ibox-content">
<div class="row row-lg"> <div class="row row-lg">
<div class="col-sm-12"> <div class="col-sm-12">
<!-- 成员列表 --> <!-- 日志列表 -->
<div class="example-wrap"> <div class="example-wrap">
<div class="example"> <div class="example">
<!-- 搜索条件 -->
<div class="row">
<div class="col-sm-3">
<#TimeCon id="beginTime" name="开始时间" isTime="false" pattern="YYYY-MM-DD" />
</div>
<div class="col-sm-3">
<#TimeCon id="endTime" name="结束时间" isTime="false" pattern="YYYY-MM-DD" />
</div>
<div class="col-sm-3">
<#NameCon id="logName" name="日志名称" />
</div>
<div class="col-sm-3">
<button type="button" class="btn btn-primary" onclick="clickSearch()"><i
class="fa fa-search"></i>&nbsp;搜索
</button>
</div>
</div>
<!-- End 搜索条件 -->
<div class="hidden-xs" id="OptLogTableToolbar" role="group"> <div class="hidden-xs" id="OptLogTableToolbar" role="group">
<button type="button" class="btn btn-primary" onclick="OptLog.detail()"><i class="fa fa-plus"></i>&nbsp;查看详情</button> <button type="button" class="btn btn-primary" onclick="OptLog.detail()"><i
class="fa fa-plus"></i>&nbsp;查看详情
</button>
</div> </div>
<table id="OptLogTable" data-mobile-responsive="true" <table id="OptLogTable" data-mobile-responsive="true"
data-click-to-select="true"> data-click-to-select="true">
...@@ -24,7 +45,7 @@ ...@@ -24,7 +45,7 @@
</table> </table>
</div> </div>
</div> </div>
<!-- End 成员列表 --> <!-- End 日志列表 -->
</div> </div>
</div> </div>
</div> </div>
......
src/main/webapp/WEB-INF/view/system/menu/menu.html
...@@ -11,6 +11,18 @@ ...@@ -11,6 +11,18 @@
<!-- 成员列表 --> <!-- 成员列表 -->
<div class="example-wrap"> <div class="example-wrap">
<div class="example"> <div class="example">
<!-- 搜索条件 -->
<div class="row">
<div class="col-sm-3">
<#NameCon id="menuName" name="菜单名称" />
</div>
<div class="col-sm-3">
<button type="button" class="btn btn-primary" onclick="clickSearch()"><i
class="fa fa-search"></i>&nbsp;搜索
</button>
</div>
</div>
<!-- End 搜索条件 -->
<div class="hidden-xs" id="menuTableToolbar" role="group"> <div class="hidden-xs" id="menuTableToolbar" role="group">
<button type="button" class="btn btn-primary" onclick="Menu.openAddMenu()"><i class="fa fa-plus"></i>&nbsp;添加</button> <button type="button" class="btn btn-primary" onclick="Menu.openAddMenu()"><i class="fa fa-plus"></i>&nbsp;添加</button>
<button type="button" class="btn btn-primary button-margin" onclick="Menu.openChangeMenu()"><i class="fa fa-edit"></i>&nbsp;修改</button> <button type="button" class="btn btn-primary button-margin" onclick="Menu.openChangeMenu()"><i class="fa fa-edit"></i>&nbsp;修改</button>
......
src/main/webapp/WEB-INF/view/system/role/role.html
...@@ -11,6 +11,18 @@ ...@@ -11,6 +11,18 @@
<!-- 成员列表 --> <!-- 成员列表 -->
<div class="example-wrap"> <div class="example-wrap">
<div class="example"> <div class="example">
<!-- 搜索条件 -->
<div class="row">
<div class="col-sm-3">
<#NameCon id="roleName" name="角色名称" />
</div>
<div class="col-sm-3">
<button type="button" class="btn btn-primary" onclick="clickSearch()"><i
class="fa fa-search"></i>&nbsp;搜索
</button>
</div>
</div>
<!-- End 搜索条件 -->
<div class="hidden-xs" id="roleTableToolbar" role="group"> <div class="hidden-xs" id="roleTableToolbar" role="group">
<button type="button" class="btn btn-primary" onclick="Role.openAddRole()"><i class="fa fa-plus"></i>&nbsp;添加</button> <button type="button" class="btn btn-primary" onclick="Role.openAddRole()"><i class="fa fa-plus"></i>&nbsp;添加</button>
<button type="button" class="btn btn-primary button-margin" onclick="Role.openChangeRole()"><i class="fa fa-edit"></i>&nbsp;修改</button> <button type="button" class="btn btn-primary button-margin" onclick="Role.openChangeRole()"><i class="fa fa-edit"></i>&nbsp;修改</button>
......
src/main/webapp/WEB-INF/view/system/user/user.html
...@@ -9,16 +9,42 @@ ...@@ -9,16 +9,42 @@
<div class="row row-lg"> <div class="row row-lg">
<div class="col-sm-12"> <div class="col-sm-12">
<!-- 成员列表 --> <!-- 成员列表 -->
<div class="example-wrap">
<div class="example"> <!-- 搜索条件 -->
<div class="row">
<div class="col-sm-3">
<#NameCon id="userName" name="用户名称" />
</div>
<div class="col-sm-3">
<button type="button" class="btn btn-primary" onclick="clickSearch()"><i
class="fa fa-search"></i>&nbsp;搜索
</button>
</div>
</div>
<!-- End 搜索条件 -->
<div class="hidden-xs" id="managerTableToolbar" role="group"> <div class="hidden-xs" id="managerTableToolbar" role="group">
<button type="button" class="btn btn-primary" onclick="MgrUser.openAddMgr()"><i class="fa fa-plus"></i>&nbsp;添加</button> <button type="button" class="btn btn-primary" onclick="MgrUser.openAddMgr()"><i
<button type="button" class="btn btn-primary button-margin" onclick="MgrUser.openChangeUser()"><i class="fa fa-edit"></i>&nbsp;修改</button> class="fa fa-plus"></i>&nbsp;添加
<button type="button" class="btn btn-primary button-margin" onclick="MgrUser.delMgrUser()"><i class="fa fa-remove"></i>&nbsp;删除</button> </button>
<button type="button" class="btn btn-primary button-margin" onclick="MgrUser.resetPwd()"><i class="fa fa-refresh"></i>&nbsp;重置密码</button> <button type="button" class="btn btn-primary button-margin"
<button type="button" class="btn btn-primary button-margin" onclick="MgrUser.freezeAccount()"><i class="fa fa-warning"></i>&nbsp;冻结</button> onclick="MgrUser.openChangeUser()"><i class="fa fa-edit"></i>&nbsp;修改
<button type="button" class="btn btn-primary button-margin" onclick="MgrUser.unfreeze()"><i class="fa fa-check-circle"></i>&nbsp;解除冻结</button> </button>
<button type="button" class="btn btn-primary button-margin" onclick="MgrUser.roleAssign()"><i class="fa fa-user-secret"></i>&nbsp;角色分配</button> <button type="button" class="btn btn-primary button-margin" onclick="MgrUser.delMgrUser()">
<i class="fa fa-remove"></i>&nbsp;删除
</button>
<button type="button" class="btn btn-primary button-margin" onclick="MgrUser.resetPwd()"><i
class="fa fa-refresh"></i>&nbsp;重置密码
</button>
<button type="button" class="btn btn-primary button-margin"
onclick="MgrUser.freezeAccount()"><i class="fa fa-warning"></i>&nbsp;冻结
</button>
<button type="button" class="btn btn-primary button-margin" onclick="MgrUser.unfreeze()"><i
class="fa fa-check-circle"></i>&nbsp;解除冻结
</button>
<button type="button" class="btn btn-primary button-margin" onclick="MgrUser.roleAssign()">
<i class="fa fa-user-secret"></i>&nbsp;角色分配
</button>
</div> </div>
<table id="managerTable" data-mobile-responsive="true" <table id="managerTable" data-mobile-responsive="true"
data-click-to-select="true"> data-click-to-select="true">
...@@ -28,8 +54,6 @@ ...@@ -28,8 +54,6 @@
</tr> </tr>
</thead> </thead>
</table> </table>
</div>
</div>
<!-- End 成员列表 --> <!-- End 成员列表 -->
</div> </div>
</div> </div>
......
src/main/webapp/static/modular/system/user/user.js
...@@ -176,4 +176,6 @@ $(function(){ ...@@ -176,4 +176,6 @@ $(function(){
table.init(); table.init();
MgrUser.bindEvent(); MgrUser.bindEvent();
MgrUser.table = table; MgrUser.table = table;
//默认收起来查询条件
$(".collapse-link").click();
}); });
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment