增加一些标签

src/main/java/cn/stylefeng/guns/modular/system/controller/DashboardController.java

-/**
- * Copyright 2018-2020 stylefeng & fengshuonan (https://gitee.com/stylefeng)
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.stylefeng.guns.modular.system.controller;
-
-import cn.stylefeng.guns.modular.system.service.INoticeService;
-import cn.stylefeng.roses.core.base.controller.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 总览信息
- *
- * @author fengshuonan
- * @Date 2017年3月4日23:05:54
- */
-@Controller
-@RequestMapping("/dashboard")
-public class DashboardController extends BaseController {
-
-    @Autowired
-    private INoticeService noticeService;
-
-    /**
-     * 跳转到黑板
-     */
-    @RequestMapping("")
-    public String blackboard(Model model) {
-        List<Map<String, Object>> notices = noticeService.list(null);
-        model.addAttribute("noticeList", notices);
-        return "/dashboard.html";
-    }
-}

src/main/webapp/WEB-INF/code/code.html

+@layout("/common/_container.html",{title:"代码生成"}){
+<div class="row" xmlns="">
+    <div class="col-sm-12">
+        <div class="ibox float-e-margins">
+            <div class="ibox-title">
+                <h5>代码生成</h5>
+            </div>
+            <div class="ibox-content">
+                <div class="row row-lg">
+                    <div class="col-sm-12">
+                        <div class="form-horizontal" id="generate">
+                            <div class="row">
+                                <div class="col-sm-4">
+                                    <#input id="projectPath" name="项目路径" value="${params.projectPath}"/>
+                                </div>
+                                <div class="col-sm-4">
+                                    <#input id="projectPackage" name="项目的包" value="${params.projectPackage}"/>
+                                </div>
+                                <div class="col-sm-4">
+                                    <#input id="corePackage" name="核心包" value="${params.corePackage}"/>
+                                </div>
+                            </div>
+
+                            <div class="row">
+                                <div class="col-sm-3">
+                                    <#input id="author" name="作者" value="${params.author!}"/>
+                                </div>
+                                <div class="col-sm-3">
+                                    <#input id="bizName" name="业务名称" />
+                                </div>
+                                <div class="col-sm-3">
+                                    <#input id="moduleName" name="模块名称" value="${params.moduleName}"/>
+                                </div>
+                                <div class="col-sm-3">
+                                    <#input id="parentMenuName" name="父级菜单名称" underline="false" value="${params.parentMenuName}"
+                                            hidden="pid" readonly="readonly"
+                                            clickFun="Code.showMenuSelectTree(); return false;"
+                                            style="background-color: #ffffff !important;"
+                                            selectFlag="true" selectId="pcodeTreeDiv" selectTreeId="pcodeTree" selectStyle=""/>
+                                </div>
+                            </div>
+
+                            <div class="row">
+                                <div class="col-sm-3">
+                                    <#input id="tableName" name="表名称" disabled="disabled"/>
+                                </div>
+                                <div class="col-sm-3">
+                                    <#input id="ignoreTabelPrefix" name="表前缀" value="${params.ignoreTabelPrefix}"/>
+                                </div>
+                                <div class="col-sm-3">
+                                    <#input id="className" name="类名" disabled="disabled"/>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <button id="genBtn" type="button" class="btn btn-primary mr10"
+                                            onclick="Code.generate()">
+                                        <span style="padding: 5px 20px;">生成</span>
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                        <div style="padding-top: 10px; overflow: hidden"
+                             class="container-fluid">
+                            <div class="col-md-12">
+                                <div class="row admin-form">
+                                    <div class="col-md-3 col-md-offset-3">
+                                        <h2>数据表</h2>
+                                        <div class="list-group" id="tableList"
+                                             data-bind="foreach: tables"
+                                             style="height: 500px; overflow-y: scroll">
+                                            @for(table in tables!){
+                                                <a href="javascript:void(0)" class="list-group-item" tableName="${table.tableName}" onclick="Code.selectTable('${table.tableName}')">${table.tableName}-${table.tableComment}</a>
+                                            @}
+                                        </div>
+                                    </div>
+                                    <div class="col-md-3">
+                                        <span><h2>模板</h2></span>
+                                        <div class="list-group" id="templateList"
+                                             style="height: 500px; overflow-y: scroll">
+                                            @for(template in templates!){
+                                                <a href="javascript:void(0)" class="list-group-item" key="${template.key}" onclick="Code.selectTemplate('${template.key}')">${template.desc}</a>
+                                            @}
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <ul class="nav nav-list">
+                            <li class="divider"></li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="${ctxPath}/static/js/common/select-list-object.js"></script>
+<script src="${ctxPath}/static/modular/code/gen.js"></script>
+@}
+

src/main/webapp/WEB-INF/common/tags/NameCon.tag

+@/*
+    名称查询条件标签的参数说明:
+
+    name : 查询条件的名称
+    id : 查询内容的input框id
+@*/
+<div class="input-group">
+    <div class="input-group-btn">
+        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+                type="button">${name}
+        </button>
+    </div>
+    <input type="text" class="form-control" id="${id}" placeholder="${placeholder!}" />
+</div>
\ No newline at end of file

src/main/webapp/WEB-INF/common/tags/SelectCon.tag

+@/*
+    选择查询条件标签的参数说明:
+
+    name : 查询条件的名称
+    id : 查询内容的input框id
+@*/
+<div class="input-group">
+    <div class="input-group-btn">
+        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+            ${name}
+        </button>
+    </div>
+    <select class="form-control" id="${id}">
+        ${tagBody!}
+    </select>
+</div>
\ No newline at end of file

src/main/webapp/WEB-INF/common/tags/TimeCon.tag

+@/*
+    时间查询条件标签的参数说明:
+
+    name : 查询条件的名称
+    id : 查询内容的input框id
+    isTime : 日期是否带有小时和分钟(true/false)
+@*/
+<div class="input-group">
+    <div class="input-group-btn">
+        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+                type="button">${name}
+        </button>
+    </div>
+    <input type="text" class="form-control layer-date" id="${id}"/>
+</div>
\ No newline at end of file

src/main/webapp/WEB-INF/common/tags/avatar.tag

+@/*
+    头像参数的说明:
+    name : 名称
+    id : 头像的id
+@*/
+<div class="form-group">
+    <label class="col-sm-3 control-label head-scu-label">${name}</label>
+    <div class="col-sm-4">
+        <div id="${id}PreId">
+            <div><img width="100px" height="100px"
+                @if(isEmpty(avatarImg)){
+                      src="${ctxPath}/static/img/girl.gif"></div>
+                @}else{
+                      src="${ctxPath}/kaptcha/${avatarImg}"></div>
+                @}
+        </div>
+    </div>
+    <div class="col-sm-2">
+        <div class="head-scu-btn upload-btn" id="${id}BtnId">
+            <i class="fa fa-upload"></i>&nbsp;上传
+        </div>
+    </div>
+    <input type="hidden" id="${id}" value="${avatarImg!}"/>
+</div>
+@if(isNotEmpty(underline) && underline == 'true'){
+    <div class="hr-line-dashed"></div>
+@}
+
+

src/main/webapp/WEB-INF/common/tags/button.tag

+@/*
+    按钮标签中各个参数的说明:
+
+    btnType : 按钮的类型决定了颜色(default-灰色,primary-绿色,success-蓝色,info-淡蓝色,warning-黄色,danger-红色,white-白色)
+    space : 按钮左侧是否有间隔(true/false)
+    clickFun : 点击按钮所执行的方法
+    icon : 按钮上的图标的样式
+    name : 按钮名称
+@*/
+
+@var spaceCss = "";
+@var btnType = "";
+@if(isEmpty(space) || space == "false"){
+@   spaceCss = "";
+@}else{
+@   spaceCss = "button-margin";
+@}
+@if(isEmpty(btnCss)){
+@   btnType = "primary";
+@}else{
+@   btnType = btnCss;
+@}
+<button type="button" class="btn btn-${btnType} ${spaceCss}" onclick="${clickFun!}" id="${id!}">
+    <i class="fa ${icon}"></i>&nbsp;${name}
+</button>
+

src/main/webapp/WEB-INF/common/tags/input.tag

+@/*
+    表单中input框标签中各个参数的说明:
+
+    hidden : input hidden框的id
+    id : input框id
+    name : input框名称
+    readonly : readonly属性
+    clickFun : 点击事件的方法名
+    style : 附加的css属性
+@*/
+<div class="form-group">
+    <label class="col-sm-3 control-label">${name}</label>
+    <div class="col-sm-9">
+        <input class="form-control" id="${id}" name="${id}"
+               @if(isNotEmpty(value)){
+                    value="${tool.dateType(value)}"
+               @}
+               @if(isNotEmpty(type)){
+                    type="${type}"
+               @}else{
+                    type="text"
+               @}
+               @if(isNotEmpty(readonly)){
+                    readonly="${readonly}"
+               @}
+               @if(isNotEmpty(clickFun)){
+                    onclick="${clickFun}"
+               @}
+               @if(isNotEmpty(style)){
+                    style="${style}"
+               @}
+               @if(isNotEmpty(disabled)){
+                    disabled="${disabled}"
+               @}
+        >
+        @if(isNotEmpty(hidden)){
+            <input class="form-control" type="hidden" id="${hidden}" value="${hiddenValue!}">
+        @}
+
+        @if(isNotEmpty(selectFlag)){
+            <div id="${selectId}" style="display: none; position: absolute; z-index: 200;">
+                <ul id="${selectTreeId}" class="ztree tree-box" style="${selectStyle!}"></ul>
+            </div>
+        @}
+    </div>
+</div>
+@if(isNotEmpty(underline) && underline == 'true'){
+    <div class="hr-line-dashed"></div>
+@}
+
+

src/main/webapp/WEB-INF/common/tags/select.tag

+@/*
+    select标签中各个参数的说明:
+    name : select的名称
+    id : select的id
+    underline : 是否带分割线
+@*/
+<div class="form-group">
+    <label class="col-sm-3 control-label">${name}</label>
+    <div class="col-sm-9">
+        <select class="form-control" id="${id}" name="${id}">
+            ${tagBody!}
+        </select>
+        @if(isNotEmpty(hidden)){
+            <input class="form-control" type="hidden" id="${hidden}" value="${hiddenValue!}">
+        @}
+    </div>
+</div>
+@if(isNotEmpty(underline) && underline == 'true'){
+    <div class="hr-line-dashed"></div>
+@}
+
+

src/main/webapp/WEB-INF/common/tags/table.tag

+@/*
+    表格标签的参数说明:
+
+    id : table表格的id
+@*/
+<table id="${id}" data-mobile-responsive="true" data-click-to-select="true">
+    <thead>
+        <tr>
+            <th data-field="selectItem" data-checkbox="true"></th>
+        </tr>
+    </thead>
+</table>
\ No newline at end of file

src/main/webapp/WEB-INF/common/tags/tag_tips

+1 dictSelector(字典选择器)
+    此标签是为了方便在前台form表单中使用系统中维护的字典而开发的，具体说明如下：
+1.1 标签样例
+    <#dictSelector id="sex" name ="sex" code="sys_sex" readonly="readonly" label="性别"  underline="true"  value="${user.sex}" />
+1.2 属性说明
+    id: (非必须) 控件的id
+    name: (非必须) 控件的name
+    code:(必须) 字典类型编码,根据code的值去后台查询该类型的字典。
+    type:(非必须) 控件类型，可选项为[select,radio,checkbox],标签会根据填写的类型，生成不同的控件。
+    searchnum：(非必须)下拉框达到多少个，开启搜索框，默认10个,type为select起效。
+    label：(非必须) 字典属性名称
+    width：(非必须) 控件的宽度单位为px，type为select起效。
+    value: (非必须) 控件默认值,多选时值要用,分隔。
+    placeholder：(非必须) 控件提示信息，type为select起效。
+    multiple：(非必须) 是否开启多选,可选值[true,false],默认为false,type为select起效。
+    underline:(非必须) 是否显示分割线,可选值[true,false],默认为false。
+    onchange：(非必须) onchange事件方法名称,会传入更改后的值作为参数,例：onchange="myOnChange" function myOnChange(newVal){}。
+    readonly：(非必须)只读控件,可选值[true,false],默认false
+    disabled：(非必须) 禁用控件,可选值[true,false],默认false
+
+
+

src/main/webapp/WEB-INF/dashboard.html

-@layout("/common/_container.html",{title:"概览"}){
-<div class="row">
-    <div class="col-12">
-        @for(notice in noticeList){
-        <div class="alert alert-info" role="alert">
-            ${notice.content}
-        </div>
-        @}
-    </div>
-</div>
-@}

src/main/webapp/WEB-INF/system/dept/dept.html

+@layout("/common/_container.html"){
+<div class="row">
+    <div class="col-sm-12">
+        <div class="ibox float-e-margins">
+            <div class="ibox-title">
+                <h5>部门管理</h5>
+            </div>
+            <div class="ibox-content">
+                <div class="row row-lg">
+                    <div class="col-sm-12">
+                        <div class="row">
+                            <div class="col-sm-3">
+                                <#NameCon id="condition" name="名称" />
+                            </div>
+                            <div class="col-sm-3">
+                                <#button name="搜索" icon="fa-search" clickFun="Dept.search()"/>
+                            </div>
+                        </div>
+                        <div class="hidden-xs" id="DeptTableToolbar" role="group">
+                            @if(shiro.hasPermission("/dept/add")){
+                                <#button name="添加" icon="fa-plus" clickFun="Dept.openAddDept()"/>
+                            @}
+                            @if(shiro.hasPermission("/dept/update")){
+                                <#button name="修改" icon="fa-plus" clickFun="Dept.openDeptDetail()" space="true"/>
+                            @}
+                            @if(shiro.hasPermission("/dept/delete")){
+                                <#button name="删除" icon="fa-plus" clickFun="Dept.delete()" space="true"/>
+                            @}
+                        </div>
+                        <#table id="DeptTable"/>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="${ctxPath}/static/modular/system/dept/dept.js"></script>
+@}

src/main/webapp/WEB-INF/system/dept/dept_add.html

+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+    <div class="ibox-content">
+        <div class="form-horizontal" id="deptInfoForm">
+
+            <input type="hidden" id="id" value="">
+
+            <div class="row">
+                <div class="col-sm-6 b-r">
+                    <#input id="simplename" name="部门名称" underline="true"/>
+
+                    <#input id="fullname" name="部门全称" underline="true"/>
+
+                    <#input id="tips" name="备注" underline="true"/>
+                </div>
+                <div class="col-sm-6">
+                    <#input id="num" name="排序" underline="true"/>
+
+                    <#input id="pName" name="上级部门" readonly="readonly" hidden="pid"
+                            clickFun="DeptInfoDlg.showDeptSelectTree(); return false;"
+                            style="background-color: #ffffff !important;"/>
+                </div>
+            </div>
+
+            <!-- 父级部门的选择框 -->
+            <div id="parentDeptMenu" class="menuContent"
+                 style="display: none; position: absolute; z-index: 200;">
+                <ul id="parentDeptMenuTree" class="ztree tree-box" style="width: 245px !important;"></ul>
+            </div>
+
+            <div class="row btn-group-m-t">
+                <div class="col-sm-10">
+                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="DeptInfoDlg.addSubmit()"/>
+                    <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="DeptInfoDlg.close()"/>
+                </div>
+            </div>
+        </div>
+
+    </div>
+</div>
+<script src="${ctxPath}/static/modular/system/dept/dept_info.js"></script>
+@}

src/main/webapp/WEB-INF/system/dept/dept_edit.html

+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+    <div class="ibox-content">
+        <div class="form-horizontal" id="deptInfoForm">
+
+            <input type="hidden" id="id" value="${dept.id}">
+
+            <div class="row">
+                <div class="col-sm-6 b-r">
+                    <#input id="simplename" name="部门名称" underline="true" value="${dept.simplename}"/>
+
+                    <#input id="fullname" name="部门全称" underline="true" value="${dept.fullname}"/>
+
+                    <#input id="tips" name="备注" underline="true" value="${dept.tips}"/>
+                </div>
+                <div class="col-sm-6">
+                    <#input id="num" name="排序" underline="true" value="${dept.num}"/>
+
+                    <#input id="pName" name="上级部门" readonly="readonly" hidden="pid"
+                            hiddenValue="${dept.pid}" value="${pName}"
+                            clickFun="DeptInfoDlg.showDeptSelectTree(); return false;"
+                            style="background-color: #ffffff !important;"/>
+                </div>
+            </div>
+
+            <!-- 父级部门的选择框 -->
+            <div id="parentDeptMenu" class="menuContent"
+                 style="display: none; position: absolute; z-index: 200;">
+                <ul id="parentDeptMenuTree" class="ztree tree-box" style="width: 245px !important;"></ul>
+            </div>
+
+            <div class="row btn-group-m-t">
+                <div class="col-sm-10">
+                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="DeptInfoDlg.editSubmit()"/>
+                    <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="DeptInfoDlg.close()"/>
+                </div>
+            </div>
+        </div>
+
+    </div>
+</div>
+<script src="${ctxPath}/static/modular/system/dept/dept_info.js"></script>
+@}

src/main/webapp/WEB-INF/system/user/user.html

+@layout("/common/_container.html"){
+<div class="row">
+	<div class="col-sm-12">
+		<div class="ibox float-e-margins">
+			<div class="ibox-title">
+				<h5>用户管理</h5>
+			</div>
+			<div class="ibox-content">
+				<div class="row row-lg">
+					<div class="col-sm-12">
+						<div class="row">
+							<div class="col-lg-2 col-sm-3">
+								<div class="panel panel-default">
+									<div class="panel-heading">组织机构</div>
+									<div class="panel-body dept-tree">
+										<ul id="deptTree" class="ztree"></ul>
+									</div>
+								</div>
+							</div>
+							<div class="col-lg-10 col-sm-9">
+								<div class="row">
+									<div class="col-lg-10 col-sm-9">
+										<div class="row">
+											<div class="col-lg-4 col-sm-12">
+												<#NameCon id="name" name="用户名称" placeholder="帐号/姓名/手机号"/>
+											</div>
+											<div class="col-lg-4 col-sm-6">
+												<#TimeCon id="beginTime" name="注册开始日期" isTime="false"/>
+											</div>
+											<div class="col-lg-4 col-sm-6">
+												<#TimeCon id="endTime" name="注册结束日期" isTime="false"/>
+											</div>
+										</div>
+									</div>
+									<div class="col-lg-2 col-sm-3">
+										<div class="row">
+											<div class="col-lg-12 col-sm-12">
+												<#button name="搜索" icon="fa-search" clickFun="MgrUser.search()"/>
+												<#button name="重置" icon="fa-trash" clickFun="MgrUser.resetSearch()" space="true"/>
+											</div>
+										</div>
+									</div>
+								</div>
+								<div class="hidden-xs" id="managerTableToolbar" role="group">
+									@if(shiro.hasPermission("/mgr/add")){
+									<#button name="添加" icon="fa-plus" clickFun="MgrUser.openAddMgr()"/>
+									@}
+									@if(shiro.hasPermission("/mgr/edit")){
+									<#button name="修改" icon="fa-edit" clickFun="MgrUser.openChangeUser()" space="true"/>
+									@}
+									@if(shiro.hasPermission("/mgr/delete")){
+									<#button name="删除" icon="fa-remove" clickFun="MgrUser.delMgrUser()" space="true"/>
+									@}
+									@if(shiro.hasPermission("/mgr/reset")){
+									<#button name="重置密码" icon="fa-refresh" clickFun="MgrUser.resetPwd()" space="true"/>
+									@}
+									@if(shiro.hasPermission("/mgr/freeze")){
+									<#button name="冻结" icon="fa-warning" clickFun="MgrUser.freezeAccount()" space="true"/>
+									@}
+									@if(shiro.hasPermission("/mgr/unfreeze")){
+									<#button name="解除冻结" icon="fa-check-circle" clickFun="MgrUser.unfreeze()" space="true"/>
+									@}
+									@if(shiro.hasPermission("/mgr/setRole")){
+									<#button name="角色分配" icon="fa-user-secret" clickFun="MgrUser.roleAssign()" space="true"/>
+									@}
+								</div>
+								<#table id="managerTable"/>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+<script src="${ctxPath}/static/modular/system/user/user.js"></script>
+<script>
+    laydate.render({
+        elem: '#beginTime'
+    });
+    laydate.render({
+        elem: '#endTime'
+    });
+</script>
+@}

src/main/webapp/WEB-INF/system/user/user_add.html

+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+	<div class="ibox-content">
+		<div class="form-horizontal" id="userInfoForm">
+
+			<input type="hidden" id="id" value="">
+
+			<div class="row">
+				<div class="col-sm-6 b-r">
+					<#input id="account" name="账户" underline="true"/>
+
+					<#select id="sex" name="性别" underline="true">
+						<option value="1">男</option>
+						<option value="2">女</option>
+					</#select>
+
+					<#input id="password" name="密码" underline="true" type="password"/>
+
+					<#input id="roleid" name="角色" underline="true" disabled="disabled"/>
+
+					<#input id="email" name="邮箱" type="email"/>
+
+				</div>
+				<div class="col-sm-6">
+					<div id="driverInfoContent">
+						<#input id="name" name="姓名" underline="true"/>
+
+						<#input id="birthday" name="出生日期" underline="true" type="text"/>
+
+						<#input id="rePassword" name="确认密码" type="password" underline="true"/>
+
+						<#input id="citySel" name="部门" underline="true" readonly="readonly" hidden="deptid"
+						clickFun="UserInfoDlg.showDeptSelectTree(); return false;"
+						style="background-color: #ffffff !important;"/>
+
+						<#input id="phone" name="电话"/>
+					</div>
+				</div>
+			</div>
+
+			<!-- 这是部门选择的下拉框 -->
+			<div id="menuContent" class="menuContent"
+				 style="display: none; position: absolute; z-index: 200;">
+				<ul id="treeDemo" class="ztree tree-box" style="width: 249px !important;"></ul>
+			</div>
+
+			<div class="row btn-group-m-t">
+				<div class="col-sm-10">
+					<#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.addSubmit()"/>
+					<#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
+				</div>
+			</div>
+		</div>
+
+	</div>
+</div>
+<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
+<script>
+    laydate.render({
+        elem: '#birthday'
+    });
+</script>
+@}

src/main/webapp/WEB-INF/system/user/user_chpwd.html

+@layout("/common/_container.html"){
+<div class="col-sm-4  col-sm-offset-4">
+    <div class="ibox float-e-margins">
+        <div class="ibox-title">
+            <h5>修改密码</h5>
+        </div>
+        <div class="ibox-content">
+            <div class="row row-lg">
+                <div class="col-sm-12">
+                    <div class="ibox float-e-margins">
+                        <div class="ibox-content" style="border:none !important; ">
+                            <div class="form-horizontal">
+                                <div class="row">
+                                    <div class="col-sm-12">
+                                        <#input id="oldPwd" name="原密码" underline="true" type="password"/>
+                                        <#input id="newPwd" name="新密码" underline="true" type="password"/>
+                                        <#input id="rePwd" name="新密码验证" type="password"/>
+                                    </div>
+                                </div>
+                                <div class="row btn-group-m-t">
+                                    <div class="col-sm-10">
+                                        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.chPwd()"/>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
+@}

src/main/webapp/WEB-INF/system/user/user_edit.html

+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+	<div class="ibox-content">
+		<div class="form-horizontal" id="userInfoForm">
+
+			<input type="hidden" id="id" value="${user.id}">
+			<input type="hidden" id="sexValue" value="${user.sex}">
+
+			<div class="row">
+				<div class="col-sm-6 b-r">
+					<#input id="account" name="账户" underline="true" value="${user.account}"/>
+
+					<#select id="sex" name="性别" underline="true">
+						<option value="1">男</option>
+						<option value="2">女</option>
+					</#select>
+
+					<#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>
+
+					<#input id="email" name="邮箱" type="email" value="${user.email}"/>
+				</div>
+				<div class="col-sm-6">
+					<div id="driverInfoContent">
+						<#input id="name" name="姓名" underline="true" value="${user.name}"/>
+
+						<#input id="birthday" name="出生日期" underline="true" type="text"
+						value="${user.birthday}"/>
+
+						<#input id="citySel" name="部门" underline="true" readonly="readonly" hidden="deptid" hiddenValue="${user.deptid}" value="${deptName}"
+						clickFun="UserInfoDlg.showDeptSelectTree(); return false;"
+						style="background-color: #ffffff !important;"/>
+
+						<#input id="phone" name="电话" value="${user.phone}"/>
+					</div>
+				</div>
+			</div>
+
+			<!-- 这是部门选择的下拉框 -->
+			<div id="menuContent" class="menuContent"
+				 style="display: none; position: absolute; z-index: 200;">
+				<ul id="treeDemo" class="ztree tree-box" style="width: 249px !important;"></ul>
+			</div>
+
+			<div class="row btn-group-m-t">
+				<div class="col-sm-10">
+					<#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
+					<#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
+				</div>
+			</div>
+		</div>
+
+	</div>
+</div>
+<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
+<script>
+    laydate.render({
+        elem: '#birthday'
+    });
+</script>
+@}

src/main/webapp/WEB-INF/system/user/user_roleassign.html

+@layout("/common/_container.html"){
+
+
+<script type="text/javascript">
+    $(function () {
+
+        var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
+
+        $("#btn_close").bind("click", function () {
+            parent.layer.close(index);
+        });
+
+        $("#btn_save").bind("click", function () {
+            var ids = Feng.zTreeCheckedNodes("zTree");
+            var ajax = new $ax(Feng.ctxPath + "/mgr/setRole", function (data) {
+                Feng.success("分配角色成功!");
+                window.parent.MgrUser.table.refresh();
+                parent.layer.close(index);
+            }, function (data) {
+                Feng.error("分配角色失败!" + data.responseJSON.message + "!");
+            });
+            ajax.set("roleIds", ids);
+            ajax.set("userId", "${userId}");
+            ajax.start();
+        });
+
+        initZtree();
+    });
+
+    function initZtree() {
+        var setting = {
+            check: {
+                enable: true,
+                chkboxType: {
+                    "Y": "",
+                    "N": ""
+                }
+            },
+            data: {
+                simpleData: {
+                    enable: true
+                }
+            }
+        };
+
+        var ztree = new $ZTree("zTree", "/role/roleTreeListByUserId/${userId}");
+        ztree.setSettings(setting);
+        ztree.init();
+    }
+</script>
+
+
+<!-- 配置grid -->
+<div class="container"
+     style="padding:  0px 10px !important; margin-top: -10px; text-align: center !important;">
+    <div class="row">
+        <div class="ibox float-e-margins">
+            <div class="ibox-title">
+                <h5>${userAccount!}</h5>
+            </div>
+            <div class="ibox-content">
+                <ul id="zTree" class="ztree"></ul>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            <button class="btn btn-sm btn-info" type="button" id="btn_save">
+                <i class="ace-icon fa fa-check bigger-110"></i> 保存
+            </button>
+            &nbsp;
+            <button class="btn btn-sm btn-danger" type="button" id="btn_close">
+                <i class="ace-icon fa fa-close bigger-110"></i> 关闭
+            </button>
+        </div>
+    </div>
+</div>
+
+@}

src/main/webapp/WEB-INF/system/user/user_view.html

+@layout("/common/_container.html"){
+<div class="col-sm-6  col-sm-offset-3">
+    <div class="ibox float-e-margins">
+        <div class="ibox-title">
+            <h5>用户管理</h5>
+        </div>
+        <div class="ibox-content">
+            <div class="row row-lg">
+                <div class="col-sm-12">
+                    <div class="ibox float-e-margins">
+                        <div class="ibox-content" style="border:none !important; ">
+                            <div class="form-horizontal" id="userInfoForm">
+
+                                <input type="hidden" id="id" value="${user.id}">
+                                <input type="hidden" id="sexValue" value="${user.sex}">
+
+                                <div class="row">
+                                    <div class="col-sm-6 b-r">
+                                        <#avatar id="avatar" name="头像" underline="true" avatarImg="${user.avatar}"/>
+
+                                        <#input id="account" name="账户" underline="true" value="${user.account}" disabled="disabled" />
+
+                                        <#select id="sex" name="性别" underline="true" value="${user.sex}">
+                                            <option value="1">男</option>
+                                            <option value="2">女</option>
+                                        </#select>
+
+                                        <#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>
+
+                                        <#input id="email" name="邮箱" type="email" value="${user.email}"/>
+                                    </div>
+
+                                    <div class="col-sm-6">
+                                        <div id="driverInfoContent">
+                                            <#input id="name" name="姓名" underline="true" value="${user.name}"/>
+
+                                            <#input id="birthday" name="出生日期" underline="true" type="text"
+                                                    value="${user.birthday}"/>
+
+                                            <#input id="citySel" name="部门" underline="true" readonly="readonly" value="${deptName}"
+                                                    hidden="deptid" hiddenValue="${user.deptid}"
+                                                    clickFun="UserInfoDlg.showInfoDeptSelectTree(); return false;"
+                                                    style="background-color: #ffffff !important;"
+                                                    selectFlag="true" selectId="menuContent" selectTreeId="treeDemo" selectStyle="width:250px !important;"/>
+
+                                            <#input id="phone" name="电话" value="${user.phone}"/>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="progress progress-striped" id="progressTipArea" style="margin-top: 20px;">
+                                    <div id="progressBar" style="width: 0%" aria-valuemax="100" aria-valuemin="0" aria-valuenow="0" role="progressbar" class="progress-bar progress-bar-info">
+                                    </div>
+                                </div>
+
+                                <div class="row btn-group-m-t">
+                                    <div class="col-sm-10">
+                                        <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
+<script>
+    laydate.render({
+        elem: '#birthday'
+    });
+</script>
+@}